[PR PATCH] sigil: update to 2.4.0.

[PR PATCH] sigil: update to 2.4.0.

[Emru1]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

There is a new pull request by Emru1 against master on the void-packages repository

https://github.com/Emru1/void-packages sigil
https://github.com/void-linux/void-packages/pull/54136

sigil: update to 2.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

A patch file from https://github.com/void-linux/void-packages/pull/54136.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-54136.patch --]
[-- Type: text/x-diff, Size: 5646 bytes --]

From e4fad3d4bdbee94ae116c5e703aa4f9fc7dd602c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Tue, 28 Jan 2025 15:03:49 +0100
Subject: [PATCH] sigil: update to 2.4.0.

---
 srcpkgs/sigil/patches/python_ver.patch | 26 ---------
 srcpkgs/sigil/patches/qt_macro.patch   | 73 --------------------------
 srcpkgs/sigil/template                 |  4 +-
 3 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/sigil/patches/python_ver.patch
 delete mode 100644 srcpkgs/sigil/patches/qt_macro.patch

diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
deleted file mode 100644
index 052421e0070cbb..00000000000000
--- a/srcpkgs/sigil/patches/python_ver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/cmake_extras/FindPythonInterp.cmake b/cmake_extras/FindPythonInterp.cmake
-index 72af58404..b80321618 100644
---- a/cmake_extras/FindPythonInterp.cmake
-+++ b/cmake_extras/FindPythonInterp.cmake
-@@ -52,7 +52,7 @@ unset(_Python_NAMES)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- 
- if(PythonInterp_FIND_VERSION)
-     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/cmake_extras/FindPythonLibs.cmake b/cmake_extras/FindPythonLibs.cmake
-index 1cb4307c6..32740efc4 100644
---- a/cmake_extras/FindPythonLibs.cmake
-+++ b/cmake_extras/FindPythonLibs.cmake
-@@ -84,7 +84,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- 
- if(PythonLibs_FIND_VERSION)
-     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff --git a/srcpkgs/sigil/patches/qt_macro.patch b/srcpkgs/sigil/patches/qt_macro.patch
deleted file mode 100644
index 7ab421cd4762d3..00000000000000
--- a/srcpkgs/sigil/patches/qt_macro.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9b2773e08ba68f3d35c9f58696d8d1b78dd42e26 Mon Sep 17 00:00:00 2001
-From: Echo J <tcg96nougat@gmail.com>
-Date: Sat, 19 Oct 2024 19:39:09 +0300
-Subject: [PATCH 1/2] cmake: Don't set the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
-
-Qt 6.8 removed it: https://github.com/qt/qtbase/commit/54f2229714358e742fdc30fc1f1cec8acacb1f29
-(which causes build errors on Arch Linux)
----
- src/qt6sigil.cmake | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/qt6sigil.cmake b/src/qt6sigil.cmake
-index 763b0fff14..dada3378a9 100644
---- a/src/qt6sigil.cmake
-+++ b/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()
-
-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 2/2] 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(-)
-
-diff --git a/src/Parsers/qCSSParser.cpp b/src/Parsers/qCSSParser.cpp
-index e54c1b1e22..88b42bedb3 100644
---- a/src/Parsers/qCSSParser.cpp
-+++ b/src/Parsers/qCSSParser.cpp
-@@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istring, int& i)
-         (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;
-diff --git a/src/Parsers/qCSSUtils.cpp b/src/Parsers/qCSSUtils.cpp
-index d982510e23..b6c6b49579 100644
---- a/src/Parsers/qCSSUtils.cpp
-+++ b/src/Parsers/qCSSUtils.cpp
-@@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istring, const int pos)
- {
-     if(pos > (istring.length()-1) || pos < 0)
-     {
--        return 0;
-+        return QChar(0);
-     } 
-     else 
-     {
-@@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVector<QString> subvalues)
- 
- 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));
- }
- 
- 
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 443622cc67e121..c3c1b882c62ba5 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=2.3.1
+version=2.4.0
 revision=1
 build_style=cmake
 configure_args="-DUSE_SYSTEM_LIBS=ON"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
+checksum=200152fcda1d72b547e8981047c51415f1bcd3b8c28b463ffd1263438391f322
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in

Re: [PR PATCH] [Closed]: sigil: update to 2.4.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

There's a closed pull request on the void-packages repository

sigil: update to 2.4.0.
https://github.com/void-linux/void-packages/pull/54136

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc