[packages/XmHTML] - type fixes for gcc 15 (including one possible memory bug in png_get_gAMA call); release 3
qboosh
qboosh at pld-linux.org
Sat Feb 7 09:36:29 CET 2026
commit 269924e2e083562d51d40621b8d73330346e9d57
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 7 09:36:47 2026 +0100
- type fixes for gcc 15 (including one possible memory bug in png_get_gAMA call); release 3
XmHTML-types.patch | 31 +++++++++++++++++++++++++++++++
XmHTML.spec | 6 ++++--
2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/XmHTML.spec b/XmHTML.spec
index 14083b1..83e810e 100644
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -9,14 +9,15 @@ Summary: Motif HTML widget
Summary(pl.UTF-8): Widget do HTML-a oparty o Motif
Name: XmHTML
Version: 1.1.10
-Release: 2
+Release: 3
License: LGPL v2+
Group: X11/Libraries
-Source0: http://downloads.sourceforge.net/xmhtml/%{name}-%{version}.tgz
+Source0: https://downloads.sourceforge.net/xmhtml/%{name}-%{version}.tgz
# Source0-md5: fd339d59d020da2ccf6e92bf65b810e2
Patch0: %{name}-am.patch
Patch1: %{name}-build.patch
Patch2: %{name}-xft.patch
+Patch3: %{name}-types.patch
URL: https://sourceforge.net/projects/xmhtml/
BuildRequires: autoconf
BuildRequires: automake
@@ -70,6 +71,7 @@ Statyczna wersja biblioteki XmHTML.
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
+%patch -P3 -p1
%build
%{__libtoolize}
diff --git a/XmHTML-types.patch b/XmHTML-types.patch
new file mode 100644
index 0000000..b65ff96
--- /dev/null
+++ b/XmHTML-types.patch
@@ -0,0 +1,31 @@
+--- XmHTML-1.1.10/lib/common/readPNG.c.orig 2015-10-26 11:22:55.131545877 +0100
++++ XmHTML-1.1.10/lib/common/readPNG.c 2026-02-07 09:19:37.647987052 +0100
+@@ -185,7 +185,7 @@ _XmHTMLReadPNG(Widget html, ImageBuffer
+ int i, idx, npass;
+ int width, height, color_type;
+ int ncolors, max_colors;
+- float gamma, fg_gamma;
++ double gamma, fg_gamma;
+ Boolean has_alpha = False, has_cmap = False, do_gamma = True;
+ png_bytep *row_ptrs;
+ #if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+--- XmHTML-1.1.10/lib/common/psoutput.c.orig 2015-10-26 11:22:55.128545877 +0100
++++ XmHTML-1.1.10/lib/common/psoutput.c 2026-02-07 09:22:34.172276104 +0100
+@@ -211,7 +211,7 @@ static ToolkitAbstraction *_CreatePostsc
+ static int pstkSetForeground(Display *disp, XGC gc, unsigned long foreground);
+ static int pstkSetFont(Display *disp, XGC gc, XmHTMLfont *font);
+ static int pstkDrawString(struct _ToolkitAbstraction* tka,
+- struct _XmHTMLFont *font, XGC gc, int x, int y, char *string, int length);
++ struct _XmHTMLFont *font, XGC gc, int x, int y, _Xconst char *string, int length);
+ static void pstkDrawAnchorData(Display *disp, WINDOW win, XGC gc, int x,
+ int y, XmHTMLObjectTableElement data);
+ static int pstkDrawLine(Display *disp, WINDOW win, XGC gc, int x1, int y1,
+@@ -1868,7 +1868,7 @@ pstkCopyArea(Display *disp, DRAWABLE src
+ *****/
+ static int
+ pstkDrawString( struct _ToolkitAbstraction* tka, struct _XmHTMLFont *font,
+- XGC gc, int x, int y, char *string, int length)
++ XGC gc, int x, int y, _Xconst char *string, int length)
+ {
+ Display *disp = tka->dpy;
+ PSDisplay *dpy = (PSDisplay*)disp;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/XmHTML.git/commitdiff/269924e2e083562d51d40621b8d73330346e9d57
More information about the pld-cvs-commit
mailing list