Bug#1075432: quesoglc: diff for NMU version 0.7.2-7.1

[pini]

X-NMUDIFF-Version: 2.23.4+deb12u1

Control: tags 1075432 + patch
Control: tags 1075432 + pending


Dear maintainer,

I've prepared an NMU for quesoglc (versioned as 0.7.2-7.1) and
uploaded it to DELAYED/6. Please feel free to tell me if I
should delay it longer.

Regards.


@@ -1,3 +1,10 @@
+quesoglc (0.7.2-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch gcc14.patch to fix FTBFS with GCC-14 (closes: #1075432)
+
+ -- Gilles Filippini <p...@debian.org>  Fri, 16 Aug 2024 11:11:42 +0200
+
 quesoglc (0.7.2-7) unstable; urgency=medium

   [ Debian Janitor ]

@@ -0,0 +1,46 @@
+Index: quesoglc-0.7.2/src/scalable.c
+===================================================================
+--- quesoglc-0.7.2.orig/src/scalable.c
++++ quesoglc-0.7.2/src/scalable.c
+@@ -597,15 +597,14 @@ void __glcRenderCharScalable(__GLCfont*
+     gluTessProperty(tess, GLU_TESS_BOUNDARY_ONLY, GL_FALSE);
+
+     gluTessCallback(tess, GLU_TESS_ERROR,
+-                      (void (CALLBACK *) (GLenum))__glcCallbackError);
++                      (void (CALLBACK *) (void))__glcCallbackError);
+     gluTessCallback(tess, GLU_TESS_VERTEX_DATA,

++                  (void (CALLBACK *) (void))__glcVertexCallback);
+     gluTessCallback(tess, GLU_TESS_COMBINE_DATA,
+-                  (void (CALLBACK *) (GLdouble[3], void*[4],
+-                                      GLfloat[4], void**, void*))
++                  (void (CALLBACK *) (void))
+                   __glcCombineCallback);
+     gluTessCallback(tess, GLU_TESS_BEGIN_DATA,

++                  (void (CALLBACK *) (void))__glcBeginCallback);
+
+     gluTessNormal(tess, 0., 0., 1.);
+
+Index: quesoglc-0.7.2/src/unicode.c
+===================================================================
+--- quesoglc-0.7.2.orig/src/unicode.c
++++ quesoglc-0.7.2/src/unicode.c
+@@ -650,7 +650,7 @@ GLCchar32* __glcConvertToVisualUcs4(__GL
+
+   if (length) {
+     visualString = string + length + 1;

+                          NULL)) {
+       __glcRaiseError(GLC_RESOURCE_ERROR);
+       return NULL;
+@@ -762,7 +762,7 @@ GLCchar32* __glcConvertCountedStringToVi
+   }
+
+   visualString = string + inCount;

+                      NULL)) {
+     __glcRaiseError(GLC_RESOURCE_ERROR);
+     return NULL;

@@ -2,3 +2,4 @@
 01_fix_glew_search.diff
 02_fix_chinese_fonts.diff
 03_workaround_autoconf_weirdness.patch
+gcc14.patch

diff -Nru quesoglc-0.7.2/debian/changelog quesoglc-0.7.2/debian/changelog --- quesoglc-0.7.2/debian/changelog 2021-09-08 10:43:15.000000000 +0200 +++ quesoglc-0.7.2/debian/changelog 2024-08-16 11:11:42.000000000 +0200 diff -Nru quesoglc-0.7.2/debian/patches/gcc14.patch quesoglc-0.7.2/debian/patches/gcc14.patch --- quesoglc-0.7.2/debian/patches/gcc14.patch 1970-01-01 01:00:00.000000000 +0100 +++ quesoglc-0.7.2/debian/patches/gcc14.patch 2024-08-16 11:11:42.000000000 +0200 +- (void (CALLBACK *) (void*, void*))__glcVertexCallback); +- (void (CALLBACK *) (GLenum, void*))__glcBeginCallback); +- if (!fribidi_log2vis(string, length, &base, visualString, NULL, NULL, ++ if (!fribidi_log2vis(string, length, (void*)&base, visualString, NULL, NULL, +- if (!fribidi_log2vis(string, inCount, &base, visualString, NULL, NULL, ++ if (!fribidi_log2vis(string, inCount, (void*)&base, visualString, NULL, NULL, diff -Nru quesoglc-0.7.2/debian/patches/series quesoglc-0.7.2/debian/patches/series --- quesoglc-0.7.2/debian/patches/series 2021-09-08 10:39:56.000000000 +0200 +++ quesoglc-0.7.2/debian/patches/series 2024-08-16 11:11:42.000000000 +0200

signature.asc
Description: OpenPGP digital signature