Package: release.debian.org
Severity: normal
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:kitty
User: [email protected]
Usertags: unblock
[ Reason ]
This fixes the FTBFS on s390x as reported in #1103423
Initially we decided to remove it from s390x and the FTP master processed the
request.
However, the porter came back in time with a working patch which also got
merged upstream.
[ Impact ]
The package will fail to build on big endian archs
[ Tests ]
kitty has passing build-time tests on all release archs
[ Risks ]
The patch only touches big endian stuff in a ifdef, very low risk for existing
archs
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock kitty/0.41.1-2
diff -Nru kitty-0.41.1/debian/changelog kitty-0.41.1/debian/changelog
--- kitty-0.41.1/debian/changelog 2025-04-26 06:47:24.000000000 +0000
+++ kitty-0.41.1/debian/changelog 2025-06-05 15:09:21.000000000 +0000
@@ -1,3 +1,10 @@
+kitty (0.41.1-2) unstable; urgency=medium
+
+ * Backport upstream patch to fixup FTBFS on s390x
+ * Update patch to avoid privacy breach
+
+ -- Nilesh Patra <[email protected]> Thu, 05 Jun 2025 20:39:21 +0530
+
kitty (0.41.1-1) unstable; urgency=medium
* New upstream version 0.41.1 (Closes: #1103691)
diff -Nru
kitty-0.41.1/debian/patches/0005-link-alternate-icons-in-the-faq.patch
kitty-0.41.1/debian/patches/0005-link-alternate-icons-in-the-faq.patch
--- kitty-0.41.1/debian/patches/0005-link-alternate-icons-in-the-faq.patch
2025-04-26 06:45:48.000000000 +0000
+++ kitty-0.41.1/debian/patches/0005-link-alternate-icons-in-the-faq.patch
2025-06-05 15:09:21.000000000 +0000
@@ -10,7 +10,7 @@
--- a/docs/faq.rst
+++ b/docs/faq.rst
-@@ -336,51 +336,23 @@
+@@ -336,55 +336,25 @@
The kitty icon was created as tribute to my cat of nine years who passed away,
as such it is not going to change. However, if you do not like it, there are
@@ -60,6 +60,10 @@
-.. image::
https://github.com/sfsam/some_icons/raw/main/kitty.app.iconset/[email protected]
- :target: https://github.com/sfsam/some_icons
- :width: 256
+-
+-.. image:: https://github.com/igrmk/twiskers/raw/main/icon/twiskers.svg
+- :target: https://github.com/igrmk/twiskers
+- :width: 256
+* https://github.com/k0nserv/kitty-icon
+
+* https://github.com/DinkDonk/kitty-icon
@@ -75,6 +79,8 @@
+* https://github.com/sodapopcan/kitty-icon
+
+* https://github.com/sfsam/some_icons
++
++* https://github.com/igrmk/twiskers
- .. image:: https://github.com/igrmk/twiskers/raw/main/icon/twiskers.svg
- :target: https://github.com/igrmk/twiskers
+ You can put :file:`kitty.app.icns` (macOS only) or :file:`kitty.app.png` in
the
+ :ref:`kitty configuration directory <confloc>`, and this icon will be applied
diff -Nru kitty-0.41.1/debian/patches/0015-backport-s390x-ftbfs-fix.patch
kitty-0.41.1/debian/patches/0015-backport-s390x-ftbfs-fix.patch
--- kitty-0.41.1/debian/patches/0015-backport-s390x-ftbfs-fix.patch
1970-01-01 00:00:00.000000000 +0000
+++ kitty-0.41.1/debian/patches/0015-backport-s390x-ftbfs-fix.patch
2025-06-05 15:09:21.000000000 +0000
@@ -0,0 +1,27 @@
+From afd0bacb6a7130e6ab30d6d00c154577168e8fc2 Mon Sep 17 00:00:00 2001
+From: Pranav P <[email protected]>
+Date: Wed, 21 May 2025 13:02:11 +0530
+Subject: [PATCH] Fix endianness bug reported in issue #8548
+
+---
+ kitty/line.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/kitty/line.h
++++ b/kitty/line.h
+@@ -48,8 +48,15 @@
+
+ typedef union CPUCell {
+ struct {
++ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ char_type ch_or_idx: sizeof(char_type) * 8 - 1;
+ char_type ch_is_idx: 1;
++ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++ char_type ch_is_idx: 1;
++ char_type ch_or_idx: sizeof(char_type) * 8 - 1;
++ #else
++ #error "Unsupported endianness"
++ #endif
+ char_type hyperlink_id: sizeof(hyperlink_id_type) * 8;
+ char_type next_char_was_wrapped : 1;
+ char_type is_multicell : 1;
diff -Nru kitty-0.41.1/debian/patches/series kitty-0.41.1/debian/patches/series
--- kitty-0.41.1/debian/patches/series 2025-04-26 06:41:54.000000000 +0000
+++ kitty-0.41.1/debian/patches/series 2025-06-05 15:08:35.000000000 +0000
@@ -11,3 +11,4 @@
0012-do-not-hardcode-gopsutil-v3.patch
0013-avoid-failing-font-tests-on-ci.patch
0014-use-disintegration-imaging.patch
+0015-backport-s390x-ftbfs-fix.patch
![https://github.com/sfsam/some_icons/raw/main/kitty.app.iconset/[email protected]](https://github.com/sfsam/some_icons/raw/main/kitty.app.iconset/icon_128x...@2x.png){kind=link}
