Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/
Date: Sat, 26 Dec 2020 21:42:41
Message-Id: 1609018761.67b07bbcf0b72a729fa7b0891d912d7303a0043f.asturm@gentoo
1 commit: 67b07bbcf0b72a729fa7b0891d912d7303a0043f
2 Author: Zamarin Arthur <arthurzam <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 23 06:14:57 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 26 21:39:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b07bbc
7
8 app-text/sigil: remove old v1.2.1
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Zamarin Arthur <arthurzam <AT> gmail.com>
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-text/sigil/Manifest | 1 -
15 app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch | 22 ------
16 app-text/sigil/sigil-1.2.1-r1.ebuild | 84 -----------------------
17 3 files changed, 107 deletions(-)
18
19 diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
20 index ce5f91aad9d..9072c688a52 100644
21 --- a/app-text/sigil/Manifest
22 +++ b/app-text/sigil/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b SHA512 763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
25 DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
26 DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39 SHA512 2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c
27
28 diff --git a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
29 deleted file mode 100644
30 index f15cfd4e963..00000000000
31 --- a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
32 +++ /dev/null
33 @@ -1,22 +0,0 @@
34 -From 50280fae48717e76d56685bf0fda19783c8904e1 Mon Sep 17 00:00:00 2001
35 -From: Doug Massay <douglaslmassay@×××××.com>
36 -Date: Fri, 5 Jun 2020 20:25:41 -0400
37 -Subject: [PATCH] Fix Qt5.15.x behavior-change breakage
38 -
39 ----
40 - src/MainUI/MainWindow.cpp | 2 +-
41 - 1 file changed, 1 insertion(+), 1 deletion(-)
42 -
43 -diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp
44 -index 64202e113..de7e7f97f 100644
45 ---- a/src/MainUI/MainWindow.cpp
46 -+++ b/src/MainUI/MainWindow.cpp
47 -@@ -4289,7 +4289,7 @@ void MainWindow::ReadSettings()
48 - web_settings->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
49 - web_settings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, false);
50 - web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, (settings.remoteOn() == 1));
51 -- web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false);
52 -+ web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, true);
53 - web_settings->setAttribute(QWebEngineSettings::PluginsEnabled, false);
54 - web_settings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
55 - web_settings->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true);
56
57 diff --git a/app-text/sigil/sigil-1.2.1-r1.ebuild b/app-text/sigil/sigil-1.2.1-r1.ebuild
58 deleted file mode 100644
59 index 5f283ccaee8..00000000000
60 --- a/app-text/sigil/sigil-1.2.1-r1.ebuild
61 +++ /dev/null
62 @@ -1,84 +0,0 @@
63 -# Copyright 1999-2020 Gentoo Authors
64 -# Distributed under the terms of the GNU General Public License v2
65 -
66 -EAPI=7
67 -
68 -PYTHON_COMPAT=( python3_{6,7,8} )
69 -PYTHON_REQ_USE="tk"
70 -
71 -inherit cmake python-single-r1 xdg-utils
72 -
73 -DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
74 -HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
75 -SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
76 -
77 -LICENSE="GPL-3+ Apache-2.0"
78 -SLOT="0"
79 -KEYWORDS="amd64 x86"
80 -IUSE="+plugins system-mathjax"
81 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
82 -
83 -RDEPEND="
84 - ${PYTHON_DEPS}
85 - app-text/hunspell:=
86 - dev-libs/libpcre:3=[pcre16]
87 - $(python_gen_cond_dep \
88 - 'dev-python/css-parser[${PYTHON_USEDEP}]
89 - dev-python/lxml[${PYTHON_USEDEP}]
90 - dev-python/six[${PYTHON_USEDEP}]')
91 - >=dev-qt/qtconcurrent-5.12:5
92 - >=dev-qt/qtcore-5.12:5
93 - >=dev-qt/qtgui-5.12:5
94 - >=dev-qt/qtprintsupport-5.12:5
95 - >=dev-qt/qtwebengine-5.12:5[widgets]
96 - >=dev-qt/qtwidgets-5.12:5
97 - sys-libs/zlib[minizip]
98 - plugins? ( $(python_gen_cond_dep \
99 - 'dev-python/chardet[${PYTHON_USEDEP}]
100 - dev-python/cssselect[${PYTHON_USEDEP}]
101 - dev-python/cssutils[${PYTHON_USEDEP}]
102 - dev-python/html5lib[${PYTHON_USEDEP}]
103 - dev-python/pillow[${PYTHON_USEDEP}]
104 - dev-python/regex[${PYTHON_USEDEP}]') )
105 - system-mathjax? ( dev-libs/mathjax )
106 -"
107 -DEPEND="${RDEPEND}"
108 -
109 -BDEPEND="
110 - dev-qt/linguist-tools:5
111 - virtual/pkgconfig
112 -"
113 -
114 -S="${WORKDIR}/Sigil-${PV}"
115 -
116 -DOCS=( ChangeLog.txt README.md )
117 -
118 -PATCHES=( "${FILESDIR}/${P}-qt5.15-fix.patch" )
119 -
120 -src_configure() {
121 - local mycmakeargs=(
122 - -DINSTALL_BUNDLED_DICTS=0
123 - -DUSE_SYSTEM_LIBS=1
124 - -DSYSTEM_LIBS_REQUIRED=1
125 - -DPYTHON_EXECUTABLE="${PYTHON}"
126 - -DPYTHON_LIBRARY="$(python_get_library_path)"
127 - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
128 - )
129 - use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
130 -
131 - cmake_src_configure
132 -}
133 -
134 -src_install() {
135 - cmake_src_install
136 - python_fix_shebang "${ED}"/usr/share/sigil/
137 - python_optimize "${ED}"/usr/share/sigil/
138 -}
139 -
140 -pkg_postinst() {
141 - xdg_desktop_database_update
142 -}
143 -
144 -pkg_postrm() {
145 - xdg_desktop_database_update
146 -}