* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2017-02-25 20:42 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2017-02-25 20:42 UTC (permalink / raw
To: gentoo-commits
commit: da71e21305beb250977594f4f448c705e8900087
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 19:51:54 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 20:41:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da71e213
dev-libs/quazip: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 -
dev-libs/quazip/files/quazip-0.5.1-prll.patch | 11 ----
dev-libs/quazip/quazip-0.7.1.ebuild | 73 ---------------------------
3 files changed, 85 deletions(-)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index eb64000fd8..2778b97e7f 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,2 +1 @@
-DIST quazip-0.7.1.tar.gz 390629 SHA256 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de SHA512 58e044019505075aa89f112672c04c54875d98b353ac5a39b6eb3e1f08ea27bd9900126d902c282b87910e4bae5ab9da79942b9add7a5535625c187331445acc WHIRLPOOL bf683e90fd58ae4d94d72f4b4530754eb1944df03adccd4e0302fe7ec82afe07fd54c9d6975ba4f1b30e3d14928fbcc6c987ec612deeb6b66be9c86c5e5d9787
DIST quazip-0.7.2.tar.gz 466915 SHA256 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4 SHA512 669efb01edefee084ae755728aa2392bf160331fb13db62b7fac5e91bd45c29bb824a41ec63dd4a74c4a9780848d3308c0dcdb503f907a0fcccfbe969c291dd0 WHIRLPOOL 512661cab59eb2bda5e3a45ee800577bc2b8d3016a4076ca253b64de627098b4e2f62e20397dfe7a2f72aeaad7abdda8f1027e109ce1e8b6d6bfe117456600fb
diff --git a/dev-libs/quazip/files/quazip-0.5.1-prll.patch b/dev-libs/quazip/files/quazip-0.5.1-prll.patch
deleted file mode 100644
index 48c5502383..0000000000
--- a/dev-libs/quazip/files/quazip-0.5.1-prll.patch
+++ /dev/null
@@ -1,11 +0,0 @@
- quazip.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/quazip.pro b/quazip.pro
-index 28aa9ab..62a22bd 100644
---- a/quazip.pro
-+++ b/quazip.pro
-@@ -1,2 +1,3 @@
- TEMPLATE=subdirs
- SUBDIRS=quazip qztest
-+qztest.depends=quazip
diff --git a/dev-libs/quazip/quazip-0.7.1.ebuild b/dev-libs/quazip/quazip-0.7.1.ebuild
deleted file mode 100644
index 8e61bb66d1..0000000000
--- a/dev-libs/quazip/quazip-0.7.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib qmake-utils
-
-DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="http://quazip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="test qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
- sys-libs/zlib[minizip]
- qt4? ( dev-qt/qtcore:4 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- )
- "
-DEPEND="${RDEPEND}
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )"
-
-S="${WORKDIR}"/${P}
-
-DOCS="NEWS.txt README.txt"
-HTML_DOCS=( doc/html/. )
-
-MULTIBUILD_VARIANTS=( qt4 qt5 )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.5.1-prll.patch
-)
-
-src_prepare() {
- sed \
- -e "s:\/lib/:\/$(get_libdir)\/:g" \
- -i ${PN}/${PN}.pro || die
-
- echo "PREFIX=${EPREFIX}/usr" >> ${PN}/${PN}.pri || die
-
- use test || sed -e 's:qztest::g' -i ${PN}.pro || die
-}
-
-src_configure() {
- if use qt5; then
- eqmake5
- else
- eqmake4
- fi
-}
-
-src_test() {
- cd qztest || die
- LD_LIBRARY_PATH="${S}"/${PN} ./qztest || die
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
- einstalldocs
- insinto /usr/share/cmake/Modules
- doins FindQuaZip.cmake
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2019-05-27 18:35 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-05-27 18:35 UTC (permalink / raw
To: gentoo-commits
commit: daeb3a4aab4d91037646d7a4af6dcd645de6befe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 17:36:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 27 18:35:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daeb3a4a
dev-libs/quazip: 0.8.1 version bump
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/quazip/Manifest | 2 +-
.../quazip-0.8-revert-FindQuaZip-location.patch | 23 ----------------------
.../{quazip-0.8.ebuild => quazip-0.8.1.ebuild} | 2 --
3 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 824bcc1e54d..3a2e764d596 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,2 +1,2 @@
DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
-DIST quazip-0.8.tar.gz 150570 BLAKE2B 7478e80f250b5fd1dd3a09af2fec1c023de59a17020fb5d05eb0e6ed7276ff21341d8a80cec6944034fd3bc93e5e5c8bf38bb4a9735654388eca672527e7856e SHA512 f007760613d1f1899eb99cfb1ec49fee97d6a3a427b0cf6fe1421ebdfdefe7fc0317aebcca6bb79396fd8b32e8cda2ab65c019f1b7b85682bdea3e22900bbc8b
+DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
diff --git a/dev-libs/quazip/files/quazip-0.8-revert-FindQuaZip-location.patch b/dev-libs/quazip/files/quazip-0.8-revert-FindQuaZip-location.patch
deleted file mode 100644
index 1d96af6791f..00000000000
--- a/dev-libs/quazip/files/quazip-0.8-revert-FindQuaZip-location.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6f5e2159dc7ee898ef08a9e3e3a8e0248d2d0caf Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 25 May 2019 18:13:58 +0200
-Subject: [PATCH] Revert "Install the FindQuaZip.cmake in the right prefix"
-
-This reverts commit d5eaa8be998da2430ffd43e0eefa617cf1550ca3.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a43fefe..539caa4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,4 +60,4 @@ set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE
-
- add_subdirectory(quazip)
-
--install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION share/cmake)
-+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules)
---
-2.21.0
-
diff --git a/dev-libs/quazip/quazip-0.8.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild
similarity index 94%
rename from dev-libs/quazip/quazip-0.8.ebuild
rename to dev-libs/quazip/quazip-0.8.1.ebuild
index 34df694c62a..69667b006a0 100644
--- a/dev-libs/quazip/quazip-0.8.ebuild
+++ b/dev-libs/quazip/quazip-0.8.1.ebuild
@@ -21,8 +21,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${P}-revert-FindQuaZip-location.patch" )
-
src_prepare() {
cmake-utils_src_prepare
if ! use static-libs ; then
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2020-07-13 0:30 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-07-13 0:30 UTC (permalink / raw
To: gentoo-commits
commit: 98532a89b0351b032404c1f8658ed83d73641428
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 16:58:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 00:29:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98532a89
dev-libs/quazip: 0.9.1 version bump
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 +
.../quazip/files/quazip-0.9.1-no-static-lib.patch | 40 ++++++++++++++++++++
dev-libs/quazip/files/quazip-0.9.1-pkgconfig.patch | 31 ++++++++++++++++
dev-libs/quazip/quazip-0.9.1.ebuild | 43 ++++++++++++++++++++++
4 files changed, 115 insertions(+)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index b6da0d2bc9a..107af5e1dde 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1 +1,2 @@
DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
+DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
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 00000000000..f0ce3e6e392
--- /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/files/quazip-0.9.1-pkgconfig.patch b/dev-libs/quazip/files/quazip-0.9.1-pkgconfig.patch
new file mode 100644
index 00000000000..66de677611d
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.9.1-pkgconfig.patch
@@ -0,0 +1,31 @@
+From 94b18d81752490b694d262a4889085e9d55bc5d5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 9 Jul 2020 23:08:22 +0200
+Subject: [PATCH] Fix pkgconfig include dir
+
+---
+ quazip.pc.cmakein | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein
+index e46d4c6..4cd8c86 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
++includedir=${prefix}/include/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
+--
+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 00000000000..c7116322243
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.9.1.ebuild
@@ -0,0 +1,43 @@
+# 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}-pkgconfig.patch"
+)
+
+src_configure() {
+ local libdir=$(get_libdir)
+
+ local mycmakeargs=(
+ -DLIB_SUFFIX=${libdir/lib/}
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # compatibility with not yet fixed rdeps (Gentoo bug #598136)
+ dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2020-07-19 22:13 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-07-19 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 65628e50c872561392b69ad4c863696ec5995697
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 21:17:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 22:13:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65628e50
dev-libs/quazip: Escalate pkgconfig patch to gnuinstalldirs patch
Drop src_configure() and fix pkgconfig paths at the same time.
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../quazip/files/quazip-0.9.1-gnuinstalldirs.patch | 90 ++++++++++++++++++++++
dev-libs/quazip/files/quazip-0.9.1-pkgconfig.patch | 31 --------
dev-libs/quazip/quazip-0.9.1.ebuild | 11 +--
3 files changed, 91 insertions(+), 41 deletions(-)
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 00000000000..ee389da9d4e
--- /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-pkgconfig.patch b/dev-libs/quazip/files/quazip-0.9.1-pkgconfig.patch
deleted file mode 100644
index 66de677611d..00000000000
--- a/dev-libs/quazip/files/quazip-0.9.1-pkgconfig.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 94b18d81752490b694d262a4889085e9d55bc5d5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 23:08:22 +0200
-Subject: [PATCH] Fix pkgconfig include dir
-
----
- quazip.pc.cmakein | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein
-index e46d4c6..4cd8c86 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
-+includedir=${prefix}/include/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
---
-2.27.0
-
diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild
index c7116322243..dfd72df8e6f 100644
--- a/dev-libs/quazip/quazip-0.9.1.ebuild
+++ b/dev-libs/quazip/quazip-0.9.1.ebuild
@@ -23,18 +23,9 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-no-static-lib.patch"
- "${FILESDIR}/${P}-pkgconfig.patch"
+ "${FILESDIR}/${P}-gnuinstalldirs.patch"
)
-src_configure() {
- local libdir=$(get_libdir)
-
- local mycmakeargs=(
- -DLIB_SUFFIX=${libdir/lib/}
- )
- cmake_src_configure
-}
-
src_install() {
cmake_src_install
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2021-02-15 3:30 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-02-15 3:30 UTC (permalink / raw
To: gentoo-commits
commit: c48daa4231f7497051c9ecd72e9d9709b6588c05
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 03:18:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 03:30:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48daa42
dev-libs/quazip: bump to 1.1 (new slot)
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 +
.../files/quazip-1.1-conditional-tests.patch | 40 +++++++++++++++++
dev-libs/quazip/quazip-1.1.ebuild | 52 ++++++++++++++++++++++
3 files changed, 93 insertions(+)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 1a64e045769..8ca86518b22 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1 +1,2 @@
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-1.1-conditional-tests.patch b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
new file mode 100644
index 00000000000..68520a4b3b9
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14230a6..22c1421 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,34 +26,25 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
+ set(QUAZIP_LIB_TARGET_NAME QuaZip)
+ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+-set(QUAZIP_ENABLE_TESTS OFF)
++option(QUAZIP_ENABLE_TESTS "" OFF)
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+ find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+ OPTIONAL_COMPONENTS Network Test)
+ set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
+ set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
+- if (Qt6Network_FOUND AND Qt6Test_FOUND)
+- set(QUAZIP_ENABLE_TESTS ON)
+- endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+ find_package(Qt5 REQUIRED COMPONENTS Core
+ OPTIONAL_COMPONENTS Network Test)
+ set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
+ set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+ set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
+- if (Qt5Network_FOUND AND Qt5Test_FOUND)
+- set(QUAZIP_ENABLE_TESTS ON)
+- endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+ find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+ OPTIONAL_COMPONENTS QtNetwork QtTest)
+ set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
+ set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
+- if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
+- set(QUAZIP_ENABLE_TESTS ON)
+- endif()
+ else()
+ message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
diff --git a/dev-libs/quazip/quazip-1.1.ebuild b/dev-libs/quazip/quazip-1.1.ebuild
new file mode 100644
index 00000000000..491c9969ee3
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+# Note: Please check if upstream want 2.x and so on to be slotted when released.
+if ver_test ${PV} -ge 2.0 ; then
+ # Sanity check to avoid naive copy-bumps
+ # Upstream expect parallel installation of 0.x/1.x/2.x/...
+ # https://github.com/stachenov/quazip/blob/master/QuaZip-1.x-migration.md
+ die "Upstream want 0.x, 1.x, 2.x, ... to be slotted"
+fi
+
+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="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ sys-libs/zlib[minizip]
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1-conditional-tests.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DQUAZIP_ENABLE_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use test && cmake_src_compile qztest
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2021-04-10 16:29 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-04-10 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 379fe08fc51ec93dfaa8042c152953183fdcd736
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 11:31:29 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 16:29:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379fe08f
dev-libs/quazip: Drop 0.9.1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 -
.../quazip/files/quazip-0.9.1-gnuinstalldirs.patch | 90 ----------------------
.../quazip/files/quazip-0.9.1-no-static-lib.patch | 40 ----------
dev-libs/quazip/quazip-0.9.1.ebuild | 33 --------
4 files changed, 164 deletions(-)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 8ca86518b22..6ac806794bb 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 c8dc5b6e3ad..00000000000
--- 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 f0ce3e6e392..00000000000
--- 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 cec7a955d1d..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2021-12-24 18:35 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-12-24 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 0f27157f88c691abc238bcda980aa54ba73551cb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 17:46:38 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 18:25:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f27157f
dev-libs/quazip: 1.2 version bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 +
dev-libs/quazip/files/quazip-1.2-cmake.patch | 79 ++++++++++++++++++++++++++++
dev-libs/quazip/quazip-1.2.ebuild | 48 +++++++++++++++++
3 files changed, 128 insertions(+)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 6ac806794bbb..0033d4c87472 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1 +1,2 @@
DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
+DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
diff --git a/dev-libs/quazip/files/quazip-1.2-cmake.patch b/dev-libs/quazip/files/quazip-1.2-cmake.patch
new file mode 100644
index 000000000000..e8bfdf7807cc
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.2-cmake.patch
@@ -0,0 +1,79 @@
+From d141ac016ad587b052886b17b42c8c4dc77aba98 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 20 Feb 2021 22:53:46 +0100
+Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c42816..5d52baf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,9 +11,10 @@ set(QUAZIP_LIB_SOVERSION 1.0.0)
+ option(BUILD_SHARED_LIBS "" ON)
+ option(QUAZIP_INSTALL "" ON)
+ option(QUAZIP_USE_QT_ZLIB "" OFF)
+-option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+ set(QUAZIP_QT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (4 or 5), defaults to 5")
+
++include(CTest)
++
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+@@ -30,23 +31,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+- find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+- OPTIONAL_COMPONENTS Network Test)
++ find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
+ set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
+- set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
++ if (BUILD_TESTING)
++ find_package(Qt6 REQUIRED COMPONENTS Network Test)
++ set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
++ endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+- find_package(Qt5 REQUIRED COMPONENTS Core
+- OPTIONAL_COMPONENTS Network Test)
++ find_package(Qt5 REQUIRED COMPONENTS Core)
+ set(QUAZIP_LIB_LIBRARIES Qt5::Core)
+- set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+- set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
++ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
++ if (BUILD_TESTING)
++ find_package(Qt5 REQUIRED COMPONENTS Network Test)
++ set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
++ endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+- find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+- OPTIONAL_COMPONENTS QtNetwork QtTest)
++ find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
+ set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
+- set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
++ if (BUILD_TESTING)
++ find_package(Qt4 REQUIRED COMPONENTS Network Test)
++ set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
++ endif()
+ else()
+ message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
+@@ -67,8 +74,7 @@ endif()
+
+ add_subdirectory(quazip)
+
+-if(QUAZIP_ENABLE_TESTS)
++if(BUILD_TESTING)
+ message(STATUS "Building QuaZip tests")
+- enable_testing()
+ add_subdirectory(qztest)
+ endif()
+--
+2.34.1
+
diff --git a/dev-libs/quazip/quazip-1.2.ebuild b/dev-libs/quazip/quazip-1.2.ebuild
new file mode 100644
index 000000000000..b118be537348
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-qt/qtcore:5
+ sys-libs/zlib[minizip]
+"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !=dev-libs/quazip-1.1-r0:1
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DQUAZIP_QT_MAJOR_VERSION=5
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use test && cmake_build qztest
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2022-01-25 16:11 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-01-25 16:11 UTC (permalink / raw
To: gentoo-commits
commit: f9759d5307a019dd3481795376c212c64611806b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 16:11:21 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 16:11:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9759d53
dev-libs/quazip: Drop 1.1-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 -
dev-libs/quazip/files/quazip-1.1-cmake.patch | 84 ----------------------------
dev-libs/quazip/quazip-1.1-r1.ebuild | 48 ----------------
3 files changed, 133 deletions(-)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 0033d4c87472..dbe68bf12763 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,2 +1 @@
-DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
diff --git a/dev-libs/quazip/files/quazip-1.1-cmake.patch b/dev-libs/quazip/files/quazip-1.1-cmake.patch
deleted file mode 100644
index 1355f6c13d39..000000000000
--- a/dev-libs/quazip/files/quazip-1.1-cmake.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From cb46ae4bc4c9684010b433eec3a35fc4fa1ebc5d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 20 Feb 2021 22:53:46 +0100
-Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 38 +++++++++++++++++---------------------
- 1 file changed, 17 insertions(+), 21 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c314fe1..bac3699 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE RELEASE)
- endif()
-
--enable_testing()
-+include(CTest)
- set(CMAKE_AUTOMOC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_DEBUG_POSTFIX d)
-@@ -27,33 +27,29 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
- set(QUAZIP_LIB_TARGET_NAME QuaZip)
- set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
- set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
--set(QUAZIP_ENABLE_TESTS OFF)
- if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
-- find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
-- OPTIONAL_COMPONENTS Network Test)
-+ find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
- set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
-- set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
- set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
-- if (Qt6Network_FOUND AND Qt6Test_FOUND)
-- set(QUAZIP_ENABLE_TESTS ON)
-- endif()
-+ if (BUILD_TESTING)
-+ find_package(Qt6 REQUIRED COMPONENTS Network Test)
-+ set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
-+ endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
-- find_package(Qt5 REQUIRED COMPONENTS Core
-- OPTIONAL_COMPONENTS Network Test)
-+ find_package(Qt5 REQUIRED COMPONENTS Core)
- set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
-- set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
- set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
-- if (Qt5Network_FOUND AND Qt5Test_FOUND)
-- set(QUAZIP_ENABLE_TESTS ON)
-- endif()
-+ if (BUILD_TESTING)
-+ find_package(Qt5 REQUIRED COMPONENTS Network Test)
-+ set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
-+ endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
-- find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
-- OPTIONAL_COMPONENTS QtNetwork QtTest)
-+ find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
- set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
-- set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
-- if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
-- set(QUAZIP_ENABLE_TESTS ON)
-+ if (BUILD_TESTING)
-+ find_package(Qt4 REQUIRED COMPONENTS Network Test)
-+ set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- endif()
- else()
- message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
-@@ -69,7 +65,7 @@ endif()
-
- add_subdirectory(quazip)
-
--if(QUAZIP_ENABLE_TESTS)
-- add_subdirectory(qztest EXCLUDE_FROM_ALL)
-+if(BUILD_TESTING)
-+ add_subdirectory(qztest EXCLUDE_FROM_ALL)
- endif()
-
---
-2.30.1
-
diff --git a/dev-libs/quazip/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
deleted file mode 100644
index 29a58b0ea105..000000000000
--- a/dev-libs/quazip/quazip-1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-qt/qtcore:5
- sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DQUAZIP_QT_MAJOR_VERSION=5
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- use test && cmake_build qztest
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/
@ 2022-04-20 10:16 Andrew Ammerlaan
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2022-04-20 10:16 UTC (permalink / raw
To: gentoo-commits
commit: c504c1ac975808a05b9928a5297133e12a7a9607
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue Apr 19 22:21:55 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 10:16:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c504c1ac
dev-libs/quazip: 1.3 version bump
Closes: https://bugs.gentoo.org/839264
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25119
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-libs/quazip/Manifest | 1 +
dev-libs/quazip/files/quazip-1.3-cmake.patch | 84 ++++++++++++++++++++++++++++
dev-libs/quazip/quazip-1.3.ebuild | 47 ++++++++++++++++
3 files changed, 132 insertions(+)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index dbe68bf12763..f382b0c66d22 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1 +1,2 @@
DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
+DIST quazip-1.3.tar.gz 156138 BLAKE2B a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
diff --git a/dev-libs/quazip/files/quazip-1.3-cmake.patch b/dev-libs/quazip/files/quazip-1.3-cmake.patch
new file mode 100644
index 000000000000..016bd97f1dc0
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.3-cmake.patch
@@ -0,0 +1,84 @@
+From 9d9e4e7c2076f0ab1a482ae32203aa336dc4ba9b Mon Sep 17 00:00:00 2001
+From: Thiago Donato Ferreira <flowlnlnln@gmail.com>
+Date: Mon, 18 Apr 2022 12:08:55 -0300
+Subject: [PATCH] Add CTest patch
+
+Signed-off-by: Thiago Donato Ferreira <flowlnlnln@gmail.com>
+---
+ CMakeLists.txt | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3eaf1a..71f2748 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@ set(QUAZIP_LIB_SOVERSION 1.3.0)
+ option(BUILD_SHARED_LIBS "" ON)
+ option(QUAZIP_INSTALL "" ON)
+ option(QUAZIP_USE_QT_ZLIB "" OFF)
+-option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+
+ # Set the default value of `${QUAZIP_QT_MAJOR_VERSION}`.
+ # We search quietly for Qt6, Qt5 and Qt4 in that order.
+@@ -34,6 +33,8 @@ endif()
+
+ set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}")
+
++include(CTest)
++
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+@@ -50,23 +51,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+- find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+- OPTIONAL_COMPONENTS Network Test)
++ find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
+ set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
+- set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
++ if (BUILD_TESTING)
++ find_package(Qt6 REQUIRED COMPONENTS Network Test)
++ set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
++ endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+- find_package(Qt5 REQUIRED COMPONENTS Core
+- OPTIONAL_COMPONENTS Network Test)
++ find_package(Qt5 REQUIRED COMPONENTS Core)
+ set(QUAZIP_LIB_LIBRARIES Qt5::Core)
+- set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+- set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
++ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
++ if (BUILD_TESTING)
++ find_package(Qt5 REQUIRED COMPONENTS Network Test)
++ set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
++ endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+- find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+- OPTIONAL_COMPONENTS QtNetwork QtTest)
++ find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
+ set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
+- set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, QtCore")
++ if (BUILD_TESTING)
++ find_package(Qt4 REQUIRED COMPONENTS Network Test)
++ set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
++ endif()
+ else()
+ message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
+@@ -88,8 +95,7 @@ endif()
+
+ add_subdirectory(quazip)
+
+-if(QUAZIP_ENABLE_TESTS)
++if(BUILD_TESTING)
+ message(STATUS "Building QuaZip tests")
+- enable_testing()
+ add_subdirectory(qztest)
+ endif()
+--
+2.35.1
+
diff --git a/dev-libs/quazip/quazip-1.3.ebuild b/dev-libs/quazip/quazip-1.3.ebuild
new file mode 100644
index 000000000000..43b0ab41e9e2
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-qt/qtcore:5
+ sys-libs/zlib[minizip]
+"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !=dev-libs/quazip-1.1-r0:1
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use test && cmake_build qztest
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-20 10:16 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-25 20:42 [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/, dev-libs/quazip/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2019-05-27 18:35 Andreas Sturmlechner
2020-07-13 0:30 Andreas Sturmlechner
2020-07-19 22:13 Andreas Sturmlechner
2021-02-15 3:30 Sam James
2021-04-10 16:29 Andreas Sturmlechner
2021-12-24 18:35 Andreas Sturmlechner
2022-01-25 16:11 Andreas Sturmlechner
2022-04-20 10:16 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox