haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpc, revbump, re-add fix for libGLU (#10230)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-03-20 14:30:26 +01:00
committed by GitHub
parent 53a5526dd9
commit a69ad94446
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-lang/fpc/fpc-3.2.2.recipe
View File

@@ -11,7 +11,7 @@ HOMEPAGE="https://freepascal.org/"
COPYRIGHT="1993-2021 Florian Klaempfl and others"
LICENSE="GNU LGPL v3
GNU GPL v3"
REVISION="3"
REVISION="4"
SOURCE_URI="https://downloads.sourceforge.net/freepascal/fpcbuild-$portVersion.tar.gz"
CHECKSUM_SHA256="85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f"
SOURCE_URI_2="https://sourceforge.net/projects/freepascal/files/Documentation/$portVersion/doc-pdf.tar.gz#noarchive"

18
dev-lang/fpc/patches/fpc-3.2.2.patchset
View File

@@ -1,9 +1,25 @@
From 47a2978d08244820cda369dddecb5af6afbfec12 Mon Sep 17 00:00:00 2001
From: hfsfox <darkkitsunezx128k2309@gmail.com>
Date: Tue, 24 Jan 2023 02:21:42 +0200
Subject: Fix libiconv error
Subject: libiconv and libGLU fix
diff --git a/fpcsrc/packages/opengl/src/glu.pp b/fpcsrc/packages/opengl/src/glu.pp
index 3d79616..534a3da 100644
--- a/fpcsrc/packages/opengl/src/glu.pp
+++ b/fpcsrc/packages/opengl/src/glu.pp
@@ -73,8 +73,10 @@ Const
GLU_Lib = 'opengl.dll';
{$elseif defined(darwin)}
GLU_LIB = '/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib';
-{$elseif defined(haiku) or defined(OpenBSD)}
+{$elseif defined(OpenBSD)}
GLU_LIB = 'libGLU.so';
+{ $elseif defined(haiku)}
+ GLU_LIB = 'libGLU.so.1';
{$elseif defined(MorphOS)}
GLU_LIB = 'tinygl.library';
{$else}
diff --git a/fpcsrc/rtl/unix/cwstring.pp b/fpcsrc/rtl/unix/cwstring.pp
index 688bc55..4b354cb 100644
--- a/fpcsrc/rtl/unix/cwstring.pp