subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-text\/sigil\/files\/, app\-text\/sigil\/"

[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/

2020-12-26 Thread Andreas Sturmlechner

commit: 67b07bbcf0b72a729fa7b0891d912d7303a0043f
Author: Zamarin Arthur  gmail  com>
AuthorDate: Wed Dec 23 06:14:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 26 21:39:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b07bbc

app-text/sigil: remove old v1.2.1

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Zamarin Arthur  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/sigil/Manifest   |  1 -
 app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch | 22 --
 app-text/sigil/sigil-1.2.1-r1.ebuild  | 84 ---
 3 files changed, 107 deletions(-)

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index ce5f91aad9d..9072c688a52 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,3 +1,2 @@
-DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B 
b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b
 SHA512 
763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
 DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 
0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87
 SHA512 
fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
 DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 
4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39
 SHA512 
2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c

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
deleted file mode 100644
index f15cfd4e963..000
--- a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 50280fae48717e76d56685bf0fda19783c8904e1 Mon Sep 17 00:00:00 2001
-From: Doug Massay 
-Date: Fri, 5 Jun 2020 20:25:41 -0400
-Subject: [PATCH] Fix Qt5.15.x behavior-change breakage
-

- src/MainUI/MainWindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp
-index 64202e113..de7e7f97f 100644
 a/src/MainUI/MainWindow.cpp
-+++ b/src/MainUI/MainWindow.cpp
-@@ -4289,7 +4289,7 @@ void MainWindow::ReadSettings()
- web_settings->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, 
false);
- 
web_settings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, 
false);
- 
web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, 
(settings.remoteOn() == 1));
--
web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, 
false);
-+
web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, 
true);
- web_settings->setAttribute(QWebEngineSettings::PluginsEnabled, false);
- web_settings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, 
false);
- web_settings->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, 
true);

