rpm/sigil
SHA256
1
0
Fork 0
forked from pool/sigil
Code Pull Requests Activity

Compare commits

merge into: rpm:devel
Branches Tags
rpm:devel
rpm:factory
pool:factory
pool:devel
...
pull from: pool:devel
Branches Tags
pool:factory
pool:devel
rpm:devel
rpm:factory

No commits in common. "devel" and "devel" have entirely different histories.
devel ... devel

4 changed files with 168 additions and 45 deletions
Show Stats Expand all files Collapse all files

3
sigil-2.4.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6113718b66f1756b13c25990930e7ec0d311ac5142c0b844cf73f6faf98375c5
size 19144897

61
sigil-gt6.8-qchar-778.patch Normal file
View File

@ -0,0 +1,61 @@
From 08ed327cf220eca9c814ea2a65adace24a4cf3d9 Mon Sep 17 00:00:00 2001
From: Echo J <tcg96nougat@gmail.com>
Date: Sat, 19 Oct 2024 19:43:17 +0300
Subject: [PATCH] Parsers: Make QChar conversions explicit
This is required without the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
---
src/Parsers/qCSSParser.cpp | 2 +-
src/Parsers/qCSSUtils.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: Sigil-2.3.1/src/Parsers/qCSSParser.cpp
===================================================================
--- Sigil-2.3.1.orig/src/Parsers/qCSSParser.cpp
+++ Sigil-2.3.1/src/Parsers/qCSSParser.cpp
@@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istr
(CSSUtils::hexdec(add) > 96 && CSSUtils::hexdec(add) < 123))
{
QString msg = "Replaced unicode notation: Changed \\" + CSSUtils::rtrim(add) + " to ";
- add = static_cast<int>(CSSUtils::hexdec(add));
+ add = QChar(static_cast<int>(CSSUtils::hexdec(add)));
msg += add;
log(msg,Information);
replaced = true;
Index: Sigil-2.3.1/src/Parsers/qCSSUtils.cpp
===================================================================
--- Sigil-2.3.1.orig/src/Parsers/qCSSUtils.cpp
+++ Sigil-2.3.1/src/Parsers/qCSSUtils.cpp
@@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istr
{
if(pos > (istring.length()-1) || pos < 0)
{
- return 0;
+ return QChar(0);
}
else
{
@@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVec
bool CSSUtils::ctype_space(const QChar c)
{
- return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11);
+ return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == QChar(11));
}
Index: Sigil-2.3.1/src/qt6sigil.cmake
===================================================================
--- Sigil-2.3.1.orig/src/qt6sigil.cmake
+++ Sigil-2.3.1/src/qt6sigil.cmake
@@ -2,10 +2,6 @@
# Build Sigil against Qt6 - requires cmake 3.16+ and a C++17 compiler
#############################################################################
-# quiet Qt 6 deprecat4ed warnings
-# add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
-add_definitions(-DQT_IMPLICIT_QCHAR_CONSTRUCTION)
-
if (CMAKE_VERSION VERSION_GREATER "3.27.9")
cmake_policy(SET CMP0153 OLD)
endif()

55
sigil.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Sat Mar 8 12:07:11 UTC 2025 - ecsos <ecsos@opensuse.org>
- Update to 2.4.2
* New Features
- Added new tool: 'Update OPF Manifest Media Types' to set unrecognized media types based on actual file contents
* Bug Fixes
- ensure CodeView code highlighting colors coincide with dark/light themes on certain Linux DEs
- fix sigil-gumbo gumboc to work with Python 3.13+ - ie. work around backwards incompatible changes in ctypes
- fix Replacement Chooser table to allow for multiple line row heights in Before and After fields (regression)
- prevent too many warnings when no media types provided in OPF by generating the warning collectively
- prevent build warnings by using hunspell's std:string interface (not C char * ones)
- fix files in third party code that used latin-1 encoding to now use utf-8
- fix old use of 'python' in python code header lines to always use 'python3'
- removed user scope installs from winget util they work properly with dependencies
- restore Find&Replace if it was open when the user tries to exit Sigil and then aborts the exit
-------------------------------------------------------------------
Sat Mar 8 12:02:24 UTC 2025 - ecsos <ecsos@opensuse.org>
- Update to 2.4.0
* New Features
- added a GetInfo dialog and right click menu option for XHTML files that provides a collection
of information specific to that file without having to run Reports (including a word count)
- added support for multiple semantics per xhtml file, while uncommon is technically allowed by the spec
- made debugging with VS IDE easier
- streamlined Sigil logos and installer for Windows
- improve Sigil Well-Formed (sanity check) to better identify errors with missing attribute quotes
- update to Qt 6.7.3 and its PySide6 version for MacOS and Windows release builds
- updates to building on linux documentation
- add support for building with and using virtual python environments on Windows and Linux
- change Replacement Chooser to use Checkboxes to determine if replacements should be made, no deletes
- allow Windows Sigil installer to run on Windows arm64
* Bug Fixes
- readability improvments for Load Warnings (thank you BeckyEbook)
- remove xhtml meta charset information after converting to utf-8 on initial load to prevent encoding errors
- forced the Preferences KeyboardShortcuts assign and remove buttons into the tab focus chain
- PR #778 building Sigil with recent Qt versions that no longer accept the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
- fixes for using QTimeZone to prevent build warnings where possible (modified version of PR #779)
- fixes for better whitespace handling in TagLister codebase
- Drop sigil-gt6.8-qchar-778.patch because now in upstream.
- Use pythons and set it to python311 for Leap < 16.
-------------------------------------------------------------------
Thu Dec 26 11:54:38 UTC 2024 - Max Lin <mlin@suse.com>
- Use the same condition of gcc version for CC and CXX flags as same
as the BuildRequires defined
-------------------------------------------------------------------
Sun Nov 17 14:24:42 UTC 2024 - ecsos <ecsos@opensuse.org>
- Add sigil-gt6.8-qchar-778.patch to fix build error under
Tumbleweed with Qt 6.8.
-------------------------------------------------------------------
Sat Sep 7 14:43:25 UTC 2024 - ecsos <ecsos@opensuse.org>

94
sigil.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package sigil
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,8 +17,11 @@
%define sigil_doc_version 2024.08.15
%if 0%{?suse_version} < 1600
%define pythons python311
%endif
Name: sigil
Version: 2.3.1
Version: 2.4.2
Release: 0
Summary: WYSIWYG Ebook Editor
License: GPL-3.0-only
@ -34,7 +37,7 @@ BuildRequires: boost-devel
BuildRequires: cmake >= 3.0
BuildRequires: dos2unix
BuildRequires: fdupes
%if 0%{?suse_version} <= 1600
%if 0%{?suse_version} < 1600
BuildRequires: gcc12
BuildRequires: gcc12-c++
%else
@ -47,38 +50,39 @@ BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: qt6-base-devel >= 6.4.0
# upstream use for qt6-base-devel 6.8.2
BuildRequires: qt6-base-devel >= 6.6.3
BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel >= 3.9}
# not need for build, only check for exists
# upstream use for python3-Pillow 7.1.2
BuildRequires: python3-Pillow >= 5.0.0
# upstream use python3-certifi 2020.6.20
BuildRequires: python3-certifi
# upstream use python3-chardet 3.0.4
BuildRequires: python3-chardet >= 3.0.4
# upstream use python3-css-parser 1.0.4
BuildRequires: python3-css-parser >= 1.0.4
# upstream use python3-cssselect 1.1.0
BuildRequires: python3-cssselect >= 1.0.3
# upstream use for python3-Pillow 10.3.0
BuildRequires: %{python_module Pillow >= 9.5.0}
# upstream use python3-certifi 2024.6.2
BuildRequires: %{python_module certifi >= 2023.7.22}
# upstream use python3-chardet 5.2.0
BuildRequires: %{python_module chardet >= 5.2.0}
# upstream use python3-css-parser 1.0.10
BuildRequires: %{python_module css-parser >= 1.0.10}
# upstream use python3-cssselect 1.2.0
BuildRequires: %{python_module cssselect >= 1.2.0}
# upstream use python3-cssutils ?
BuildRequires: python3-cssutils >= 1.0.2
# upstream use 3.6.0
BuildRequires: python3-devel >= 3.6
# upstream use python3-dulwich 0.20.5
BuildRequires: python3-dulwich >= 0.20.2
BuildRequires: %{python_module cssutils >= 2.10.2}
# upstream use python3-dulwich 0.22.1
BuildRequires: %{python_module dulwich >= 0.21.7}
# upstream use python3-html5lib >= 1.1
BuildRequires: python3-html5lib
# upstream use for python3-lxml 4.5.1
BuildRequires: python3-lxml >= 4.4.2
# upstream use for python3-qt5 5.12.3
BuildRequires: python3-qt5
# upstream use for python3-regex 2020.6.8
BuildRequires: python3-regex
# upstream use for python3-six 1.15.0
BuildRequires: python3-six >= 1.14.0
# upstream use for python3-urllib3 1.25.9
BuildRequires: python3-urllib3 >= 1.24
BuildRequires: %{python_module html5lib >= 1.1}
# upstream use for python3-lxml 5.2.2
BuildRequires: %{python_module lxml >= 4.9.3}
# upstream use for python3-regex 2024.5.15
BuildRequires: %{python_module regex >= 2023.5.5}
# upstream use for python3-six 1.16.0
BuildRequires: %{python_module six >= 1.16.0}
# upstream use for python3-urllib3 2.2.2
BuildRequires: %{python_module urllib3 >= 2.0.7}
# upstream use python3-tk ?
BuildRequires: python3-tk
BuildRequires: %{python_module tk >= 2.7.18}
### Seems no more need? upstream use for python3-qt5 5.12.3
##BuildRequires: %%{python_module qt5}
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
@ -97,19 +101,19 @@ BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(minizip)
Requires: python3-Pillow
Requires: python3-certifi
Requires: python3-chardet
Requires: python3-css-parser
Requires: python3-cssselect
Requires: python3-cssutils
Requires: python3-dulwich
Requires: python3-html5lib
Requires: python3-lxml
Requires: python3-regex
Requires: python3-six
Requires: python3-tk
Requires: python3-urllib3
Requires: %{python_flavor}-Pillow
Requires: %{python_flavor}-certifi
Requires: %{python_flavor}-chardet
Requires: %{python_flavor}-css-parser
Requires: %{python_flavor}-cssselect
Requires: %{python_flavor}-cssutils
Requires: %{python_flavor}-dulwich
Requires: %{python_flavor}-html5lib
Requires: %{python_flavor}-lxml
Requires: %{python_flavor}-regex
Requires: %{python_flavor}-six
Requires: %{python_flavor}-tk
Requires: %{python_flavor}-urllib3
%description
Sigil is an editor for the EPUB format. It is designed for WYSIWYG
@ -143,7 +147,7 @@ find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python3|#!\/usr\/bin\/python
find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3|g' {} +
%build
%if 0%{?suse_version} <= 1600
%if 0%{?suse_version} < 1600
export CC=gcc-12
export CXX=g++-12
%endif