1 |
commit: d2beaf0948c16eb8026d846e9c981df26646131d |
2 |
Author: Antti Jarvinen <antti.jarvinen <AT> katiska <DOT> org> |
3 |
AuthorDate: Sat Dec 2 11:21:11 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 26 21:43:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2beaf09 |
7 |
|
8 |
net-p2p/classified-ads: version bump to upstream version 0.12. |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/6398 |
12 |
|
13 |
net-p2p/classified-ads/Manifest | 2 + |
14 |
net-p2p/classified-ads/classified-ads-0.12.ebuild | 88 ++++++++++++++++++++++ |
15 |
.../files/classified-ads-0.12-unit-tests.patch | 48 ++++++++++++ |
16 |
net-p2p/classified-ads/metadata.xml | 65 ++++++++-------- |
17 |
4 files changed, 172 insertions(+), 31 deletions(-) |
18 |
|
19 |
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest |
20 |
index 057e45a25e6..adb21be0651 100644 |
21 |
--- a/net-p2p/classified-ads/Manifest |
22 |
+++ b/net-p2p/classified-ads/Manifest |
23 |
@@ -1,2 +1,4 @@ |
24 |
DIST classified-ads-0.11.tar.gz 2528877 BLAKE2B a2e9bfe2acdf9e95cd6e7246ca50525fdfbaf8b11b8fac41faa7c8fe01db7a4cf1055a69b4cf9168bbce7e7e25438b44d57a50669c3c406015df357c20e9106d SHA512 29e1af0eac079201354364959af8dc606f4d7595fe4e8013212c4e5b30622d095e2beaeeadce350974ef32680329664ad37aae575c103fa052345acf0a49ed04 |
25 |
+DIST classified-ads-0.12.tar.gz 2639300 BLAKE2B 09822a4908e3a34fbd00af60effa53c437e1e32cb1821c0041ca0cb87f4deb74ba79603c5d5aa5fe37384f2bc32f2ccd2979711c2de1e2864361904e62e2de26 SHA512 cbcd3f40cd9003b840b1305361f93c901b073c653f610e46154e8ff1db92167ce77aafe5179168d7403fed7b22fab60cadfc8c1fc95ebe37a4f7ffc616b66929 |
26 |
DIST classified-ads-graphics-0.11.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d |
27 |
+DIST classified-ads-graphics-0.12.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d |
28 |
|
29 |
diff --git a/net-p2p/classified-ads/classified-ads-0.12.ebuild b/net-p2p/classified-ads/classified-ads-0.12.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..083c75d23ab |
32 |
--- /dev/null |
33 |
+++ b/net-p2p/classified-ads/classified-ads-0.12.ebuild |
34 |
@@ -0,0 +1,88 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+PLOCALES="en fi sv da uk es" |
40 |
+PLOCALE_BACKUP="en" |
41 |
+inherit qmake-utils virtualx l10n |
42 |
+ |
43 |
+DESCRIPTION="Program for displaying classified advertisement items" |
44 |
+HOMEPAGE="http://katiska.org/classified-ads/" |
45 |
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \ |
46 |
+ -> classified-ads-${PV}.tar.gz \ |
47 |
+ https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \ |
48 |
+ -> classified-ads-graphics-${PV}.tar.gz" |
49 |
+ |
50 |
+LICENSE="LGPL-2.1" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~amd64 ~x86" |
53 |
+ |
54 |
+IUSE="doc test" |
55 |
+ |
56 |
+RDEPEND="dev-libs/openssl:0 |
57 |
+ >=net-libs/libnatpmp-20130911 |
58 |
+ <=net-libs/libnatpmp-20140401-r1 |
59 |
+ >=net-libs/miniupnpc-1.8 |
60 |
+ sys-apps/file |
61 |
+ dev-qt/qtcore:5 |
62 |
+ dev-qt/qtgui:5 |
63 |
+ dev-qt/qtnetwork:5[ssl] |
64 |
+ dev-qt/qtwidgets:5 |
65 |
+ dev-qt/qtsql:5[sqlite] |
66 |
+ dev-qt/qtmultimedia:5[widgets] |
67 |
+ dev-qt/qtprintsupport:5 |
68 |
+ media-libs/opus |
69 |
+ virtual/libintl |
70 |
+ dev-lang/tcl:= |
71 |
+ dev-lang/tk:= |
72 |
+ sys-libs/zlib" |
73 |
+ |
74 |
+DEPEND="${RDEPEND} |
75 |
+ sys-devel/gettext |
76 |
+ doc? ( app-doc/doxygen[dot] ) |
77 |
+ test? ( dev-libs/libgcrypt:0 |
78 |
+ dev-qt/qttest:5 |
79 |
+ sys-devel/gdb:0 )" |
80 |
+ |
81 |
+src_prepare() { |
82 |
+ # preprocessed graphics are unpacked into wrong directory |
83 |
+ # so lets move them into correct location: |
84 |
+ mv ../ui/* ui/ || die |
85 |
+ # unit-test patch |
86 |
+ eapply "${FILESDIR}/${P}-unit-tests.patch" |
87 |
+ # possible patches |
88 |
+ eapply_user |
89 |
+} |
90 |
+ |
91 |
+src_configure() { |
92 |
+ eqmake5 |
93 |
+ if use test; then |
94 |
+ cd test || die |
95 |
+ eqmake5 |
96 |
+ fi |
97 |
+} |
98 |
+ |
99 |
+src_compile() { |
100 |
+ emake |
101 |
+ if use doc; then |
102 |
+ pushd doc > /dev/null || die |
103 |
+ doxygen || die |
104 |
+ popd > /dev/null || die |
105 |
+ fi |
106 |
+ if use test; then |
107 |
+ pushd test > /dev/null || die |
108 |
+ emake |
109 |
+ popd > /dev/null || die |
110 |
+ fi |
111 |
+} |
112 |
+ |
113 |
+src_test() { |
114 |
+ # testca will return 0 if all unit tests pass |
115 |
+ virtx ./test/testca |
116 |
+} |
117 |
+ |
118 |
+src_install() { |
119 |
+ docompress -x /usr/share/doc/ |
120 |
+ emake install INSTALL_ROOT="${D}" DESTDIR="${D}" |
121 |
+ use doc && dodoc -r doc/doxygen.generated/html/ |
122 |
+} |
123 |
|
124 |
diff --git a/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch b/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch |
125 |
new file mode 100644 |
126 |
index 00000000000..1a1ec45f130 |
127 |
--- /dev/null |
128 |
+++ b/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch |
129 |
@@ -0,0 +1,48 @@ |
130 |
+Patch-by: Antti Järvinen <antti.jarvinen@×××××××.org> |
131 |
+Fixes unit-tests that are in non-compiling condition in released source code. |
132 |
+ |
133 |
+--- a/test/testca.pro 2017-11-17 18:30:27.000000000 +0300 |
134 |
++++ b/test/testca.pro 2017-11-21 21:55:00.000000000 +0300 |
135 |
+@@ -1,5 +1,5 @@ |
136 |
+ # |
137 |
+-# Classified Ads is Copyright (c) Antti Järvinen 2013-2016. |
138 |
++# Classified Ads is Copyright (c) Antti Järvinen 2013-2017. |
139 |
+ # |
140 |
+ # This file is part of Classified Ads. |
141 |
+ # |
142 |
+@@ -42,7 +42,8 @@ SOURCES = testca.cpp ../util/hash.cpp mockup_controller.cpp \ |
143 |
+ ../datamodel/voicecall.cpp ../datamodel/cadbrecord.cpp \ |
144 |
+ ../datamodel/cadbrecordmodel.cpp ../tcl/tclWrapper.cpp \ |
145 |
+ ../datamodel/tclprogram.cpp ../datamodel/tclmodel.cpp \ |
146 |
+- ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp |
147 |
++ ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp \ |
148 |
++ ../util/ungzip.cpp |
149 |
+ HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \ |
150 |
+ ../datamodel/model.h ../datamodel/nodemodel.h \ |
151 |
+ ../datamodel/contentencryptionmodel.h ../net/networklistener.h \ |
152 |
+@@ -68,13 +69,13 @@ HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \ |
153 |
+ ../net/mvoicecallengine.h ../datamodel/voicecall.h ../datamodel/cadbrecord.h \ |
154 |
+ ../datamodel/cadbrecordmodel.h ../tcl/tclWrapper.h \ |
155 |
+ ../datamodel/tclprogram.h ../datamodel/tclmodel.h ../tcl/tclCallbacks.h \ |
156 |
+- ../tcl/tclUtil.h ../ui/tclConsole.h |
157 |
++ ../tcl/tclUtil.h ../ui/tclConsole.h ../util/ungzip.h |
158 |
+ CONFIG += debug qtestlib |
159 |
+ QT += core network sql |
160 |
+ greaterThan(QT_MAJOR_VERSION, 4) { |
161 |
+ QT += widgets |
162 |
+ } |
163 |
+-LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk |
164 |
++LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk -lz |
165 |
+ lessThan(QT_MAJOR_VERSION, 5) { |
166 |
+ LIBS += -lqjson |
167 |
+ } |
168 |
+--- a/util/ungzip.cpp 2017-11-17 18:30:27.000000000 +0300 |
169 |
++++ b/util/ungzip.cpp 2017-11-21 21:55:00.000000000 +0300 |
170 |
+@@ -23,6 +23,6 @@ static const unsigned KZLibBlockSize ( 1024 ) ; |
171 |
+#include "ungzip.h" |
172 |
+#include <zlib.h> // actual gzip functions and data-types |
173 |
+-#include "log.h" |
174 |
++#include "../log.h" |
175 |
+ |
176 |
+ UnGZip::UnGZip() { |
177 |
+ // not really used |
178 |
|
179 |
diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml |
180 |
index 51fdc6e87f2..4546060675a 100644 |
181 |
--- a/net-p2p/classified-ads/metadata.xml |
182 |
+++ b/net-p2p/classified-ads/metadata.xml |
183 |
@@ -1,36 +1,39 @@ |
184 |
<?xml version="1.0" encoding="UTF-8"?> |
185 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
186 |
<pkgmetadata> |
187 |
- <maintainer type="person"> |
188 |
- <email>antti.jarvinen@×××××××.org</email> |
189 |
- <name>Antti Järvinen</name> |
190 |
- <description>proxy maintainer</description> |
191 |
- </maintainer> |
192 |
- <maintainer type="project"> |
193 |
- <email>proxy-maint@g.o</email> |
194 |
- <name>Proxy Maintainers</name> |
195 |
- </maintainer> |
196 |
- <longdescription lang="en"> |
197 |
- Classified ads is an attempt to re-produce parts of the functionality |
198 |
- that went away when Usenet news ceased to exist. This attempt tries to |
199 |
- fix the problem of disappearing news-servers so that there is no servers |
200 |
- required and no service-providers needed for any operation ; |
201 |
- data storage is implemented inside client applications that |
202 |
- users are running. Features of the program currently include: |
203 |
+ <maintainer type="person"> |
204 |
+ <email>antti.jarvinen@×××××××.org</email> |
205 |
+ <name>Antti Järvinen</name> |
206 |
+ <description>proxy maintainer</description> |
207 |
+ </maintainer> |
208 |
+ <maintainer type="project"> |
209 |
+ <email>proxy-maint@g.o</email> |
210 |
+ <name>Proxy Maintainers</name> |
211 |
+ </maintainer> |
212 |
+ <longdescription lang="en"> |
213 |
+ Classified ads is an attempt to re-produce parts of the functionality |
214 |
+ that went away when Usenet news ceased to exist. This attempt tries to |
215 |
+ fix the problem of disappearing news-servers so that there is no servers |
216 |
+ required and no service-providers needed for any operation; |
217 |
+ data storage is implemented inside client applications that |
218 |
+ users are running. Features of the program currently include: |
219 |
|
220 |
- * Posting of ads online. Ads have a category ; there are some pre-defined categories but more can be invented just by typing over the suggested categories. |
221 |
- * Replying to ads either in public or privately to operator. |
222 |
- * (Small-sized) binary attachments to posts. |
223 |
- * Providing basic data of operators - data that operator may enter himself, or leave blank. |
224 |
- * Basic searching of content based on words. |
225 |
- </longdescription> |
226 |
- <upstream> |
227 |
- <maintainer status="active"> |
228 |
- <email>antti.jarvinen@×××××××.org</email> |
229 |
- <name>Antti Järvinen</name> |
230 |
- </maintainer> |
231 |
- <changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog> |
232 |
- <bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to> |
233 |
- <remote-id type="github">operatornormal/classified-ads</remote-id> |
234 |
- </upstream> |
235 |
+ * Posting of ads online. Ads have a category ; there are some |
236 |
+ pre-defined categories but more can be invented just by typing |
237 |
+ over the suggested categories. |
238 |
+ * Replying to ads either in public or privately to operator. |
239 |
+ * (Small-sized) binary attachments to posts. |
240 |
+ * Providing basic data of operators - data that operator may enter |
241 |
+ himself, or leave blank. |
242 |
+ * Basic searching of content based on words. |
243 |
+ </longdescription> |
244 |
+ <upstream> |
245 |
+ <maintainer status="active"> |
246 |
+ <email>antti.jarvinen@×××××××.org</email> |
247 |
+ <name>Antti Järvinen</name> |
248 |
+ </maintainer> |
249 |
+ <changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog> |
250 |
+ <bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to> |
251 |
+ <remote-id type="github">operatornormal/classified-ads</remote-id> |
252 |
+ </upstream> |
253 |
</pkgmetadata> |