Bug#1075218: libx86: diff for NMU version 1.1+ds1-13

[Boyuan Yang]

Control: tags -1 +patch  +pending
X-Debbugs-CC: kkama...@gmail.com

Dear maintainer,

I've prepared an NMU for libx86 (versioned as 1.1+ds1-13) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru libx86-1.1+ds1/debian/changelog libx86-1.1+ds1/debian/changelog
--- libx86-1.1+ds1/debian/changelog     2020-04-27 08:30:35.000000000 -0400
+++ libx86-1.1+ds1/debian/changelog     2025-01-02 10:30:17.000000000 -0500
@@ -1,3 +1,16 @@
+libx86 (1.1+ds1-13) unstable; urgency=medium
+
+  * QA upload.
+
+  [ Andrew Bower ]
+  * Patch xf86int10.h to fix FTBFS [-Wincompatible-pointer-types]
+    (Closes: #1075218)
+
+  [ Boyuan Yang ]
+  * Orphan the package via ITS process. (Closes: #1090979)
+
+ -- Boyuan Yang <by...@debian.org>  Thu, 02 Jan 2025 10:30:17 -0500
+
 libx86 (1.1+ds1-12) unstable; urgency=medium

   * New maintainer (Closes: #925042)
diff -Nru libx86-1.1+ds1/debian/control libx86-1.1+ds1/debian/control
--- libx86-1.1+ds1/debian/control       2020-04-27 08:30:35.000000000 -0400
+++ libx86-1.1+ds1/debian/control       2025-01-02 10:30:09.000000000 -0500
@@ -1,14 +1,14 @@
 Source: libx86
 Section: libs
 Priority: optional
-Maintainer: Seunghun Han <kkama...@gmail.com>
+Maintainer: Debian QA Group <packa...@qa.debian.org>
 Build-Depends:
  debhelper-compat (= 12),
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://www.codon.org.uk/~mjg59/libx86/
-Vcs-Git: https://salsa.debian.org/kkamagui-guest/libx86.git
-Vcs-Browser: https://salsa.debian.org/kkamagui-guest/libx86
+Vcs-Git: https://salsa.debian.org/debian/libx86.git
+Vcs-Browser: https://salsa.debian.org/debian/libx86

 Package: libx86-1
 Multi-Arch: same

@@ -0,0 +1,35 @@
+From: Andrew Bower <and...@bower.uk>
+Date: Mon, 9 Dec 2024 18:54:19 +0000
+Forwarded: no
+Subject: amd64: stop assuming long is 32 bits, fixing FTBFS with gcc-14
+
+Appease [-Wincompatible-pointer-types]. (Closes: #1075218)
+---
+ x86emu/include/xf86int10.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/x86emu/include/xf86int10.h b/x86emu/include/xf86int10.h
+index 9c131dd..2ec2b58 100644
+--- a/x86emu/include/xf86int10.h
++++ b/x86emu/include/xf86int10.h
+@@ -9,6 +9,7 @@
+ #ifndef _XF86INT10_H
+ #define _XF86INT10_H
+
++#include "types.h"
+
+ #define SEG_ADDR(x) (((x) >> 4) & 0x00F000)
+ #define SEG_OFF(x) ((x) & 0x0FFFF)
+@@ -16,9 +17,9 @@
+ #define SET_BIOS_SCRATCH     0x1
+ #define RESTORE_BIOS_SCRATCH 0x2
+
+-#define CARD8  unsigned char
+-#define CARD16 unsigned short
+-#define CARD32 unsigned long
++#define CARD8  u8
++#define CARD16 u16
++#define CARD32 u32
+ #define pointer void *
+ #define IOADDRESS void *
+ #define Bool int

--- libx86-1.1+ds1/debian/patches/series        2020-04-27 08:30:35.000000000 
-0400
+++ libx86-1.1+ds1/debian/patches/series        2025-01-02 10:30:09.000000000 
-0500
@@ -1,2 +1,3 @@
 00-fix_Makefile.patch
 01-fix_processor_flags.patch
+02-fix_uncast_pointer_literals.patch

diff -Nru libx86-1.1+ds1/debian/patches/02-fix_uncast_pointer_literals.patch libx86-1.1+ds1/debian/patches/02-fix_uncast_pointer_literals.patch --- libx86-1.1+ds1/debian/patches/02-fix_uncast_pointer_literals.patch 1969-12-31 19:00:00.000000000 -0500 +++ libx86-1.1+ds1/debian/patches/02-fix_uncast_pointer_literals.patch 2025-01-02 10:30:09.000000000 -0500 diff -Nru libx86-1.1+ds1/debian/patches/series libx86-1.1+ds1/debian/patches/series

OpenPGP_signature.asc
Description: OpenPGP digital signature