diff --git a/app-text/sigil/sigil-1.2.1-r1.ebuild 
b/app-text/sigil/sigil-1.2.1-r1.ebuild
deleted file mode 100644
index 5f283ccaee8..000
--- a/app-text/sigil/sigil-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil;
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   app-text/hunspell:=
-   dev-libs/libpcre:3=[pcre16]
-   $(python_gen_cond_dep \
-   'dev-python/css-parser[${PYTHON_USEDEP}]
-   dev-python/lxml[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]')
-   >=dev-qt/qtconcurrent-5.12:5
-   >=dev-qt/qtcore-5.12:5
-   >=dev-qt/qtgui-5.12:5
-   >=dev-qt/qtprintsupport-5.12:5
-   >=dev-qt/qtwebengine-5.12:5[widgets]
-   >=dev-qt/qtwidgets-5.12:5
-   sys-libs/zlib[minizip]
-   plugins? ( $(python_gen_cond_dep \
-   'dev-python/chardet[${PYTHON_USEDEP}]
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/cssutils[${PYTHON_USEDEP}]
-   dev-python/html5lib[${PYTHON_USEDEP}]
-   dev-python/pillow[${PYTHON_USEDEP}]
-

[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/

2017-10-17 Thread Tobias Klausmann

commit: d9390b31a4e06bf70af55d9928650d701678b2d7
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Oct 17 12:35:16 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Oct 17 12:35:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9390b31

app-text/sigil: Add v0.9.8 with fixed patch

Gentoo-Bug: https://bugs.gentoo.org/621204
Fixes: https://bugs.gentoo.org/621204
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-text/sigil/Manifest|  1 +
 .../files/sigil-0.9.8-proper-gumbo-install.patch   | 24 +++
 app-text/sigil/sigil-0.9.8.ebuild  | 82 ++
 3 files changed, 107 insertions(+)

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 97418191730..5b7c9c044e6 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,3 +1,4 @@
 DIST Sigil-0.9.5-Code.zip 19224845 SHA256 
fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 
f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625
 WHIRLPOOL 
8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
 DIST Sigil-0.9.6-Code.zip 19307454 SHA256 
7856ad20116ef13fc3f79fa01c1d65c8b15ce1047f1e88b0723c2658cd8f18fd SHA512 
8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417
 WHIRLPOOL 
d74290b59247ced4977bf575adb93c7a76a8045f464b649854e49f6028cb2a9fb28c50fc36d00d3ab106768a85c514b5df5252e5172597a6120913a051b9cca7
+DIST Sigil-0.9.8-Code.zip 19807795 SHA256 
78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a SHA512 
18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
 WHIRLPOOL 
16a3b3ce3f3c67236b95aba91a5d5a2fce88a4d72364fbef7c6c69dcabb6a53849d74334d2684b58a64cf35b6ba43494b3d260909d6d0e9b06f99ec3593069cf
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 
0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 
24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
 WHIRLPOOL 
2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827

diff --git a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch 
b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
new file mode 100644
index 000..375f2e0ab6c
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
@@ -0,0 +1,24 @@
+--- a/src/CMakeLists.txt   2017-10-17 14:22:57.780297490 +0200
 b/src/CMakeLists.txt   2017-10-17 14:24:21.754150453 +0200
+@@ -962,12 +962,8 @@
+ endif()
+ 
+ # Standard Linux 'make install'
+-install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
++install( TARGETS sigil DESTINATION 
${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+ install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION 
${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
+-if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
+-install( PROGRAMS ${HUNSPELL_NAME} DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+-endif()
+-install( PROGRAMS ${GUMBO_NAME} DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+ if( BUILD_PATCHED_LIBXML2 )
+ install( PROGRAMS 
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+ install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+--- a/internal/gumbo/CMakeLists.txt2017-10-17 14:25:02.539107666 +0200
 b/internal/gumbo/CMakeLists.txt2017-10-17 14:25:27.985457056 +0200
+@@ -40,4 +40,5 @@
+ 
+ if( UNIX AND NOT APPLE )
+   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
++  install( TARGETS sigilgumbo DESTINATION 
${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+ endif()

diff --git a/app-text/sigil/sigil-0.9.8.ebuild 
b/app-text/sigil/sigil-0.9.8.ebuild
new file mode 100644
index 000..0bdd33c470e
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/;
+SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   app-text/hunspell
+   dev-libs/boost[threads]
+

[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/

2016-03-23 Thread Patrice Clement

commit: 1f0217a2e00a538f663e2fb4b6c59eb2fc79c1a5
Author: Matthew Brewer  sina  cn>
AuthorDate: Tue Mar 22 04:04:44 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Mar 23 10:32:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0217a2

app-text/sigil: version bump to 0.9.4

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Closes: https://github.com/gentoo/gentoo/pull/1114

 app-text/sigil/Manifest|  2 +-
 .../files/sigil-0.9.4-proper-gumbo-install.patch   | 26 ++
 .../{sigil-0.9.3.ebuild => sigil-0.9.4.ebuild} |  7 --
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index f99e278..daeea60 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,2 @@
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 
0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 
24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
 WHIRLPOOL 
2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
-DIST sigil-0.9.3.tar.gz 18095814 SHA256 
714417ec2ac8aa21a29dcc9fd5054479fcba965029c1b881f8229ca76781c404 SHA512 
c3463e0b16188b9d15f2f00e2b4fb8c565c0281cde144b840e49dbf7026462251d44ad8b5ae4b0ac8f88569ce73c6a9bcd781864283f3b5b8b25be7962b0f9b1
 WHIRLPOOL 
29cbf950015a562c247a127c527dd09f45328d799b710f9715d720798a89e77e781758978c683a1b85fe55690679cc8aa99f71c24786e4a7e534515664335644
+DIST sigil-0.9.4.tar.gz 18084460 SHA256 
97872d88e1b55de638f77add19d95f867b39fa919ed98bfe7a7e11b0bc44c168 SHA512 
dad5d44061375da99748d767c0cc288e11d02cc475c239b7709b4ace36cfd0deec8b2a5bcd74431e0465e1cd4d927bafd094ba238aec06bf40ec62d43d568cc1
 WHIRLPOOL 
5ecbb09f373e976f716dfc2c95d504bb92f40bf5cc42f0b09c90430ca67141e1e0feb89cdabcc1fac225b1785a3bf443299dd8eeb8dd39824f044c9a32a81f52

diff --git a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch 
b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
new file mode 100644
index 000..6e7db28
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
@@ -0,0 +1,26 @@
+diff -Naur Sigil-0.9.4/internal/gumbo/CMakeLists.txt 
Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt
+--- Sigil-0.9.4/internal/gumbo/CMakeLists.txt  2016-03-13 20:20:52.0 
+0100
 Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt2016-03-22 
14:50:26.026558216 +0100
+@@ -40,4 +40,5 @@
+ 
+ if( UNIX AND NOT APPLE )
+   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
++  install( TARGETS sigilgumbo DESTINATION 
${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+ endif()
+diff -Naur Sigil-0.9.4/src/CMakeLists.txt Sigil-0.9.4.b/src/CMakeLists.txt
+--- Sigil-0.9.4/src/CMakeLists.txt 2016-03-13 20:20:52.0 +0100
 Sigil-0.9.4.b/src/CMakeLists.txt   2016-03-22 14:49:49.628556236 +0100
+@@ -1015,12 +1015,10 @@
+ endif()
+ 
+ # Standard Linux 'make install'
+-install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
++install( TARGETS sigil DESTINATION 
${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+ install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION 
${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
+ if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
+-install( PROGRAMS ${HUNSPELL_NAME} DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+ endif()
+-install( PROGRAMS ${GUMBO_NAME} DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+ install( FILES ${LINUX_DESKTOP_FILE} DESTINATION 
${SHARE_INSTALL_PREFIX}/share/applications/ )
+ install( FILES ${LINUX_DESKTOP_ICON_FILE} DESTINATION 
${SHARE_INSTALL_PREFIX}/share/pixmaps RENAME sigil.png )
+ install( FILES ${QM_FILES} DESTINATION ${SIGIL_SHARE_ROOT}/translations/ )

diff --git a/app-text/sigil/sigil-0.9.3.ebuild 
b/app-text/sigil/sigil-0.9.4.ebuild
similarity index 92%
rename from app-text/sigil/sigil-0.9.3.ebuild
rename to app-text/sigil/sigil-0.9.4.ebuild
index bc82d76..22683ba 100644
--- a/app-text/sigil/sigil-0.9.3.ebuild
+++ b/app-text/sigil/sigil-0.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 CMAKE_MIN_VERSION="3.0"
 
 PYTHON_COMPAT=( python3_4 python3_5 )
@@ -22,7 +22,7 @@ IUSE=""
 
 RDEPEND="
app-text/hunspell
-   dev-libs/boost[threads,${PYTHON_USEDEP}]
+   dev-libs/boost[threads]
dev-libs/libpcre[pcre16]
dev-libs/xerces-c[icu]
dev-python/chardet[${PYTHON_USEDEP}]
@@ -60,7 +60,9 @@ DOCS=( ChangeLog.txt README.md )
 src_prepare() {
# sigil tries to copy non-needed qt libs for deb package, safe to 
ignore this completely
sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
+   eapply "${FILESDIR}/sigil-0.9.4-proper-gumbo-install.patch"
 
+

[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/

[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/

[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/

3 matches

Site Navigation

Mail list logo

Footer information