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

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

2020-06-16 Thread Andreas Sturmlechner

commit: ebd2cc940f853c1d6aa9e0b20ef8970b75e51253
Author: Zamarin Arthur  gmail  com>
AuthorDate: Tue Jun 16 17:49:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 16 18:59:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd2cc94

app-text/sigil: fix compatibility with qtwebengine-5.15.0

use upstream patch which fixes compatibility problems with qtwebengine-5.15.0

Closes: https://bugs.gentoo.org/728240
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Zamarin Arthur  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch  | 22 ++
 .../{sigil-1.2.1.ebuild => sigil-1.2.1-r1.ebuild}  |  2 ++
 2 files changed, 24 insertions(+)

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
new file mode 100644
index 000..f15cfd4e963
--- /dev/null
+++ b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
@@ -0,0 +1,22 @@
+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.ebuild 
b/app-text/sigil/sigil-1.2.1-r1.ebuild
similarity index 97%
rename from app-text/sigil/sigil-1.2.1.ebuild
rename to app-text/sigil/sigil-1.2.1-r1.ebuild
index 6b67b65a382..e7b02c1eea7 100644
--- a/app-text/sigil/sigil-1.2.1.ebuild
+++ b/app-text/sigil/sigil-1.2.1-r1.ebuild
@@ -53,6 +53,8 @@ S="${WORKDIR}/Sigil-${PV}"
 
 DOCS=( ChangeLog.txt README.md )
 
+PATCHES=( "${FILESDIR}/${P}-qt5.15-fix.patch" )
+
 src_configure() {
local mycmakeargs=(
-DINSTALL_BUNDLED_DICTS=0

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

2019-08-23 Thread Joonas Niilola

commit: b0be870ce69bcc7be42275043df36f96c016f979
Author: Zamarin Arthur  gmail  com>
AuthorDate: Fri Aug 23 10:21:43 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Aug 23 18:22:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0be870c

app-text/sigil: remove old v0.9.8

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Zamarin Arthur  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12771
Signed-off-by: Joonas Niilola  gentoo.org>

 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 deletions(-)

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 049fe910593..8d13bc890bf 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1,3 @@
 DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 
4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706
 SHA512 
cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
-DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 
002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2
 SHA512 
18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 
1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46
 SHA512 
45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-0.9.17.tar.gz 21262675 BLAKE2B 
fdba78eb1167e97c4190d7ae6d8d6de8055e0cac0e1105a3bdc1ddacbfa2f8403a293018ec464c72b8024f1ef0c1e9b230ca90586fdbb1d2fb3826e0fd327137
 SHA512 
ae233cdd62ab114d6c600f0fe75f9778e8cbb60bc7d81c99e10b6e20b9b85246de6c281d255b46a85c4d531e70ee1beffde1aa172c7b027121e097b4fb8e338c

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
deleted file mode 100644
index 375f2e0ab6c..000
--- a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 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
deleted file mode 100644
index fbd390f249c..000
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://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]
-   dev-libs/libpcre[pcre16]
-   dev-libs/xerces-c[icu]
-   dev-python/chardet[${PYTHON_USEDEP}]
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/cssutils[${PYTHON_USEDEP}]
-   dev-python/html5lib[${PYTHON_USEDEP}]
-   dev-python/lxml[${PYTHON_USEDE

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

2018-06-06 Thread Andreas Sturmlechner

commit: ca7367a556db8df508319b1e061f0f1f1c69d537
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  3 12:50:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  6 14:54:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7367a5

app-text/sigil: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/sigil/Manifest|  3 -
 .../files/sigil-0.9.4-proper-gumbo-install.patch   | 26 ---
 app-text/sigil/sigil-0.8.7-r1.ebuild   | 53 --
 app-text/sigil/sigil-0.9.5-r2.ebuild   | 82 --
 app-text/sigil/sigil-0.9.6.ebuild  | 82 --
 5 files changed, 246 deletions(-)

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 563f192b9fe..d56d7bc949b 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1 @@
-DIST Sigil-0.9.5-Code.zip 19224845 BLAKE2B 
181ed1cf18ad72df71b4d3a1e42770eb9de98631dbddffbcbd0e279aa6c30624b75d5e03385ea295ec6ec6ebcebfa593c5e48b89fb71e7742bccbf9be1c49946
 SHA512 
f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625
-DIST Sigil-0.9.6-Code.zip 19307454 BLAKE2B 
109577f7ba65a07872b84ba4c8adfe93a647da5944b59090fbda4e504d224f12be85cfaebe0045e9106d088c87faeb824cdc27cd6872961aa410ddb1b959543a
 SHA512 
8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 
002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2
 SHA512 
18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
-DIST sigil-0.8.7.tar.gz 19394061 BLAKE2B 
9d93c7cacf5e3f10a416f0726c7a11b8e8cfb9b8d8c1310af742bd838ccaf44e33bd36dbd833837268d77d2d34e17ea2c79e93906781316a85b58761c59109d0
 SHA512 
24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652

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
deleted file mode 100644
index 6e7db28fe99..000
--- a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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.8.7-r1.ebuild 
b/app-text/sigil/sigil-0.8.7-r1.ebuild
deleted file mode 100644
index 1fa96bf6442..000
--- a/app-text/sigil/sigil-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# This ebuild could use some python checks, as sigil contains python plugin 
architecture.
-
-inherit cmake-utils
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/";
-SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   >=app-text/hunspell-1.3.2
-   >=dev-libs/boost-1.49[threads]
-   >=dev-libs/libpcre-8.31[pcre16]
-

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

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

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

3 matches

Site Navigation

Mail list logo

Footer information