Merge ~xypron/ubuntu/+source/valentina:lp2134600 into ubuntu/+source/valentina:ubuntu/devel

[Heinrich Schuchardt]

[Heinrich Schuchardt (xypron)]

Local build in sbuild succeeded.
Waiting for build in ppa:xypron/merge-from-debian to complete

[Heinrich Schuchardt (xypron)]

valentina - 1.0.0~dfsg-4ubuntu1~ppa3 built successfully in ppa:xypron/merge-from-debian

Unmerged commits

8124612... by Heinrich Schuchardt on 2025-12-11

Update changelog

Signed-off-by: Heinrich Schuchardt <email address hidden>

8faefbd... by Heinrich Schuchardt on 2025-12-11

d/control: update maintainer

Signed-off-by: Heinrich Schuchardt <email address hidden>

7714e8c... by Heinrich Schuchardt on 2025-12-12

* Avoid alignment errors on riscv64 (LP: #2134600)

  d/p/0001-libdxfrw-avoid-alignment-errors-in-dxfreader.cpp.patch
  d/p/0002-vposter-avoid-illegal-reinterpret_cast.patch
  d/p/0003-stylehelper-avoid-illegal-reinterpret_cast.patch
  d/p/0004-vptilefactory-avoid-illegal-reinterpret_cast.patch

Signed-off-by: Heinrich Schuchardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 682e4d3..a8dd74d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+valentina (1.0.0~dfsg-4ubuntu1) UNRELEASED; urgency=medium
+
+  * Avoid alignment issues on riscv64 (LP: #2134600)
+
+ -- Heinrich Schuchardt <[e-mail]>  Thu, 11 Dec 2025 18:42:38 +0100
+
 valentina (1.0.0~dfsg-4) unstable; urgency=medium
 
   * install russian measurement tables as non-example file,
diff --git a/debian/control b/debian/control
index f77fadd..1750e3b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: valentina
 Section: graphics
 Priority: optional
-Maintainer: Jonas Smedegaard <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jonas Smedegaard <[e-mail]>
 Build-Depends:
  chrpath,
  dbus-daemon <!nocheck>,
diff --git a/debian/patches/0001-libdxfrw-avoid-alignment-errors-in-dxfreader.cpp.patch b/debian/patches/0001-libdxfrw-avoid-alignment-errors-in-dxfreader.cpp.patch
new file mode 100644
index 0000000..b40615b
--- /dev/null
+++ b/debian/patches/0001-libdxfrw-avoid-alignment-errors-in-dxfreader.cpp.patch
@@ -0,0 +1,111 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Thu, 11 Dec 2025 18:33:39 +0100
+Subject: [PATCH 1/4] libdxfrw: avoid alignment errors in dxfreader.cpp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reinterpret_cast is only allowable if the from type satisfies the alignment
+requirement of the target. Using GCC 15.2 on RISC-V the current code of
+dxfreader leads to errors like
+
+    dxfreader.cpp:121:14: error: cast from ‘char*’ to ‘short unsigned int*’
+    increases required alignment of target type [-Werror=cast-align]
+
+We can avoid reinterpret_cast by using unions.
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+Origin: https://gitlab.com/smart-pattern/valentina/-/commit/8b3fb765bebc858566e041448473bb0582df4f21
+---
+ src/libs/vdxf/libdxfrw/intern/dxfreader.cpp | 50 +++++++++++----------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp b/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
+index bd0ba5898..6b18b0d89 100644
+--- a/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
++++ b/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
+@@ -115,18 +115,18 @@ auto dxfReader::getHandleString() -> int
+ 
+ auto dxfReaderBinary::readCode(int *code) -> bool
+ {
+-    unsigned short *int16p;
+-    char buffer[2];
+-    filestr->read(buffer,2);
+-    int16p = reinterpret_cast<unsigned short *>(buffer);
++    union {
++        unsigned short val;
++        char buf[2];
++    } buffer;
++    filestr->read(buffer.buf,2);
+ //exist a 32bits int (code 90) with 2 bytes???
+-    if ((*code == 90) && (*int16p>2000)){
++    if ((*code == 90) && (buffer.val>2000)){
+         DRW_DBG(*code); DRW_DBG(" de 16bits\n");
+         filestr->seekg(-4, std::ios_base::cur);
+-        filestr->read(buffer,2);
+-        int16p = reinterpret_cast<unsigned short *>(buffer);
++        filestr->read(buffer.buf,2);
+     }
+-    *code = *int16p;
++    *code = buffer.val;
+     DRW_DBG(*code); DRW_DBG("\n");
+ 
+     return (filestr->good());
+@@ -172,11 +172,12 @@ auto dxfReaderBinary::readInt16() -> bool
+ auto dxfReaderBinary::readInt32() -> bool
+ {
+     type = INT32;
+-    unsigned *int32p;
+-    char buffer[4];
+-    filestr->read(buffer,4);
+-    int32p = reinterpret_cast<unsigned *>(buffer);
+-    intData = static_cast<signed int>(*int32p);
++    union {
++        signed int val;
++        char buf[4];
++    } buffer;
++    filestr->read(buffer.buf,4);
++    intData = buffer.val;
+     // cppcheck-suppress danglingLifetime
+     DRW_DBG(intData); DRW_DBG("\n");
+     return (filestr->good());
+@@ -185,11 +186,12 @@ auto dxfReaderBinary::readInt32() -> bool
+ auto dxfReaderBinary::readInt64() -> bool
+ {
+     type = INT64;
+-    unsigned long long int *int64p; //64 bits integer pointer
+-    char buffer[8];
+-    filestr->read(buffer,8);
+-    int64p = reinterpret_cast<unsigned long long int *>(buffer);
+-    int64 = *int64p;
++    union {
++        unsigned long long int val;
++        char buf[8];
++    } buffer;
++    filestr->read(buffer.buf,8);
++    int64 = buffer.val;
+     // cppcheck-suppress danglingLifetime
+     DRW_DBG(int64); DRW_DBG(" int64\n");
+     return (filestr->good());
+@@ -198,12 +200,12 @@ auto dxfReaderBinary::readInt64() -> bool
+ auto dxfReaderBinary::readDouble() -> bool
+ {
+     type = DOUBLE;
+-    double *result;
+-    char buffer[8];
+-    filestr->read(buffer,8);
+-    // cppcheck-suppress invalidPointerCast
+-    result = reinterpret_cast<double *>(buffer);
+-    doubleData = *result;
++    union {
++        double val;
++        char buf[8];
++    } buffer;
++    filestr->read(buffer.buf,8);
++    doubleData = buffer.val;
+     // cppcheck-suppress danglingLifetime
+     DRW_DBG(doubleData); DRW_DBG("\n");
+     return (filestr->good());
+-- 
+2.51.0
+
diff --git a/debian/patches/0002-vposter-avoid-illegal-reinterpret_cast.patch b/debian/patches/0002-vposter-avoid-illegal-reinterpret_cast.patch
new file mode 100644
index 0000000..e8b2393
--- /dev/null
+++ b/debian/patches/0002-vposter-avoid-illegal-reinterpret_cast.patch
@@ -0,0 +1,48 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Fri, 12 Dec 2025 11:18:17 +0100
+Subject: [PATCH 2/4] vposter: avoid illegal reinterpret_cast
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A reinterpret_cast where the target has a higher alignment requirement
+than the source leads to an error as observed with GCC 15.2 on riscv64:
+
+    vposter.cpp:73:30: error:
+    cast from ‘uchar*’ {aka ‘unsigned char*’} to ‘QRgb*’
+    {aka ‘unsigned int*’} increases required alignment of target type
+    [-Werror=cast-align]
+
+As we know that QImage::scanLine() returns 32bit aligned data
+use an unsafe conversion via a void * pointer instead.
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+Origin: https://gitlab.com/smart-pattern/valentina/-/commit/499a7df1975953d905b73e3857cd4029678c75f6
+---
+ src/libs/vlayout/vposter.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp
+index 889fee0c0..05633c363 100644
+--- a/src/libs/vlayout/vposter.cpp
++++ b/src/libs/vlayout/vposter.cpp
+@@ -66,11 +66,13 @@ auto Grayscale(QImage image) -> QImage
+ {
+     for (int ii = 0; ii < image.height(); ii++)
+     {
+-        uchar *scan = image.scanLine(ii);
+-        int const depth = 4;
++        // Scanline data is at least 32-bit aligned.
++        // https://doc.qt.io/qt-6/qimage.html#scanLine
++        void *voidPtr = image.scanLine(ii);
++        auto *scan = static_cast<QRgb *>(voidPtr);
+         for (int jj = 0; jj < image.width(); jj++)
+         {
+-            auto *rgbpixel = reinterpret_cast<QRgb *>(scan + jj * depth);
++            auto *rgbpixel = &scan[jj];
+             int const gray = qGray(*rgbpixel);
+             *rgbpixel = QColor(gray, gray, gray, qAlpha(*rgbpixel)).rgba();
+         }
+-- 
+2.51.0
+
diff --git a/debian/patches/0003-stylehelper-avoid-illegal-reinterpret_cast.patch b/debian/patches/0003-stylehelper-avoid-illegal-reinterpret_cast.patch
new file mode 100644
index 0000000..d01fb62
--- /dev/null
+++ b/debian/patches/0003-stylehelper-avoid-illegal-reinterpret_cast.patch
@@ -0,0 +1,52 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Fri, 12 Dec 2025 09:43:50 +0100
+Subject: [PATCH 3/4] stylehelper: avoid illegal reinterpret_cast
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A reinterpret_cast where the target has a higher alignment requirement
+than the source leads to an error as observed with GCC 15.2 on riscv64:
+
+    stylehelper.cpp:157:34: error:
+    cast from ‘uchar*’ {aka ‘unsigned char*’} to ‘QRgb*’
+    {aka ‘unsigned int*’} increases required alignment
+    of target type [-Werror=cast-align]
+
+As we know that QImage::scanLine() returns 32bit aligned data
+use an unsafe conversion via a void * pointer instead.
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+https://gitlab.com/smart-pattern/valentina/-/commit/b42d67d8bc0ea8afd9a9c9818dd6789891a0371f
+---
+ src/libs/vwidgets/fancytabbar/stylehelper.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/libs/vwidgets/fancytabbar/stylehelper.cpp b/src/libs/vwidgets/fancytabbar/stylehelper.cpp
+index 81f8617c4..120f02e8a 100644
+--- a/src/libs/vwidgets/fancytabbar/stylehelper.cpp
++++ b/src/libs/vwidgets/fancytabbar/stylehelper.cpp
+@@ -154,14 +154,17 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPain
+ 
+             for (int y = 0; y < im.height(); ++y)
+             {
+-                // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+-                auto *scanLine = reinterpret_cast<QRgb *>(im.scanLine(y));
++                // Scanline data is at least 32-bit aligned.
++                // https://doc.qt.io/qt-6/qimage.html#scanLine
++                void *voidPtr = im.scanLine(y);
++                auto *scanLine = static_cast<QRgb *>(voidPtr);
++
+                 for (int x = 0; x < im.width(); ++x)
+                 {
+                     QRgb const pixel = *scanLine;
+                     auto const intensity = static_cast<char>(qGray(pixel));
+                     *scanLine = qRgba(intensity, intensity, intensity, qAlpha(pixel));
+-                    ++scanLine; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
++                    ++scanLine;
+                 }
+             }
+             px = QPixmap::fromImage(im);
+-- 
+2.51.0
+
diff --git a/debian/patches/0004-vptilefactory-avoid-illegal-reinterpret_cast.patch b/debian/patches/0004-vptilefactory-avoid-illegal-reinterpret_cast.patch
new file mode 100644
index 0000000..02209a1
--- /dev/null
+++ b/debian/patches/0004-vptilefactory-avoid-illegal-reinterpret_cast.patch
@@ -0,0 +1,48 @@
+From: Heinrich Schuchardt <[e-mail]>
+Date: Fri, 12 Dec 2025 12:37:45 +0100
+Subject: [PATCH 4/4] vptilefactory: avoid illegal reinterpret_cast
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A reinterpret_cast where the target has a higher alignment requirement
+than the source leads to an error as observed with GCC 15.2 on riscv64:
+
+    vptilefactory.cpp:120:30: error:
+    cast from ‘uchar*’ {aka ‘unsigned char*’} to ‘QRgb*’
+    {aka ‘unsigned int*’} increases required alignment of target type
+    [-Werror=cast-align]
+
+As we know that QImage::constScanLine() returns 32bit aligned data
+use an unsafe conversion via a void * pointer instead.
+
+Signed-off-by: Heinrich Schuchardt <[e-mail]>
+Origin: https://gitlab.com/smart-pattern/valentina/-/commit/3e523bc88da9f92f876a8deabd21f0557bd6d775
+---
+ src/app/puzzle/vptilefactory.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/app/puzzle/vptilefactory.cpp b/src/app/puzzle/vptilefactory.cpp
+index 725768883..1100e477d 100644
+--- a/src/app/puzzle/vptilefactory.cpp
++++ b/src/app/puzzle/vptilefactory.cpp
+@@ -113,11 +113,13 @@ auto Grayscale(QImage image) -> QImage
+ {
+     for (int ii = 0; ii < image.height(); ii++)
+     {
+-        uchar *scan = image.scanLine(ii);
+-        int const depth = 4;
++        // Scanline data is at least 32-bit aligned.
++        // https://doc.qt.io/qt-6/qimage.html#scanLine
++        void *voidPtr = image.scanLine(ii);
++        auto *scan = static_cast<QRgb *>(voidPtr);
+         for (int jj = 0; jj < image.width(); jj++)
+         {
+-            auto *rgbpixel = reinterpret_cast<QRgb *>(scan + jj * depth); // NOLINT
++            auto *rgbpixel = scan + jj;
+             int const gray = qGray(*rgbpixel);
+             *rgbpixel = QColor(gray, gray, gray, qAlpha(*rgbpixel)).rgba();
+         }
+-- 
+2.51.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 7e4c070..862af75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,7 @@
 1001_open_helper_tools_only_from_PATH.patch
 1002_path_to_tables.patch
 2004_rename_helper_tools.patch
+0001-libdxfrw-avoid-alignment-errors-in-dxfreader.cpp.patch
+0002-vposter-avoid-illegal-reinterpret_cast.patch
+0003-stylehelper-avoid-illegal-reinterpret_cast.patch
+0004-vptilefactory-avoid-illegal-reinterpret_cast.patch