Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sigil for openSUSE:Factory checked
in at 2024-11-18 20:01:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sigil (Old)
and /work/SRC/openSUSE:Factory/.sigil.new.2017 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sigil"
Mon Nov 18 20:01:01 2024 rev:40 rq:1224677 version:2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sigil/sigil.changes 2024-09-09
14:44:49.907668753 +0200
+++ /work/SRC/openSUSE:Factory/.sigil.new.2017/sigil.changes 2024-11-18
20:01:49.714683466 +0100
@@ -1,0 +2,6 @@
+Sun Nov 17 14:24:42 UTC 2024 - ecsos <ec...@opensuse.org>
+
+- Add sigil-gt6.8-qchar-778.patch to fix build error under
+ Tumbleweed with Qt 6.8.
+
+-------------------------------------------------------------------
New:
----
sigil-gt6.8-qchar-778.patch
BETA DEBUG BEGIN:
New:
- Add sigil-gt6.8-qchar-778.patch to fix build error under
Tumbleweed with Qt 6.8.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sigil.spec ++++++
--- /var/tmp/diff_new_pack.oHSWz4/_old 2024-11-18 20:01:51.038738845 +0100
+++ /var/tmp/diff_new_pack.oHSWz4/_new 2024-11-18 20:01:51.050739347 +0100
@@ -30,11 +30,13 @@
Source2: %{name}.desktop
# PATCH-FIX-OPENSUSE Disabled __DATE__ and __TIME__ which is replaced later in
pre section
Patch0: %{name}-gt-0.9.0-Dialogs-About.cpp.patch
+# PATCH-FIX-UPSTREAM Remove implicit QChar conversions #778
+Patch1: sigil-gt6.8-qchar-778.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 3.0
BuildRequires: dos2unix
BuildRequires: fdupes
-%if 0%{?suse_version} <= 1600
+%if 0%{?suse_version} < 1600
BuildRequires: gcc12
BuildRequires: gcc12-c++
%else
++++++ sigil-gt6.8-qchar-778.patch ++++++
>From 08ed327cf220eca9c814ea2a65adace24a4cf3d9 Mon Sep 17 00:00:00 2001
From: Echo J <tcg96nou...@gmail.com>
Date: Sat, 19 Oct 2024 19:43:17 +0300
Subject: [PATCH] Parsers: Make QChar conversions explicit
This is required without the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
---
src/Parsers/qCSSParser.cpp | 2 +-
src/Parsers/qCSSUtils.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: Sigil-2.3.1/src/Parsers/qCSSParser.cpp
===================================================================
--- Sigil-2.3.1.orig/src/Parsers/qCSSParser.cpp
+++ Sigil-2.3.1/src/Parsers/qCSSParser.cpp
@@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istr
(CSSUtils::hexdec(add) > 96 && CSSUtils::hexdec(add) < 123))
{
QString msg = "Replaced unicode notation: Changed \\" +
CSSUtils::rtrim(add) + " to ";
- add = static_cast<int>(CSSUtils::hexdec(add));
+ add = QChar(static_cast<int>(CSSUtils::hexdec(add)));
msg += add;
log(msg,Information);
replaced = true;
Index: Sigil-2.3.1/src/Parsers/qCSSUtils.cpp
===================================================================
--- Sigil-2.3.1.orig/src/Parsers/qCSSUtils.cpp
+++ Sigil-2.3.1/src/Parsers/qCSSUtils.cpp
@@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istr
{
if(pos > (istring.length()-1) || pos < 0)
{
- return 0;
+ return QChar(0);
}
else
{
@@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVec
bool CSSUtils::ctype_space(const QChar c)
{
- return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11);
+ return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == QChar(11));
}
Index: Sigil-2.3.1/src/qt6sigil.cmake
===================================================================
--- Sigil-2.3.1.orig/src/qt6sigil.cmake
+++ Sigil-2.3.1/src/qt6sigil.cmake
@@ -2,10 +2,6 @@
# Build Sigil against Qt6 - requires cmake 3.16+ and a C++17 compiler
#############################################################################
-# quiet Qt 6 deprecat4ed warnings
-# add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
-add_definitions(-DQT_IMPLICIT_QCHAR_CONSTRUCTION)
-
if (CMAKE_VERSION VERSION_GREATER "3.27.9")
cmake_policy(SET CMP0153 OLD)
endif()
