1 |
commit: 866acf08dc3434189a6e81578dfb00c42bb50e36 |
2 |
Author: Punarbasu Purkayastha <ppurka <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Aug 17 20:59:07 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 17 22:02:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866acf08 |
7 |
|
8 |
app-misc/recoll: 1.24.1 version bump, fix build with Qt 5.11 |
9 |
|
10 |
Fixes build with Qt 5.11. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/663028 |
13 |
Closes: https://bugs.gentoo.org/660912 |
14 |
Package-Manager: Portage-2.3.46, Repoman-2.3.10 |
15 |
|
16 |
app-misc/recoll/Manifest | 1 + |
17 |
app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch | 12 +++ |
18 |
app-misc/recoll/recoll-1.24.1.ebuild | 125 ++++++++++++++++++++++ |
19 |
3 files changed, 138 insertions(+) |
20 |
|
21 |
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest |
22 |
index fcbacd126c1..ff2c982bc7b 100644 |
23 |
--- a/app-misc/recoll/Manifest |
24 |
+++ b/app-misc/recoll/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST recoll-1.23.3.tar.gz 2590148 BLAKE2B ec058bac500aa61b4e395720bffcc2bfbcaded954c986e8e1fe69720456267c33b5e34eb3e28de47f57d9af207c60b138c521792882b093120b988b682600b2a SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06 |
27 |
DIST recoll-1.23.6.tar.gz 2601494 BLAKE2B e64ed422a1ac1a816091f9ee00ee23b551690f5038cf3378a00ebf39c9e4f4e22436105ed01a1aa2bc21b633c85a73ba2847a265e4d199109a8b0c03ec53421e SHA512 ae6f6dfe5e63faf2310b32bd0ffd90f08b12de7452ded9e5bd58a45690797caa9f5c66ea94ef94ed7a4ee3e55083cc191fbecfc112dbce42415d0af1300fe8fd |
28 |
+DIST recoll-1.24.1.tar.gz 2644672 BLAKE2B e5bce2231e075fe9a2bfad7d0d1068906e625106b09247dc5baffaf92957db111dd6be90c658266b8b9940d885b3495769c68ce66247d00568df24c1b5222226 SHA512 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c |
29 |
|
30 |
diff --git a/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch b/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..146bc981b60 |
33 |
--- /dev/null |
34 |
+++ b/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch |
35 |
@@ -0,0 +1,12 @@ |
36 |
+diff --git a/qtgui/ssearch_w.cpp b/qtgui/ssearch_w.cpp |
37 |
+index 2d0c97c..ca72af1 100644 |
38 |
+--- a/qtgui/ssearch_w.cpp |
39 |
++++ b/qtgui/ssearch_w.cpp |
40 |
+@@ -32,6 +32,7 @@ |
41 |
+ #include <qevent.h> |
42 |
+ #include <QTimer> |
43 |
+ #include <QCompleter> |
44 |
++#include <QAbstractItemView> |
45 |
+ |
46 |
+ #include "log.h" |
47 |
+ #include "guiutils.h" |
48 |
\ No newline at end of file |
49 |
|
50 |
diff --git a/app-misc/recoll/recoll-1.24.1.ebuild b/app-misc/recoll/recoll-1.24.1.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..a3d7abcba69 |
53 |
--- /dev/null |
54 |
+++ b/app-misc/recoll/recoll-1.24.1.ebuild |
55 |
@@ -0,0 +1,125 @@ |
56 |
+# Copyright 1999-2018 Gentoo Foundation |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=6 |
60 |
+ |
61 |
+PYTHON_COMPAT=( python2_7 ) |
62 |
+ |
63 |
+inherit eutils linux-info python-single-r1 qmake-utils |
64 |
+ |
65 |
+DESCRIPTION="A personal full text search package" |
66 |
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/" |
67 |
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz" |
68 |
+ |
69 |
+LICENSE="GPL-2" |
70 |
+SLOT="0" |
71 |
+KEYWORDS="~amd64 ~x86" |
72 |
+ |
73 |
+IUSE="camelcase doc +inotify qt5 session +spell" |
74 |
+REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}" |
75 |
+ |
76 |
+CDEPEND=" |
77 |
+ dev-libs/xapian:= |
78 |
+ sys-libs/zlib:= |
79 |
+ virtual/libiconv |
80 |
+ qt5? ( |
81 |
+ dev-qt/qtcore:5 |
82 |
+ dev-qt/qtgui:5 |
83 |
+ dev-qt/qtprintsupport:5 |
84 |
+ dev-qt/qtwebkit:5 |
85 |
+ ) |
86 |
+ session? ( |
87 |
+ inotify? ( |
88 |
+ x11-libs/libSM |
89 |
+ x11-libs/libICE |
90 |
+ x11-libs/libX11 |
91 |
+ ) |
92 |
+ ) |
93 |
+ spell? ( app-text/aspell ) |
94 |
+ ${PYTHON_DEPS} |
95 |
+" |
96 |
+ |
97 |
+DEPEND=" |
98 |
+ ${CDEPEND} |
99 |
+ qt5? ( dev-qt/linguist-tools:5 ) |
100 |
+" |
101 |
+ |
102 |
+RDEPEND=" |
103 |
+ ${CDEPEND} |
104 |
+ app-arch/unzip |
105 |
+" |
106 |
+ |
107 |
+PATCHES=( |
108 |
+ "${FILESDIR}"/${PN}-python3.patch # python3 patch |
109 |
+ "${FILESDIR}"/${P}-qt-5.11.patch # bugs 663028, 660912 |
110 |
+) |
111 |
+ |
112 |
+pkg_setup() { |
113 |
+ if has_version "<app-misc/recoll-1.20"; then |
114 |
+ einfo "Installing ${PV} over an 1.19 index is possible," |
115 |
+ einfo "but there have been small changes in the way" |
116 |
+ einfo "compound words are indexed. So it is best to reset" |
117 |
+ einfo "the index. The best method to reset the index is to" |
118 |
+ einfo "quit all recoll programs and delete the index directory" |
119 |
+ einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex." |
120 |
+ fi |
121 |
+ if use inotify; then |
122 |
+ CONFIG_CHECK="~INOTIFY_USER" |
123 |
+ check_extra_config |
124 |
+ fi |
125 |
+ python-single-r1_pkg_setup |
126 |
+} |
127 |
+ |
128 |
+src_prepare() { |
129 |
+ default |
130 |
+ python_fix_shebang filters |
131 |
+} |
132 |
+ |
133 |
+src_configure() { |
134 |
+ use qt5 && export QMAKE="$(qt5_get_bindir)/qmake" |
135 |
+ |
136 |
+ econf \ |
137 |
+ $(use_enable camelcase) \ |
138 |
+ $(use_enable session x11mon) \ |
139 |
+ $(use_enable qt5 qtgui) \ |
140 |
+ $(use_enable qt5 webkit) \ |
141 |
+ $(use_with inotify) \ |
142 |
+ $(use_with spell aspell) \ |
143 |
+ --without-fam \ |
144 |
+ --enable-recollq |
145 |
+} |
146 |
+ |
147 |
+src_install() { |
148 |
+ emake STRIP="$(type -P true)" DESTDIR="${D}" install |
149 |
+ |
150 |
+ # html docs should be placed in /usr/share/doc/${PN}/html |
151 |
+ use doc && dodoc -r "${ED}"/usr/share/recoll/doc/. |
152 |
+ rm -r "${ED}/usr/share/recoll/doc" || die |
153 |
+ find "${D}" -name '*.la' -delete || die |
154 |
+} |
155 |
+ |
156 |
+pkg_postinst() { |
157 |
+ einfo "In order to extract the full functionality of " |
158 |
+ einfo "recoll, the following packages should be installed " |
159 |
+ einfo "to get the corresponding document support." |
160 |
+ |
161 |
+ optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]" |
162 |
+ optfeature "PDF files support" app-text/poppler |
163 |
+ optfeature "PDF files with OCR support" app-text/tesseract |
164 |
+ optfeature "MS Word files support" app-text/antiword |
165 |
+ optfeature "Wordperfect files support" "app-text/libwpd[tools]" |
166 |
+ optfeature "Lyx files support" app-office/lyx |
167 |
+ optfeature "CHM files support" dev-python/pychm |
168 |
+ optfeature "GNU Info files support" sys-apps/texinfo |
169 |
+ optfeature "RAR archives support" dev-python/rarfile |
170 |
+ optfeature "7zip archives support" dev-python/pylzma |
171 |
+ optfeature "iCalendar files support" dev-python/icalendar |
172 |
+ optfeature "Postscript files support" app-text/pstotext |
173 |
+ optfeature "RTF files support" app-text/unrtf |
174 |
+ optfeature "TeX files support" dev-text/detex |
175 |
+ optfeature "DVI files support" virtual/tex-base |
176 |
+ optfeature "DJVU files support" app-text/djvu |
177 |
+ optfeature "tags in audio files support" media-libs/mutagen |
178 |
+ optfeature "tags in image files support" media-libs/exiftool |
179 |
+ optfeature "Midi karaoke files support" dev-python/chardet |
180 |
+} |