Control: tags 1069385 patch Please find attached a comprehensive NMU patch for both the time_t conversion and the FTBFS errors.
I am uploading this now as a 0-day NMU. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru clanlib-1.0~svn3827/debian/changelog clanlib-1.0~svn3827/debian/changelog --- clanlib-1.0~svn3827/debian/changelog 2023-09-15 13:49:45.000000000 -0700 +++ clanlib-1.0~svn3827/debian/changelog 2024-04-25 14:29:44.000000000 -0700 @@ -1,3 +1,20 @@ +clanlib (1.0~svn3827-11.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix dep from -dev package to point to current runtime lib name. + Closes: #1069385. + * debian/patches/64-bit-time-t-compat.patch: compatibility with 64-bit + time_t. Closes: #1067616. + + -- Steve Langasek <vor...@debian.org> Thu, 25 Apr 2024 21:29:44 +0000 + +clanlib (1.0~svn3827-11.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1062074 + + -- Steve Langasek <vor...@debian.org> Wed, 28 Feb 2024 15:52:37 +0000 + clanlib (1.0~svn3827-11) unstable; urgency=medium * Team upload. diff -Nru clanlib-1.0~svn3827/debian/control clanlib-1.0~svn3827/debian/control --- clanlib-1.0~svn3827/debian/control 2023-09-15 13:49:45.000000000 -0700 +++ clanlib-1.0~svn3827/debian/control 2024-04-25 14:29:44.000000000 -0700 @@ -4,7 +4,7 @@ Barry deFreese <bdefre...@debian.org> Section: libs Priority: optional -Build-Depends: +Build-Depends: dpkg-dev (>= 1.22.5), bzip2, debhelper-compat (= 12), libasound2-dev [linux-any], @@ -28,14 +28,17 @@ Vcs-Git: https://salsa.debian.org/games-team/clanlib.git Homepage: https://github.com/sphair/ClanLib -Package: libclanapp-1.0v5 +Package: libclanapp-1.0t64 +Provides: ${t64:Provides} +X-Time64-Compat: libclanapp-1.0v5 +Breaks: libclanapp-1.0v5 (<< ${source:Version}) Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libclanapp-1.0 -Replaces: +Replaces:libclanapp-1.0v5, libclanapp-1.0 Multi-Arch: same Description: ClanLib game SDK runtime @@ -60,7 +63,7 @@ Architecture: any Section: libdevel Depends: - libclanapp-1.0v5 (= ${binary:Version}), + libclanapp-1.0t64 (= ${binary:Version}), ${misc:Depends} Recommends: libfreetype-dev, diff -Nru clanlib-1.0~svn3827/debian/libclanapp-1.0t64.install clanlib-1.0~svn3827/debian/libclanapp-1.0t64.install --- clanlib-1.0~svn3827/debian/libclanapp-1.0t64.install 1969-12-31 16:00:00.000000000 -0800 +++ clanlib-1.0~svn3827/debian/libclanapp-1.0t64.install 2023-09-15 13:49:45.000000000 -0700 @@ -0,0 +1,11 @@ +usr/lib/*/libclanApp*.so.* +usr/lib/*/libclanCore*.so.* +usr/lib/*/libclanDisplay*.so.* +usr/lib/*/libclanGL*.so.* +usr/lib/*/libclanGUI*.so.* +usr/lib/*/libclanGUIStyleSilver*.so.* +usr/lib/*/libclanMikMod*.so.* +usr/lib/*/libclanNetwork*.so.* +usr/lib/*/libclanSignals*.so.* +usr/lib/*/libclanSound*.so.* +usr/lib/*/libclanVorbis*.so.* diff -Nru clanlib-1.0~svn3827/debian/libclanapp-1.0t64.lintian-overrides clanlib-1.0~svn3827/debian/libclanapp-1.0t64.lintian-overrides --- clanlib-1.0~svn3827/debian/libclanapp-1.0t64.lintian-overrides 1969-12-31 16:00:00.000000000 -0800 +++ clanlib-1.0~svn3827/debian/libclanapp-1.0t64.lintian-overrides 2024-02-28 07:52:20.000000000 -0800 @@ -0,0 +1 @@ +libclanapp-1.0t64: package-name-doesnt-match-sonames libclanapp-1.0v5 diff -Nru clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install --- clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install 2023-09-15 13:49:45.000000000 -0700 +++ clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install 1969-12-31 16:00:00.000000000 -0800 @@ -1,11 +0,0 @@ -usr/lib/*/libclanApp*.so.* -usr/lib/*/libclanCore*.so.* -usr/lib/*/libclanDisplay*.so.* -usr/lib/*/libclanGL*.so.* -usr/lib/*/libclanGUI*.so.* -usr/lib/*/libclanGUIStyleSilver*.so.* -usr/lib/*/libclanMikMod*.so.* -usr/lib/*/libclanNetwork*.so.* -usr/lib/*/libclanSignals*.so.* -usr/lib/*/libclanSound*.so.* -usr/lib/*/libclanVorbis*.so.* diff -Nru clanlib-1.0~svn3827/debian/patches/64-bit-time-t-compat.patch clanlib-1.0~svn3827/debian/patches/64-bit-time-t-compat.patch --- clanlib-1.0~svn3827/debian/patches/64-bit-time-t-compat.patch 1969-12-31 16:00:00.000000000 -0800 +++ clanlib-1.0~svn3827/debian/patches/64-bit-time-t-compat.patch 2024-04-25 14:29:44.000000000 -0700 @@ -0,0 +1,53 @@ +Description: compatibility with 64-bit time_t + linux/input.h uses a different structure when time_t is 64-bit, so + patch around this. +Author: Steve Langasek <steve.langa...@canonical.com> +Bug-Debian: https://bugs.debian.org/1067616 +Last-Update: 2024-04-25 +Forwarded: no + +Index: clanlib-1.0~svn3827/Sources/GL/GLX/input_device_linuxevent.cpp +=================================================================== +--- clanlib-1.0~svn3827.orig/Sources/GL/GLX/input_device_linuxevent.cpp ++++ clanlib-1.0~svn3827/Sources/GL/GLX/input_device_linuxevent.cpp +@@ -42,6 +42,16 @@ + #include "API/Display/input_event.h" + #include "input_device_linuxevent.h" + ++/* The field to look up in struct input_event for integer seconds */ ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#endif ++ ++/* The field to look up in struct input_event for fractional seconds */ ++#ifndef input_event_usec ++#define input_event_usec time.tv_usec ++#endif ++ + // FIXME: These three should be in linux/input.h + #define MSC_RAW 0x03 + #define MSC_SCAN 0x04 +@@ -266,12 +276,12 @@ + if (ev[i].type == EV_SYN) + { + printf("Event: time %ld.%06ld, -------------- %s ------------\n", +- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].code ? "Config Sync" : "Report Sync" ); ++ ev[i].input_event_sec, ev[i].input_event_usec, ev[i].code ? "Config Sync" : "Report Sync" ); + } + else if (ev[i].type == EV_MSC && (ev[i].code == MSC_RAW || ev[i].code == MSC_SCAN)) + { + printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %02x\n", +- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type, ++ ev[i].input_event_sec, ev[i].input_event_usec, ev[i].type, + events[ev[i].type] ? events[ev[i].type] : "?", + ev[i].code, + names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?", +@@ -280,7 +290,7 @@ + else + { + printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n", +- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type, ++ ev[i].input_event_sec, ev[i].input_event_usec, ev[i].type, + events[ev[i].type] ? events[ev[i].type] : "?", + ev[i].code, + names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?", diff -Nru clanlib-1.0~svn3827/debian/patches/series clanlib-1.0~svn3827/debian/patches/series --- clanlib-1.0~svn3827/debian/patches/series 2023-09-15 13:49:45.000000000 -0700 +++ clanlib-1.0~svn3827/debian/patches/series 2024-04-25 14:29:44.000000000 -0700 @@ -11,3 +11,4 @@ remove-special-variable-perl-5.30.patch 500_reproducible_build.patch pthread_mutexattr_setkind_np.patch +64-bit-time-t-compat.patch diff -Nru clanlib-1.0~svn3827/debian/rules clanlib-1.0~svn3827/debian/rules --- clanlib-1.0~svn3827/debian/rules 2023-09-15 13:49:45.000000000 -0700 +++ clanlib-1.0~svn3827/debian/rules 2024-04-13 22:36:44.000000000 -0700 @@ -46,7 +46,7 @@ rm -f Documentation/Tutorial/Kavanek/*.html override_dh_installdocs-arch: - dh_installdocs --link-doc=libclanapp-1.0v5 + dh_installdocs --link-doc=libclanapp-1.0t64 override_dh_installexamples-indep: dh_installexamples -pclanlib-doc Examples/*
signature.asc
Description: PGP signature
