mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
parent
40a7f72230
commit
058bb875d9
3 changed files with 2 additions and 101 deletions
|
@ -1,26 +0,0 @@
|
||||||
diff --git a/cmake_extras/FindPythonInterp.cmake b/cmake_extras/FindPythonInterp.cmake
|
|
||||||
index 72af58404..b80321618 100644
|
|
||||||
--- a/cmake_extras/FindPythonInterp.cmake
|
|
||||||
+++ b/cmake_extras/FindPythonInterp.cmake
|
|
||||||
@@ -52,7 +52,7 @@ unset(_Python_NAMES)
|
|
||||||
|
|
||||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
|
||||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
-set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
+set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
|
|
||||||
if(PythonInterp_FIND_VERSION)
|
|
||||||
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
|
|
||||||
diff --git a/cmake_extras/FindPythonLibs.cmake b/cmake_extras/FindPythonLibs.cmake
|
|
||||||
index 1cb4307c6..32740efc4 100644
|
|
||||||
--- a/cmake_extras/FindPythonLibs.cmake
|
|
||||||
+++ b/cmake_extras/FindPythonLibs.cmake
|
|
||||||
@@ -84,7 +84,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
|
|
||||||
|
|
||||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
|
||||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
-set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
+set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
|
|
||||||
if(PythonLibs_FIND_VERSION)
|
|
||||||
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
|
|
|
@ -1,73 +0,0 @@
|
||||||
From 9b2773e08ba68f3d35c9f58696d8d1b78dd42e26 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Echo J <tcg96nougat@gmail.com>
|
|
||||||
Date: Sat, 19 Oct 2024 19:39:09 +0300
|
|
||||||
Subject: [PATCH 1/2] cmake: Don't set the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
|
|
||||||
|
|
||||||
Qt 6.8 removed it: https://github.com/qt/qtbase/commit/54f2229714358e742fdc30fc1f1cec8acacb1f29
|
|
||||||
(which causes build errors on Arch Linux)
|
|
||||||
---
|
|
||||||
src/qt6sigil.cmake | 4 ----
|
|
||||||
1 file changed, 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qt6sigil.cmake b/src/qt6sigil.cmake
|
|
||||||
index 763b0fff14..dada3378a9 100644
|
|
||||||
--- a/src/qt6sigil.cmake
|
|
||||||
+++ b/src/qt6sigil.cmake
|
|
||||||
@@ -2,10 +2,6 @@
|
|
||||||
# Build Sigil against Qt6 - requires cmake 3.16+ and a C++17 compiler
|
|
||||||
#############################################################################
|
|
||||||
|
|
||||||
-# quiet Qt 6 deprecat4ed warnings
|
|
||||||
-# add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
|
|
||||||
-add_definitions(-DQT_IMPLICIT_QCHAR_CONSTRUCTION)
|
|
||||||
-
|
|
||||||
if (CMAKE_VERSION VERSION_GREATER "3.27.9")
|
|
||||||
cmake_policy(SET CMP0153 OLD)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
From 08ed327cf220eca9c814ea2a65adace24a4cf3d9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Echo J <tcg96nougat@gmail.com>
|
|
||||||
Date: Sat, 19 Oct 2024 19:43:17 +0300
|
|
||||||
Subject: [PATCH 2/2] Parsers: Make QChar conversions explicit
|
|
||||||
|
|
||||||
This is required without the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
|
|
||||||
---
|
|
||||||
src/Parsers/qCSSParser.cpp | 2 +-
|
|
||||||
src/Parsers/qCSSUtils.cpp | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/Parsers/qCSSParser.cpp b/src/Parsers/qCSSParser.cpp
|
|
||||||
index e54c1b1e22..88b42bedb3 100644
|
|
||||||
--- a/src/Parsers/qCSSParser.cpp
|
|
||||||
+++ b/src/Parsers/qCSSParser.cpp
|
|
||||||
@@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istring, int& i)
|
|
||||||
(CSSUtils::hexdec(add) > 96 && CSSUtils::hexdec(add) < 123))
|
|
||||||
{
|
|
||||||
QString msg = "Replaced unicode notation: Changed \\" + CSSUtils::rtrim(add) + " to ";
|
|
||||||
- add = static_cast<int>(CSSUtils::hexdec(add));
|
|
||||||
+ add = QChar(static_cast<int>(CSSUtils::hexdec(add)));
|
|
||||||
msg += add;
|
|
||||||
log(msg,Information);
|
|
||||||
replaced = true;
|
|
||||||
diff --git a/src/Parsers/qCSSUtils.cpp b/src/Parsers/qCSSUtils.cpp
|
|
||||||
index d982510e23..b6c6b49579 100644
|
|
||||||
--- a/src/Parsers/qCSSUtils.cpp
|
|
||||||
+++ b/src/Parsers/qCSSUtils.cpp
|
|
||||||
@@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istring, const int pos)
|
|
||||||
{
|
|
||||||
if(pos > (istring.length()-1) || pos < 0)
|
|
||||||
{
|
|
||||||
- return 0;
|
|
||||||
+ return QChar(0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVector<QString> subvalues)
|
|
||||||
|
|
||||||
bool CSSUtils::ctype_space(const QChar c)
|
|
||||||
{
|
|
||||||
- return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11);
|
|
||||||
+ return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == QChar(11));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'sigil'
|
# Template file for 'sigil'
|
||||||
pkgname=sigil
|
pkgname=sigil
|
||||||
version=2.3.1
|
version=2.4.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DUSE_SYSTEM_LIBS=ON"
|
configure_args="-DUSE_SYSTEM_LIBS=ON"
|
||||||
|
@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
|
||||||
homepage="https://github.com/Sigil-Ebook/Sigil"
|
homepage="https://github.com/Sigil-Ebook/Sigil"
|
||||||
changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
|
changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
|
||||||
distfiles="${homepage}/archive/${version}.tar.gz"
|
distfiles="${homepage}/archive/${version}.tar.gz"
|
||||||
checksum=12e84d9a1fc41e60903557ea03801cd0004d8b75dfcebeb44c3a9b1fd8fa97ea
|
checksum=200152fcda1d72b547e8981047c51415f1bcd3b8c28b463ffd1263438391f322
|
||||||
python_version=3
|
python_version=3
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
|
Loading…
Add table
Reference in a new issue