* [PR PATCH] sigil: update to 2.3.1.
@ 2024-09-25 14:31 Emru1
2024-09-26 9:33 ` [PR PATCH] [Updated] " Emru1
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: Emru1 @ 2024-09-25 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 3069 bytes --]
From d55aecb8da73b600af2b3fbe49b97408a208791e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 -----------
srcpkgs/sigil/template | 24 +++++-------------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 59ad1910ab0f9f..ba6ebd6e167d0c 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,16 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=3
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
-fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
@ 2024-09-26 9:33 ` Emru1
2024-09-27 6:23 ` Emru1
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-09-26 9:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 3069 bytes --]
From 07ee4d493e65220adb287c7fe9ee46c6a9c6cee4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 -----------
srcpkgs/sigil/template | 24 +++++-------------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 59ad1910ab0f9f..ba6ebd6e167d0c 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,16 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=3
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
-fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
2024-09-26 9:33 ` [PR PATCH] [Updated] " Emru1
@ 2024-09-27 6:23 ` Emru1
2024-12-27 1:59 ` github-actions
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-09-27 6:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 3257 bytes --]
From 5816bada018eb80e584091a673f0140401593ffd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----------
srcpkgs/sigil/template | 28 +++++++++----------------
2 files changed, 10 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 59ad1910ab0f9f..1efcfcf6a9286b 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,22 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=3
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
-fi
+case "$XBPS_TARGET_MACHINE" in
+ riscv64*) broken="qt6-webengine missing";;
+ ppc*) broken="qt6-webengine missing" ;;
+ armv5* | armv6* | armv7*) broken="qt6-webengine missing" ;;
+esac
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
2024-09-26 9:33 ` [PR PATCH] [Updated] " Emru1
2024-09-27 6:23 ` Emru1
@ 2024-12-27 1:59 ` github-actions
2024-12-29 13:57 ` [PR PATCH] [Updated] " Emru1
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: github-actions @ 2024-12-27 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/52347#issuecomment-2563231644
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (2 preceding siblings ...)
2024-12-27 1:59 ` github-actions
@ 2024-12-29 13:57 ` Emru1
2024-12-29 14:04 ` Emru1
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 3257 bytes --]
From c5ebeb448d58f44fa766758689d486d3599ff9d3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----------
srcpkgs/sigil/template | 28 +++++++++----------------
2 files changed, 10 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 0929ed3f95bc1e..1efcfcf6a9286b 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,22 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
-fi
+case "$XBPS_TARGET_MACHINE" in
+ riscv64*) broken="qt6-webengine missing";;
+ ppc*) broken="qt6-webengine missing" ;;
+ armv5* | armv6* | armv7*) broken="qt6-webengine missing" ;;
+esac
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (3 preceding siblings ...)
2024-12-29 13:57 ` [PR PATCH] [Updated] " Emru1
@ 2024-12-29 14:04 ` Emru1
2024-12-29 14:06 ` Emru1
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/52347#issuecomment-2564735650
Comment:
broken for now due to qt6 removing some macros
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (4 preceding siblings ...)
2024-12-29 14:04 ` Emru1
@ 2024-12-29 14:06 ` Emru1
2024-12-29 14:23 ` [PR PATCH] [Updated] " Emru1
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/52347#issuecomment-2564735650
Comment:
broken for now due to qt6 removing some macros
https://github.com/Sigil-Ebook/Sigil/pull/778
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (5 preceding siblings ...)
2024-12-29 14:06 ` Emru1
@ 2024-12-29 14:23 ` Emru1
2024-12-29 15:03 ` Emru1
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 14:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 6248 bytes --]
From bea87386a7100546e90b2d616059394819938759 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 26 +++------
3 files changed, 81 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/qt_macro.patch b/srcpkgs/sigil/patches/qt_macro.patch
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..f93263f6acef6e 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,20 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
-fi
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (6 preceding siblings ...)
2024-12-29 14:23 ` [PR PATCH] [Updated] " Emru1
@ 2024-12-29 15:03 ` Emru1
2024-12-29 15:16 ` Emru1
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 6367 bytes --]
From 94cccb50eeab249b219290e148175f0f750ef21e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 28 ++++------
3 files changed, 85 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/qt_macro.patch b/srcpkgs/sigil/patches/qt_macro.patch
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..f0436247b6d3d0 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel
+ minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base-devel"
+ makedepends+=" qt6-declarative-devel qt6-base-private-devel python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (7 preceding siblings ...)
2024-12-29 15:03 ` Emru1
@ 2024-12-29 15:16 ` Emru1
2024-12-29 16:34 ` Emru1
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 6386 bytes --]
From 64fdd9e86eb5b3cb7b418f6bb89aa63d928274c2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 29 +++++-----
3 files changed, 86 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/qt_macro.patch b/srcpkgs/sigil/patches/qt_macro.patch
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..8891f81ade6392 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,27 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
+build_helper=qemu
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel qt6-tools-devel
+ minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base-devel"
+ makedepends+=" qt6-declarative-devel qt6-base-private-devel python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (8 preceding siblings ...)
2024-12-29 15:16 ` Emru1
@ 2024-12-29 16:34 ` Emru1
2024-12-29 19:07 ` Emru1
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 6370 bytes --]
From f69163e3b5c15809f9fec0993c1d256bafb7ddc6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 28 ++++------
3 files changed, 85 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/qt_macro.patch b/srcpkgs/sigil/patches/qt_macro.patch
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..1d100c2a805f8d 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config unzip"
+makedepends="python3-devel qt6-svg-devel qt6-webengine-devel
+ minizip-devel zlib-devel hunspell-devel pcre2-devel"
short_desc="Multi-platform EPUB ebook editor"
maintainer="Orphaned <orphan@voidlinux.org>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base-devel qt6-base qt6-tools"
+ makedepends+=" qt6-declarative-devel qt6-base-private-devel python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (9 preceding siblings ...)
2024-12-29 16:34 ` Emru1
@ 2024-12-29 19:07 ` Emru1
2024-12-29 19:33 ` Emru1
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 7918 bytes --]
From 8ad8a0ef9991753bd8f080112e8798de8717a3ea Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/python_ver.patch | 26 +++++++++
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 30 +++++-----
4 files changed, 112 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/python_ver.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
new file mode 100644
index 00000000000000..052421e0070cbb
--- /dev/null
+++ b/srcpkgs/sigil/patches/python_ver.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..a1b14477472397 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config"
+makedepends="qt6-base-devel qt6-webengine-devel qt6-svg-devel qt6-tools
+ python3-devel hunspell-devel pcre2-devel qt6-declarative-devel
+ qt6-base-private-devel"
short_desc="Multi-platform EPUB ebook editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base qt6-tools qt6-base-devel python3 python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (10 preceding siblings ...)
2024-12-29 19:07 ` Emru1
@ 2024-12-29 19:33 ` Emru1
2024-12-29 19:54 ` Emru1
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 19:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 7909 bytes --]
From ce41bee3920a32ac6faaf2d120d41db54ca4d12f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/python_ver.patch | 26 +++++++++
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 30 +++++-----
4 files changed, 112 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/python_ver.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
new file mode 100644
index 00000000000000..052421e0070cbb
--- /dev/null
+++ b/srcpkgs/sigil/patches/python_ver.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..1a8798f2c1758f 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config"
+makedepends="qt6-base-devel qt6-webengine-devel qt6-svg-devel qt6-tools
+ python3-devel hunspell-devel pcre2-devel qt6-declarative-devel
+ qt6-base-private-devel minizip-devel"
short_desc="Multi-platform EPUB ebook editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base qt6-tools python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (11 preceding siblings ...)
2024-12-29 19:33 ` Emru1
@ 2024-12-29 19:54 ` Emru1
2024-12-29 19:59 ` Emru1
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 19:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 7929 bytes --]
From 0112ee881d8bd33a125108551cc9aeb84765102c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/python_ver.patch | 26 +++++++++
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 31 +++++------
4 files changed, 113 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/python_ver.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
new file mode 100644
index 00000000000000..052421e0070cbb
--- /dev/null
+++ b/srcpkgs/sigil/patches/python_ver.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..3e1b4492894a08 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,27 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
+build_helper=qemu
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config"
+makedepends="qt6-base-devel qt6-webengine-devel qt6-svg-devel qt6-tools
+ python3-devel hunspell-devel pcre2-devel qt6-declarative-devel
+ qt6-base-private-devel minizip-devel"
short_desc="Multi-platform EPUB ebook editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base qt6-tools python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (12 preceding siblings ...)
2024-12-29 19:54 ` Emru1
@ 2024-12-29 19:59 ` Emru1
2024-12-29 20:02 ` Emru1
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 19:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 7909 bytes --]
From fc1da247129f628ae5db889e5ac3354d378c5a56 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/python_ver.patch | 26 +++++++++
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 30 +++++-----
4 files changed, 112 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/python_ver.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
new file mode 100644
index 00000000000000..052421e0070cbb
--- /dev/null
+++ b/srcpkgs/sigil/patches/python_ver.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..1a8798f2c1758f 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config"
+makedepends="qt6-base-devel qt6-webengine-devel qt6-svg-devel qt6-tools
+ python3-devel hunspell-devel pcre2-devel qt6-declarative-devel
+ qt6-base-private-devel minizip-devel"
short_desc="Multi-platform EPUB ebook editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base qt6-tools python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (13 preceding siblings ...)
2024-12-29 19:59 ` Emru1
@ 2024-12-29 20:02 ` Emru1
2024-12-29 20:33 ` [PR PATCH] [Updated] " Emru1
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/52347#issuecomment-2564735650
Comment:
broken for now due to qt6 removing some macros
https://github.com/Sigil-Ebook/Sigil/pull/778
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (14 preceding siblings ...)
2024-12-29 20:02 ` Emru1
@ 2024-12-29 20:33 ` Emru1
2024-12-29 20:45 ` Emru1
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 7899 bytes --]
From dd576d46225791c72a8efe55222f97b06a661648 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/python_ver.patch | 26 +++++++++
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 30 +++++-----
4 files changed, 112 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/python_ver.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
new file mode 100644
index 00000000000000..052421e0070cbb
--- /dev/null
+++ b/srcpkgs/sigil/patches/python_ver.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..fe84719d5e245f 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config"
+makedepends="qt6-base-devel qt6-webengine-devel qt6-svg-devel
+ python3-devel hunspell-devel pcre2-devel qt6-declarative-devel
+ qt6-base-private-devel minizip-devel"
short_desc="Multi-platform EPUB ebook editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base qt6-tools python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (15 preceding siblings ...)
2024-12-29 20:33 ` [PR PATCH] [Updated] " Emru1
@ 2024-12-29 20:45 ` Emru1
2025-01-05 16:07 ` [PR PATCH] [Merged]: " leahneukirchen
2025-01-05 16:12 ` [PR REVIEW] " ahesford
18 siblings, 0 replies; 20+ messages in thread
From: Emru1 @ 2024-12-29 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
There is an updated 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/52347
sigil: update to 2.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sigil-52347.patch --]
[-- Type: text/x-diff, Size: 7899 bytes --]
From 1cd72cfba136aa2ddddd8ba5949e42465d93fdd2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Wed, 25 Sep 2024 16:15:01 +0200
Subject: [PATCH] sigil: update to 2.3.1.
---
srcpkgs/sigil/patches/python-3.11.patch | 11 ----
srcpkgs/sigil/patches/python_ver.patch | 26 +++++++++
srcpkgs/sigil/patches/qt_macro.patch | 73 +++++++++++++++++++++++++
srcpkgs/sigil/template | 30 +++++-----
4 files changed, 112 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/sigil/patches/python-3.11.patch
create mode 100644 srcpkgs/sigil/patches/python_ver.patch
create mode 100644 srcpkgs/sigil/patches/qt_macro.patch
diff --git a/srcpkgs/sigil/patches/python-3.11.patch b/srcpkgs/sigil/patches/python-3.11.patch
deleted file mode 100644
index ff70aa9074ad14..00000000000000
--- a/srcpkgs/sigil/patches/python-3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/EmbedPython/EmbeddedPython.cpp
-+++ b/src/EmbedPython/EmbeddedPython.cpp
-@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
-
- if (kind == PyUnicode_1BYTE_KIND) {
- // latin 1 according to PEP 393
-- res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
-+ res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po)), -1));
-
- } else if (kind == PyUnicode_2BYTE_KIND) {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/srcpkgs/sigil/patches/python_ver.patch b/srcpkgs/sigil/patches/python_ver.patch
new file mode 100644
index 00000000000000..052421e0070cbb
--- /dev/null
+++ b/srcpkgs/sigil/patches/python_ver.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000000..7ab421cd4762d3
--- /dev/null
+++ b/srcpkgs/sigil/patches/qt_macro.patch
@@ -0,0 +1,73 @@
+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 0929ed3f95bc1e..443622cc67e121 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,30 +1,26 @@
# Template file for 'sigil'
pkgname=sigil
-version=1.9.10
-revision=4
+version=2.3.1
+revision=1
build_style=cmake
-pycompile_dirs="usr/share/sigil/python3lib"
-# Can use system zlib, minizip and hunspell; can't use system pcre
configure_args="-DUSE_SYSTEM_LIBS=ON"
-hostmakedepends="pkg-config unzip qt5-qmake"
-makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel
- qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
- qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml python3-css-parser python3-PyQt5-webengine"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-base-devel qt6-webengine-devel qt6-svg-devel
+ python3-devel hunspell-devel pcre2-devel qt6-declarative-devel
+ qt6-base-private-devel minizip-devel"
short_desc="Multi-platform EPUB ebook editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
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=35b6051d966c2848a8a031ebe691449229b3c95a56145647dc71857acc18fad5
+checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
python_version=3
+case "$XBPS_TARGET_MACHINE" in
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
+esac
+
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel
- qt5-webengine-devel qt5-xmlpatterns-devel qt5-multimedia-devel
- qt5-sensors-devel qt5-declarative-devel qt5-location-devel
- qt5-webchannel-devel python3-devel"
+ hostmakedepends+=" qt6-base python3-devel"
fi
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (16 preceding siblings ...)
2024-12-29 20:45 ` Emru1
@ 2025-01-05 16:07 ` leahneukirchen
2025-01-05 16:12 ` [PR REVIEW] " ahesford
18 siblings, 0 replies; 20+ messages in thread
From: leahneukirchen @ 2025-01-05 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There's a merged pull request on the void-packages repository
sigil: update to 2.3.1.
https://github.com/void-linux/void-packages/pull/52347
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, amd64-glibc
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] sigil: update to 2.3.1.
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
` (17 preceding siblings ...)
2025-01-05 16:07 ` [PR PATCH] [Merged]: " leahneukirchen
@ 2025-01-05 16:12 ` ahesford
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2025-01-05 16:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/52347#discussion_r1903300066
Comment:
Just depend on qt6-webengine and let the builder figure out it isn't buildable.
If it perpetually shows up in the list of build candidates, we can find a cleaner way to limit it.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2025-01-05 16:12 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-25 14:31 [PR PATCH] sigil: update to 2.3.1 Emru1
2024-09-26 9:33 ` [PR PATCH] [Updated] " Emru1
2024-09-27 6:23 ` Emru1
2024-12-27 1:59 ` github-actions
2024-12-29 13:57 ` [PR PATCH] [Updated] " Emru1
2024-12-29 14:04 ` Emru1
2024-12-29 14:06 ` Emru1
2024-12-29 14:23 ` [PR PATCH] [Updated] " Emru1
2024-12-29 15:03 ` Emru1
2024-12-29 15:16 ` Emru1
2024-12-29 16:34 ` Emru1
2024-12-29 19:07 ` Emru1
2024-12-29 19:33 ` Emru1
2024-12-29 19:54 ` Emru1
2024-12-29 19:59 ` Emru1
2024-12-29 20:02 ` Emru1
2024-12-29 20:33 ` [PR PATCH] [Updated] " Emru1
2024-12-29 20:45 ` Emru1
2025-01-05 16:07 ` [PR PATCH] [Merged]: " leahneukirchen
2025-01-05 16:12 ` [PR REVIEW] " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).