[gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/files/, dev-libs/quazip/
commit: 89f27fe6c532660666a694ce93758e20bced0bbe
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Mon May 22 06:57:19 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon May 22 06:57:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f27fe6
dev-libs/quazip: add 1.4
Signed-off-by: Andrew Ammerlaan gentoo.org>
dev-libs/quazip/Manifest | 1 +
dev-libs/quazip/files/quazip-1.4-cmake.patch | 76
dev-libs/quazip/quazip-1.4.ebuild| 88
3 files changed, 165 insertions(+)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index f382b0c66d22..d8ac2a86ded3 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,2 +1,3 @@
DIST quazip-1.2.tar.gz 155878 BLAKE2B
cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695
SHA512
3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
DIST quazip-1.3.tar.gz 156138 BLAKE2B
a9002bdfab39fc1516160b0073fd3d59a65a66eda98240b9a2936d4423b21b40dd9360122950a54dc18236bc2aaf4e1e2d761ba145f6dbd5014cf72a287fbb3b
SHA512
3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
+DIST quazip-1.4.tar.gz 157819 BLAKE2B
bb0ec2ebd31d6ce5e2a19fc1b13570d57aa1438ff192621543ab6aec4e85f76677863d37efbe0bc59e3530ce023586440081cd47f069b4dcbac55118d12f8668
SHA512
38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9
diff --git a/dev-libs/quazip/files/quazip-1.4-cmake.patch
b/dev-libs/quazip/files/quazip-1.4-cmake.patch
new file mode 100644
index ..d796c94026c7
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.4-cmake.patch
@@ -0,0 +1,76 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6719c6..e0520ae 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -14,12 +14,10 @@ if(EMSCRIPTEN)
+ option(BUILD_SHARED_LIBS "" OFF)
+ option(QUAZIP_INSTALL "" OFF)
+ option(QUAZIP_USE_QT_ZLIB "" OFF)
+- option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+ else()
+ option(BUILD_SHARED_LIBS "" ON)
+ option(QUAZIP_INSTALL "" ON)
+ option(QUAZIP_USE_QT_ZLIB "" OFF)
+- option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+ endif()
+
+ # Make BZIP2 optional
+@@ -56,6 +54,8 @@ else()
+ set(CMAKE_CXX_STANDARD 14)
+ endif()
+
++include(CTest)
++
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+@@ -72,23 +72,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()
+@@ -191,8 +197,7 @@ endif()
+
+ add_subdirectory(quazip)
+
+-if(QUAZIP_ENABLE_TESTS)
++if(BUILD_TESTING)
+ message(STATUS "Building QuaZip tests")
+-enable_testing()
+ add_subdirectory(qztest)
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/files/, dev-libs/quazip/
commit: bc6e277bad31948b11a7041e8479d4514a7a7060
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 20 22:03:55 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 23 19:52:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6e277b
dev-libs/quazip: Drop 1.1 (r0)
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/quazip-1.1-conditional-tests.patch | 40 -
dev-libs/quazip/quazip-1.1.ebuild | 52 --
2 files changed, 92 deletions(-)
diff --git a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
deleted file mode 100644
index 68520a4b3b9..000
--- a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644
index 491c9969ee3..000
--- a/dev-libs/quazip/quazip-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/files/, dev-libs/quazip/
commit: 91a42c15bfe50eb75791deab29deb83c4469ca05
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 25 16:18:30 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 25 20:54:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a42c15
dev-libs/quazip: 0.8 version bump
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-libs/quazip/Manifest | 1 +
.../quazip-0.8-revert-FindQuaZip-location.patch| 23 ++
dev-libs/quazip/quazip-0.8.ebuild | 50 ++
3 files changed, 74 insertions(+)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 21e5d49acaa..824bcc1e54d 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1 +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
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
new file mode 100644
index 000..1d96af6791f
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.8-revert-FindQuaZip-location.patch
@@ -0,0 +1,23 @@
+From 6f5e2159dc7ee898ef08a9e3e3a8e0248d2d0caf Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+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.ebuild
new file mode 100644
index 000..34df694c62a
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-revert-FindQuaZip-location.patch" )
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if ! use static-libs ; then
+ sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt
|| die
+ fi
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local -x CXXFLAGS="${CXXFLAGS}"
+ append-cxxflags -std=c++11 -fPIC
+
+ local mycmakeargs=(
+ -DBUILD_WITH_QT4=OFF
+ -DLIB_SUFFIX=${libdir/lib/}
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # compatibility with not yet fixed rdeps (Gentoo bug #598136)
+ dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
+}
