From 7ba454fa932ccc3d341648d9338290afba484752 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Sat, 24 Apr 2021 18:00:12 +0200 Subject: [PATCH] Added --- dev-libs/qtcompress/Manifest | 1 + .../files/qtcompress-0_p20180513-nogui.patch | 10 +++ .../qtcompress-0_p20180513-remove-zlib.patch | 10 +++ .../qtcompress-0_p20180513-test-include.patch | 13 ++++ .../qtcompress/qtcompress-0_p20180513.ebuild | 65 +++++++++++++++++++ 5 files changed, 99 insertions(+) create mode 100644 dev-libs/qtcompress/Manifest create mode 100644 dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch create mode 100644 dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch create mode 100644 dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch create mode 100644 dev-libs/qtcompress/qtcompress-0_p20180513.ebuild diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest new file mode 100644 index 0000000..dba886d --- /dev/null +++ b/dev-libs/qtcompress/Manifest @@ -0,0 +1 @@ +DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336 diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch new file mode 100644 index 0000000..1dd5f4f --- /dev/null +++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch @@ -0,0 +1,10 @@ +--- a/tests/auto/unit/qzip/qzip.pro 2018-05-13 08:44:01.000000000 -0000 ++++ b/tests/auto/unit/qzip/qzip.pro 2020-10-10 14:23:34.377528668 -0000 +@@ -1,6 +1,7 @@ + CONFIG += testcase + TARGET = tst_qzip + QT += compress testlib ++QT -= gui + SOURCES += tst_qzip.cpp + + wince* { diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch new file mode 100644 index 0000000..de89e7a --- /dev/null +++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch @@ -0,0 +1,10 @@ +diff --git a/src/compress/compress.pro b/src/compress/compress.pro +index 14ec502..3105a7f 100644 +--- a/src/compress/compress.pro ++++ b/src/compress/compress.pro +@@ -11,5 +11,3 @@ HEADERS += \ + qtcompressglobal.h + + SOURCES += qzip.cpp +- +-include(../3rdparty/zlib.pri) diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch new file mode 100644 index 0000000..cc7bec4 --- /dev/null +++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch @@ -0,0 +1,13 @@ +--- a/tests/auto/unit/qzip/tst_qzip.cpp 2018-05-13 09:44:01.000000000 +0100 ++++ b/tests/auto/unit/qzip/tst_qzip.cpp 2020-09-28 09:40:14.493025102 +0100 +@@ -41,8 +41,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + + class tst_QZip : public QObject + { diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild new file mode 100644 index 0000000..188c64e --- /dev/null +++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils toolchain-funcs virtualx + +DESCRIPTION="A public API for QZip in an easy to use module" + +HOMEPAGE="https://github.com/nezticle/qtcompress" +MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677" +SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/qtcompress-${MY_COMMIT}" + +LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3" +SLOT="0/5.11.0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~arm ~arm64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5 + sys-libs/zlib +" +DEPEND=" + ${RDEPEND} + test? ( dev-qt/qttest:5 ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-remove-zlib.patch" + "${FILESDIR}/${P}-test-include.patch" + "${FILESDIR}/${P}-nogui.patch" +) + +src_prepare() { + default + # qtcompress is bundling its own zlib, remove it + rm -r src/3rdparty/ || die +} + +src_configure() { + local pkg_config="$(tc-getPKG_CONFIG)" + eqmake5 \ + "INCLUDEPATH+=$("${pkg_config}" --cflags zlib)" \ + "LIBS+=$("${pkg_config}" --libs zlib)" +} + +src_test() { + cd tests/auto/unit || die + eqmake5 \ + "INCLUDEPATH+=${S}/src/compress" + emake + virtx qzip/target_wrapper.sh qzip/tst_qzip +} + +src_install() { + emake INSTALL_ROOT="${D}" install + rm "${ED}/usr/$(get_libdir)/libQt5Compress.la" || die + insinto /usr/include/qt5/QtCompress + doins src/compress/{qzipreader.h,qzipwriter.h,qtcompressglobal.h} +}