Merge ~liushuyu-011/ubuntu/+source/libcdio:ubuntu/devel into ubuntu/+source/libcdio:ubuntu/devel

[Zixing Liu]

This MP fixes an FTBFS issue after armhf time_t 64-bit transition.

You can find a PPA build at https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15910749/+listing-archive-extra.

[Lucas Kanashiro (lucaskanashiro)]

Thanks for this MP Zixing! LGTM, +1.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Package uploaded:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libcdio_2.1.0-4.1ubuntu1.dsc: done.
  Uploading libcdio_2.1.0-4.1ubuntu1.debian.tar.xz: done.
  Uploading libcdio_2.1.0-4.1ubuntu1_source.changes: done.
Successfully uploaded packages.

Unmerged commits

9d3e0ec... by Zixing Liu on 2024-04-03

changelog for t64 regression fix

01f3cb8... by Zixing Liu on 2024-04-03

d/p/arm-t64-redirect-fix.patch: add a patch to fix t64 regression

ed3eb62... by Steve Langasek on 2024-03-31

2.1.0-4.1build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 4970271..b3366e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcdio (2.1.0-4.1ubuntu1) noble; urgency=medium
+
+  * debian/patches/arm-t64-redirect-fix.patch: Fix implicit declaration
+    after armhf time_t transition.
+
+ -- Zixing Liu <[e-mail]>  Wed, 03 Apr 2024 15:15:43 -0600
+
 libcdio (2.1.0-4.1build1) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/arm-t64-redirect-fix.patch b/debian/patches/arm-t64-redirect-fix.patch
new file mode 100644
index 0000000..e5667a2
--- /dev/null
+++ b/debian/patches/arm-t64-redirect-fix.patch
@@ -0,0 +1,22 @@
+Description: Fix implicit declaration after armhf time_t transition
+Author: Zixing Liu <[e-mail]>
+Forwarded: no
+Last-Update: 2024-04-03
+
+Index: libcdio/lib/driver/_cdio_stdio.h
+===================================================================
+--- libcdio.orig/lib/driver/_cdio_stdio.h
++++ libcdio/lib/driver/_cdio_stdio.h
+@@ -22,6 +22,12 @@
+ 
+ #include "_cdio_stream.h"
+ 
++#include <features.h>
++#if defined(_FILE_OFFSET_BITS) && defined(__REDIRECT) && (_FILE_OFFSET_BITS == 64)
++#define lseek64 lseek
++#define fseeko64 fseeko
++#endif
++
+ /*!
+   Initialize a new stdio stream reading from pathname.
+   A pointer to the stream is returned or NULL if there was an error.
diff --git a/debian/patches/series b/debian/patches/series
index d2a6512..386da3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch
 src-cdda-player.c-always-use-s-style-format-for-prin.patch
 Correct-realpath-test-failure.patch
 Use-getmntent-setmntent-for-reading-mounts.patch
+arm-t64-redirect-fix.patch