Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/qtcompress/files/, dev-libs/qtcompress/
Date: Sat, 10 Oct 2020 07:23:02
Message-Id: 1602314552.32fa1fd73e5f62c262c5dcb076cbcd9b9ae81409.juippis@gentoo
1 commit: 32fa1fd73e5f62c262c5dcb076cbcd9b9ae81409
2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
3 AuthorDate: Mon Sep 28 08:52:49 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 10 07:22:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fa1fd7
7
8 dev-libs/qtcompress: new package
9
10 Unbundled dependency of sci-astronomy/stellarium
11
12 Bug: https://bugs.gentoo.org/745234
13 Package-Manager: Portage-3.0.4, Repoman-3.0.1
14 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
15 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
16
17 dev-libs/qtcompress/Manifest | 1 +
18 .../files/qtcompress-0_p20180513-remove-zlib.patch | 10 ++++
19 .../qtcompress-0_p20180513-test-include.patch | 13 +++++
20 dev-libs/qtcompress/metadata.xml | 15 +++++
21 dev-libs/qtcompress/qtcompress-0_p20180513.ebuild | 64 ++++++++++++++++++++++
22 5 files changed, 103 insertions(+)
23
24 diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
25 new file mode 100644
26 index 00000000000..dba886d100d
27 --- /dev/null
28 +++ b/dev-libs/qtcompress/Manifest
29 @@ -0,0 +1 @@
30 +DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
31
32 diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
33 new file mode 100644
34 index 00000000000..de89e7ac2ae
35 --- /dev/null
36 +++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
37 @@ -0,0 +1,10 @@
38 +diff --git a/src/compress/compress.pro b/src/compress/compress.pro
39 +index 14ec502..3105a7f 100644
40 +--- a/src/compress/compress.pro
41 ++++ b/src/compress/compress.pro
42 +@@ -11,5 +11,3 @@ HEADERS += \
43 + qtcompressglobal.h
44 +
45 + SOURCES += qzip.cpp
46 +-
47 +-include(../3rdparty/zlib.pri)
48
49 diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
50 new file mode 100644
51 index 00000000000..cc7bec4ed1e
52 --- /dev/null
53 +++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
54 @@ -0,0 +1,13 @@
55 +--- a/tests/auto/unit/qzip/tst_qzip.cpp 2018-05-13 09:44:01.000000000 +0100
56 ++++ b/tests/auto/unit/qzip/tst_qzip.cpp 2020-09-28 09:40:14.493025102 +0100
57 +@@ -41,8 +41,8 @@
58 +
59 + #include <QtTest/QtTest>
60 + #include <QDebug>
61 +-#include <QtCompress/qzipwriter.h>
62 +-#include <QtCompress/qzipreader.h>
63 ++#include <qzipwriter.h>
64 ++#include <qzipreader.h>
65 +
66 + class tst_QZip : public QObject
67 + {
68
69 diff --git a/dev-libs/qtcompress/metadata.xml b/dev-libs/qtcompress/metadata.xml
70 new file mode 100644
71 index 00000000000..a07b3622f7d
72 --- /dev/null
73 +++ b/dev-libs/qtcompress/metadata.xml
74 @@ -0,0 +1,15 @@
75 +<?xml version="1.0" encoding="UTF-8"?>
76 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
77 +<pkgmetadata>
78 + <maintainer type="person">
79 + <email>alexey+gentoo@××××××××.org</email>
80 + <name>Alexey Sokolov</name>
81 + </maintainer>
82 + <maintainer type="project">
83 + <email>proxy-maint@g.o</email>
84 + <name>Proxy Maintainers</name>
85 + </maintainer>
86 + <upstream>
87 + <remote-id type="github">nezticle/qtcompress</remote-id>
88 + </upstream>
89 +</pkgmetadata>
90
91 diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
92 new file mode 100644
93 index 00000000000..1d0b1471137
94 --- /dev/null
95 +++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
96 @@ -0,0 +1,64 @@
97 +# Copyright 1999-2020 Gentoo Authors
98 +# Distributed under the terms of the GNU General Public License v2
99 +
100 +EAPI=7
101 +
102 +inherit qmake-utils toolchain-funcs virtualx
103 +
104 +DESCRIPTION="A public API for QZip in an easy to use module"
105 +
106 +HOMEPAGE="https://github.com/nezticle/qtcompress"
107 +MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677"
108 +SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
109 +
110 +LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
111 +SLOT="0/5.11.0"
112 +KEYWORDS="~amd64 ~x86"
113 +IUSE="test"
114 +RESTRICT="!test? ( test )"
115 +S="${WORKDIR}/qtcompress-${MY_COMMIT}"
116 +
117 +RDEPEND="
118 + dev-qt/qtcore:5
119 + sys-libs/zlib
120 +"
121 +DEPEND="
122 + ${RDEPEND}
123 + test? ( dev-qt/qttest:5 )
124 +"
125 +BDEPEND="
126 + virtual/pkgconfig
127 +"
128 +
129 +PATCHES=(
130 + "${FILESDIR}/${P}-remove-zlib.patch"
131 + "${FILESDIR}/${P}-test-include.patch"
132 +)
133 +
134 +src_prepare() {
135 + default
136 + # qtcompress is bundling its own zlib, remove it
137 + rm -r src/3rdparty/ || die
138 +}
139 +
140 +src_configure() {
141 + local pkg_config="$(tc-getPKG_CONFIG)"
142 + eqmake5 \
143 + "INCLUDEPATH+=$("${pkg_config}" --cflags zlib)" \
144 + "LIBS+=$("${pkg_config}" --libs zlib)"
145 +}
146 +
147 +src_test() {
148 + cd tests/auto/unit || die
149 + eqmake5 \
150 + "INCLUDEPATH+=${S}/src/compress"
151 + emake
152 + virtx qzip/target_wrapper.sh qzip/tst_qzip
153 +}
154 +
155 +src_install() {
156 + emake INSTALL_ROOT="${D}" install
157 + rm "${ED}/usr/$(get_libdir)/libQt5Compress.la" || die
158 + insinto /usr/include/qt5/QtCompress
159 + doins src/compress/{qzipreader.h,qzipwriter.h,qtcompressglobal.h}
160 +}