Control: tags -1 patch
I am uploading the git changes as NMU to DELAYED/10. Please find the debdiff with the same changes attached.
diff -Nru hx-25.01.1+20250505/debian/changelog hx-25.01.1+20250505/debian/changelog --- hx-25.01.1+20250505/debian/changelog 2025-08-10 10:50:10.000000000 +0200 +++ hx-25.01.1+20250505/debian/changelog 2025-09-02 12:41:00.000000000 +0200 @@ -1,3 +1,11 @@ +hx (25.01.1+20250505-3.1) unstable; urgency=medium + + * Non-maintainer upload + * Fix type mismatch on 32 bit (Closes: #1111814) + * d/copyright: List the correct BSD-3-clause version (Closes: #1102356) + + -- Bastian Germann <[email protected]> Tue, 02 Sep 2025 12:41:00 +0200 + hx (25.01.1+20250505-3) unstable; urgency=medium * no-changes source-only upload to enable testing migration diff -Nru hx-25.01.1+20250505/debian/copyright hx-25.01.1+20250505/debian/copyright --- hx-25.01.1+20250505/debian/copyright 2025-05-06 13:54:40.000000000 +0200 +++ hx-25.01.1+20250505/debian/copyright 2025-09-02 12:40:16.000000000 +0200 @@ -212,7 +212,30 @@ Reference: /usr/share/common-licenses/Apache-2.0 License: BSD-3-clause -Reference: /usr/share/common-licenses/BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: Expat Permission is hereby granted, free of charge, diff -Nru hx-25.01.1+20250505/debian/patches/2005_type-mismatch-on-32-bit.patch hx-25.01.1+20250505/debian/patches/2005_type-mismatch-on-32-bit.patch --- hx-25.01.1+20250505/debian/patches/2005_type-mismatch-on-32-bit.patch 1970-01-01 01:00:00.000000000 +0100 +++ hx-25.01.1+20250505/debian/patches/2005_type-mismatch-on-32-bit.patch 2025-09-02 12:40:16.000000000 +0200 @@ -0,0 +1,33 @@ +From 10ac3d03c6ac61a07f48abc2c5ad727113fbf67e Mon Sep 17 00:00:00 2001 +From: Bastian Germann <[email protected]> +Date: Fri, 22 Aug 2025 13:14:11 +0200 +Subject: [PATCH] Fix type mismatch on 32 bit + +This fixes https://github.com/helix-editor/helix/issues/13264 by using a +u32 instead of usize. +--- + helix-view/src/theme.rs | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs +index af8f03bc..52ea0f0f 100644 +--- a/helix-view/src/theme.rs ++++ b/helix-view/src/theme.rs +@@ -307,16 +307,7 @@ impl Theme { + + /// Create a Highlight that represents an RGB color + pub fn rgb_highlight(r: u8, g: u8, b: u8) -> Highlight { +- Highlight(usize::from_ne_bytes([ +- b, +- g, +- r, +- u8::MAX, +- u8::MAX, +- u8::MAX, +- u8::MAX, +- u8::MAX, +- ])) ++ Highlight((u32::from_ne_bytes([b, g, r, u8::MAX])).try_into().unwrap()) + } + + #[inline] diff -Nru hx-25.01.1+20250505/debian/patches/series hx-25.01.1+20250505/debian/patches/series --- hx-25.01.1+20250505/debian/patches/series 2025-08-04 09:23:24.000000000 +0200 +++ hx-25.01.1+20250505/debian/patches/series 2025-09-02 12:40:16.000000000 +0200 @@ -29,3 +29,4 @@ 2003_not_mac.patch 2003_not_windows.patch 2004_perl.patch +2005_type-mismatch-on-32-bit.patch
