amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ftgl: Fix build.

Browse source 
* gnu/packages/patches/ftgl-ftcontour-type.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gl.scm (ftgl) [source]: Apply it.

Change-Id: Ifaf78e18cd2d1ec1c706ebb5d649d7ead7df335a
This commit is contained in:
Maxim Cournoyer 2025-05-19 08:45:23 +09:00 • committed by Liliana Marie Prikler
parent ecf821c5d3
commit bf33dd7335
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
3 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1315,6 +1315,7 @@ dist_patch_DATA = \
%D%/packages/patches/freesolid-autotools.patch \
%D%/packages/patches/freesolid-configure.patch \
%D%/packages/patches/freesolid-pkgconfig.patch \
%D%/packages/patches/ftgl-ftcontour-type.patch \
%D%/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch \
%D%/packages/patches/fuse-glibc-2.34.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \

3
gnu/packages/gl.scm
View file

@ -186,7 +186,8 @@ the X-Consortium license.")
(file-name (git-file-name name version))
(sha256
(base32
"0zjs1h9w30gajq9lndzvjsa26rsmr1081lb1fbpbj10yhcdcsc79"))))
"0zjs1h9w30gajq9lndzvjsa26rsmr1081lb1fbpbj10yhcdcsc79"))
(patches (search-patches "ftgl-ftcontour-type.patch"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

50
gnu/packages/patches/ftgl-ftcontour-type.patch Normal file
View file

@ -0,0 +1,50 @@
From d546aefd73dcbb0d0d1e0f3c916770d7f9f98169 Mon Sep 17 00:00:00 2001
From: Joseph C Wang <joequant@gmail.com>
Date: Tue, 8 Oct 2024 19:47:53 +0800
Subject: [PATCH] fix type error
---
src/FTContour.cpp | 2 +-
src/FTContour.h | 2 +-
src/FTVectoriser.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/FTContour.cpp b/src/FTContour.cpp
index c668d32..ef13576 100644
--- a/src/FTContour.cpp
+++ b/src/FTContour.cpp
@@ -174,7 +174,7 @@ void FTContour::SetParity(int parity)
}
-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n)
+FTContour::FTContour(FT_Vector* contour, unsigned char* tags, unsigned int n)
{
FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]);
double olddir, dir = atan2((next - cur).Y(), (next - cur).X());
diff --git a/src/FTContour.h b/src/FTContour.h
index d2d187c..dc64e3a 100644
--- a/src/FTContour.h
+++ b/src/FTContour.h
@@ -52,7 +52,7 @@ class FTContour
* @param pointTags
* @param numberOfPoints
*/
- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints);
+ FTContour(FT_Vector* contour, unsigned char* pointTags, unsigned int numberOfPoints);
/**
* Destructor
diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp
index 26e7da8..53d738e 100644
--- a/src/FTVectoriser.cpp
+++ b/src/FTVectoriser.cpp
@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours()
for(int i = 0; i < ftContourCount; ++i)
{
FT_Vector* pointList = &outline.points[startIndex];
- char* tagList = &outline.tags[startIndex];
+ unsigned char* tagList = &outline.tags[startIndex];
endIndex = outline.contours[i];
contourLength = (endIndex - startIndex) + 1;