From 562eaca0430c3a2439e208ec2dbc3cd4e8ab4753 Mon Sep 17 00:00:00 2001 From: Ahmad Khalifa Date: Sat, 25 Jan 2025 21:43:19 +0000 Subject: [PATCH 1/2] convert legacy encoding to UTF-8 Files in ISO-8859-15, CP-1252 and CP-850 encoding are not always displayed correctly. Convert them to UTF-8 to make sure they're displayed correctly and to avoid warnings when packaging FreeBASIC for debian --- examples/GUI/GTK+/combo_test.bas | 2 +- examples/graphics/OpenGL/NeHe/lesson22.bas | 2 +- inc/X11/extensions/Xge.bi | 2 +- inc/dos/sys/farptr.bi | 6 +++--- inc/gsl/gsl_complex_math.bi | 2 +- src/compiler/stabs.bi | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/GUI/GTK+/combo_test.bas b/examples/GUI/GTK+/combo_test.bas index d7fd58a08f..e94c36e8ac 100644 --- a/examples/GUI/GTK+/combo_test.bas +++ b/examples/GUI/GTK+/combo_test.bas @@ -1,5 +1,5 @@ '' -'' combo box example, translated from an C example written by Φzcan Gόngφr +'' combo box example, translated from an C example written by Γ–zcan GΓΌngΓΆr '' ' Reviewed by TJF (2011) ' Details: http://developer.gnome.org/gtk/ diff --git a/examples/graphics/OpenGL/NeHe/lesson22.bas b/examples/graphics/OpenGL/NeHe/lesson22.bas index 127464ce60..a7b6abed25 100644 --- a/examples/graphics/OpenGL/NeHe/lesson22.bas +++ b/examples/graphics/OpenGL/NeHe/lesson22.bas @@ -518,7 +518,7 @@ end sub '' '' On http:'www.nvidia.com/marketing/Developer/DevRel.nsf/TechnicalDemosFrame?OpenPage '' You Can Find A Demo Called GL_BUMP That Is A Little Bit More Complicated. -'' GL_BUMP: Copyright Diego Tαrtara, 1999. +'' GL_BUMP: Copyright Diego TΓ‘rtara, 1999. '' - diego_tartara@ciudad.com.ar - '' '' The Idea Behind GL_BUMP Is, That You Compute The Texture-Coordinate Offset As Follows: diff --git a/inc/X11/extensions/Xge.bi b/inc/X11/extensions/Xge.bi index 8bfdaf6d91..c0655d03bd 100644 --- a/inc/X11/extensions/Xge.bi +++ b/inc/X11/extensions/Xge.bi @@ -1,7 +1,7 @@ '' FreeBASIC binding for libXext-1.3.3 '' '' based on the C header files: -'' Copyright © 2007-2008 Peter Hutterer +'' Copyright Β© 2007-2008 Peter Hutterer '' '' Permission is hereby granted, free of charge, to any person obtaining a '' copy of this software and associated documentation files (the "Software"), diff --git a/inc/dos/sys/farptr.bi b/inc/dos/sys/farptr.bi index 276afb3b34..5455407f7d 100644 --- a/inc/dos/sys/farptr.bi +++ b/inc/dos/sys/farptr.bi @@ -6,9 +6,9 @@ ' IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED ' WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -'ΙΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝ» -'Ί Far Pointer Simulation Functions Ί -'ΘΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΝΌ +'╔═══════════════════════════════════════════════════════════════════════╗ +'β•‘ Far Pointer Simulation Functions β•‘ +'β•šβ•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β• ' 'This file attempts to make up for the lack of a "far" keyword in GCC. 'Although it doesn't provide access to far call APIs (like Windows), it diff --git a/inc/gsl/gsl_complex_math.bi b/inc/gsl/gsl_complex_math.bi index 16d79490ab..b95d2413a3 100644 --- a/inc/gsl/gsl_complex_math.bi +++ b/inc/gsl/gsl_complex_math.bi @@ -3,7 +3,7 @@ '' based on the C header files: '' complex/gsl_complex_math.h '' -'' Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2007 Jorma Olavi Tδhtinen, Brian Gough +'' Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004, 2007 Jorma Olavi TΓ€htinen, Brian Gough '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/src/compiler/stabs.bi b/src/compiler/stabs.bi index 5d3fafcf48..cead72f6f2 100644 --- a/src/compiler/stabs.bi +++ b/src/compiler/stabs.bi @@ -15,7 +15,7 @@ const STAB_TYPE_M2C = 66 'Modula-2 compilation unit const STAB_TYPE_SLINE = 68 'Line number in text segment const STAB_TYPE_DSLINE = 70 'Line number in data segment const STAB_TYPE_BSLINE = 72 'Line number in bss segment -const STAB_TYPE_BROWS = 72 'Sun source code browser, path to ‘.cb’ file +const STAB_TYPE_BROWS = 72 'Sun source code browser, path to '.cb' file const STAB_TYPE_DEFD = 74 'GNU Modula2 definition module dependency const STAB_TYPE_FLINE = 76 'Function start/body/end line numbers const STAB_TYPE_EHDECL = 80 'GNU C++ exception variable From 455db3741dd220b2c5d3165356827c86f01fd626 Mon Sep 17 00:00:00 2001 From: Jeff Marshall Date: Tue, 18 Feb 2025 11:11:33 -0500 Subject: [PATCH 2/2] inc/dos/sys/farptr.bi: remove UTF-8 characters for this DOS include --- inc/dos/sys/farptr.bi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/dos/sys/farptr.bi b/inc/dos/sys/farptr.bi index 5455407f7d..14ed0beeb3 100644 --- a/inc/dos/sys/farptr.bi +++ b/inc/dos/sys/farptr.bi @@ -1,4 +1,4 @@ -' Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details +ο»Ώ' Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details ' Copyright (c) 1995 DJ Delorie. Permission granted to use for any ' purpose, provided this copyright remains attached and unmodified. @@ -6,9 +6,9 @@ ' IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED ' WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -'╔═══════════════════════════════════════════════════════════════════════╗ -'β•‘ Far Pointer Simulation Functions β•‘ -'β•šβ•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β• +'+-----------------------------------------------------------------------+ +'| Far Pointer Simulation Functions | +'+-----------------------------------------------------------------------+ ' 'This file attempts to make up for the lack of a "far" keyword in GCC. 'Although it doesn't provide access to far call APIs (like Windows), it