From 1b1a24d1c72daeb4fe12bbe5f4927b2cd7ccee01 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:16:11 +0000 Subject: [PATCH 01/46] Initialize branch F-12 for alfont --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 681bf7b62b506975f338d5b012722ad12124eb39 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:05 +0000 Subject: [PATCH 02/46] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a33be7e..b54a984 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alfont -# $Id$ +# $Id: Makefile,v 1.1 2006/12/03 20:17:48 jwrdegoede Exp $ NAME := alfont SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 85f4e29db5b6628bb2a0b0e111f7e913f35b264f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:09 +0000 Subject: [PATCH 03/46] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a33be7e..b54a984 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alfont -# $Id$ +# $Id: Makefile,v 1.1 2006/12/03 20:17:48 jwrdegoede Exp $ NAME := alfont SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a0e86d43fb65714d7f8556ea2f01656748ea493c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:03 +0000 Subject: [PATCH 04/46] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b54a984..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alfont -# $Id: Makefile,v 1.1 2006/12/03 20:17:48 jwrdegoede Exp $ -NAME := alfont -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From e39b744c7296573ff14dad942c168381c69724de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:04 +0000 Subject: [PATCH 05/46] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b54a984..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alfont -# $Id: Makefile,v 1.1 2006/12/03 20:17:48 jwrdegoede Exp $ -NAME := alfont -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From f290150d1db7de191168ccddf5cd4a9c0211706e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:49:37 -0600 Subject: [PATCH 06/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index f76bd8f..aa2b0b3 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 2.0.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 8c929d54d69bcc81e06d5131ccc8f847a827476f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 15 Jul 2011 09:06:35 +0200 Subject: [PATCH 07/46] Rebuild for new allegro-4.4 --- alfont.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/alfont.spec b/alfont.spec index aa2b0b3..06bf227 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -8,7 +8,6 @@ URL: http://chernsha.sitesled.com/ # this is http://chernsha.sitesled.com/AlFont206.rar repackaged in .tgz format Source0: %{name}-%{version}.tar.gz Patch0: alfont-2.0.6-linux.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel freetype-devel %description @@ -46,7 +45,6 @@ gcc -shared -Wl,-soname,lib%{name}.so.2 -o lib%{name}.so.%{version} \ %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_includedir} install -m 755 lib%{name}.so.%{version} $RPM_BUILD_ROOT%{_libdir} @@ -55,12 +53,7 @@ ln -s lib%{name}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig @@ -76,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 15 2011 Hans de Goede - 2.0.6-8 +- Rebuild for new allegro-4.4 + * Mon Feb 07 2011 Fedora Release Engineering - 2.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 0e6795f19525fda1318ef0523d868d7fa133621f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 15 Jul 2011 09:09:35 +0200 Subject: [PATCH 08/46] Drop no longer needed alleg_unsharable hack --- alfont.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alfont.spec b/alfont.spec index 06bf227..6f941f0 100644 --- a/alfont.spec +++ b/alfont.spec @@ -40,8 +40,7 @@ sed -i s'/\r//g' freetype/docs/FTL.TXT gcc -fPIC -DPIC $RPM_OPT_FLAGS -Iinclude `freetype-config --cflags` \ -o src/alfont.o -c src/alfont.c gcc -shared -Wl,-soname,lib%{name}.so.2 -o lib%{name}.so.%{version} \ - src/alfont.o `freetype-config --libs` \ - `allegro-config --libs | sed 's/-lalleg_unsharable//'` + src/alfont.o $(freetype-config --libs) $(allegro-config --libs) %install From 3c3dcccdb83649fc87cccf2cb617870339ef868e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:08:58 -0600 Subject: [PATCH 09/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 6f941f0..7519491 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -68,6 +68,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jul 15 2011 Hans de Goede - 2.0.6-8 - Rebuild for new allegro-4.4 From e5179cadd58afa3b9723b2f6c3073c2a329732c9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 5 Jul 2012 15:29:26 +0200 Subject: [PATCH 10/46] New upstream release 2.0.9 --- .gitignore | 1 + alfont-2.0.6-linux.patch | 79 ---------------------------------------- alfont-2.0.9-linux.patch | 58 +++++++++++++++++++++++++++++ alfont.spec | 18 +++++---- sources | 2 +- 5 files changed, 71 insertions(+), 87 deletions(-) delete mode 100644 alfont-2.0.6-linux.patch create mode 100644 alfont-2.0.9-linux.patch diff --git a/.gitignore b/.gitignore index 85b813b..92dacf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ alfont-2.0.6.tar.gz +/alfont-2.0.9.tar.gz diff --git a/alfont-2.0.6-linux.patch b/alfont-2.0.6-linux.patch deleted file mode 100644 index 93ba999..0000000 --- a/alfont-2.0.6-linux.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- alfont-2.0.6/include/alfont.h~ 2006-11-30 13:48:16.000000000 +0100 -+++ alfont-2.0.6/include/alfont.h 2006-11-30 13:48:16.000000000 +0100 -@@ -10,9 +10,9 @@ - /* See FTL.txt (FreeType Project License) for license */ - - --#define ALFONT_WINDOWS //When compiling in WINDOWS,please uncomment this line. -+//#define ALFONT_WINDOWS //When compiling in WINDOWS,please uncomment this line. - //#define ALFONT_DOS //When compiling in DOS,please uncomment this line. --//#define ALFONT_LINUX //When compiling in LINUX,please uncomment this line. -+#define ALFONT_LINUX //When compiling in LINUX,please uncomment this line. - - - #ifndef ALFONT_H -@@ -461,4 +461,4 @@ - - Platform specifics - RISCOS-LATIN1 --*/ -\ No newline at end of file -+*/ ---- alfont-2.0.6/src/alfont.c~ 2006-11-30 16:12:55.000000000 +0100 -+++ alfont-2.0.6/src/alfont.c 2006-11-30 16:12:55.000000000 +0100 -@@ -450,7 +450,7 @@ - alfont_set_char_extra_spacing(font, 0); - - //Initial Font attribute -- font->language=""; /* Initial Language */ -+ font->language=strdup(""); /* Initial Language */ - font->type=0; /* Initial Code Convert */ - font->outline_top=0; /* Initial Font top outline width */ - font->outline_bottom=0; /* Initial Font bottom outline width */ -@@ -530,7 +530,7 @@ - alfont_set_char_extra_spacing(font, 0); - - //Initial Font attribute -- font->language=""; /* Initial Language */ -+ font->language=strdup(""); /* Initial Language */ - font->type=0; /* Initial Code Convert */ - font->outline_top=0; /* Initial Font top outline width */ - font->outline_bottom=0; /* Initial Font bottom outline width */ -@@ -871,7 +871,7 @@ - last_glyph_index = 0; - - #ifdef ALFONT_LINUX //Fix for Linux Unicode System(be converted) -- for (character = ugetxc(&(const char*)lpszW); character != 0; character = ugetxc(&(const char*)lpszW),character = ugetxc(&(const char*)lpszW)) { -+ for (character = ugetxc((const char**)&lpszW); character != 0; character = ugetxc((const char**)&lpszW),character = ugetxc((const char**)&lpszW)) { - #else - for (character = ugetxc(&(const char*)lpszW); character != 0; character = ugetxc(&(const char*)lpszW)) { - #endif -@@ -1957,7 +1957,7 @@ - last_glyph_index = 0; - - #ifdef ALFONT_LINUX //Fix for Linux Unicode System(be converted) -- for (character = ugetxc(&(const char*)lpszW); character != 0; character = ugetxc(&(const char*)lpszW),character = ugetxc(&(const char*)lpszW)) { -+ for (character = ugetxc((const char**)&lpszW); character != 0; character = ugetxc((const char**)&lpszW),character = ugetxc((const char**)&lpszW)) { - #else - for (character = ugetxc(&(const char*)lpszW); character != 0; character = ugetxc(&(const char*)lpszW)) { - #endif -@@ -2735,7 +2735,7 @@ - /* virtually draw char by char */ - last_glyph_index = 0; - #ifdef ALFONT_LINUX //Fix for Linux Unicode System(be converted) -- for (character = ugetxc(&(const char*)lpszW); character != 0; character = ugetxc(&(const char*)lpszW),character = ugetxc(&(const char*)lpszW)) { -+ for (character = ugetxc((const char**)&lpszW); character != 0; character = ugetxc((const char**)&lpszW),character = ugetxc((const char**)&lpszW)) { - #else - for (character = ugetxc(&(const char*)lpszW); character != 0; character = ugetxc(&(const char*)lpszW)) { - #endif -@@ -3712,7 +3712,9 @@ - if (language == NULL) { - language = ""; - } -- f->language=(char *)malloc(strlen(language)*sizeof(char)); -+ if (f->language) -+ free(f->language); -+ f->language=(char *)malloc((strlen(language)+1)*sizeof(char)); - strcpy(f->language,language); - } - diff --git a/alfont-2.0.9-linux.patch b/alfont-2.0.9-linux.patch new file mode 100644 index 0000000..9b3da99 --- /dev/null +++ b/alfont-2.0.9-linux.patch @@ -0,0 +1,58 @@ +diff -up alfont-2.0.9/include/alfont.h.linux alfont-2.0.9/include/alfont.h +--- alfont-2.0.9/include/alfont.h.linux 2009-02-01 23:52:34.000000000 +0100 ++++ alfont-2.0.9/include/alfont.h 2012-07-04 17:54:36.934125374 +0200 +@@ -10,9 +10,9 @@ + /* See FTL.txt (FreeType Project License) for license */ + + +-#define ALFONT_WINDOWS //When compiling in WINDOWS,please uncomment this line. ++//#define ALFONT_WINDOWS //When compiling in WINDOWS,please uncomment this line. + //#define ALFONT_DOS //When compiling in DOS,please uncomment this line. +-//#define ALFONT_LINUX //When compiling in LINUX,please uncomment this line. ++#define ALFONT_LINUX //When compiling in LINUX,please uncomment this line. + + + #ifndef ALFONT_H +@@ -468,4 +468,4 @@ TDS565 + + Platform specifics + RISCOS-LATIN1 +-*/ +\ No newline at end of file ++*/ +diff -up alfont-2.0.9/src/alfont.c.linux alfont-2.0.9/src/alfont.c +--- alfont-2.0.9/src/alfont.c.linux 2009-02-04 22:40:24.000000000 +0100 ++++ alfont-2.0.9/src/alfont.c 2012-07-05 12:09:47.299021581 +0200 +@@ -468,7 +468,7 @@ ALFONT_FONT *alfont_load_font(const char + alfont_set_char_extra_spacing(font, 0); + + //Initial Font attribute +- font->language=""; /* Initial Language */ ++ font->language=NULL; /* Initial Language */ + font->type=0; /* Initial Code Convert */ + font->outline_top=0; /* Initial Font top outline width */ + font->outline_bottom=0; /* Initial Font bottom outline width */ +@@ -548,7 +548,7 @@ ALFONT_FONT *alfont_load_font_from_mem(c + alfont_set_char_extra_spacing(font, 0); + + //Initial Font attribute +- font->language=""; /* Initial Language */ ++ font->language=NULL; /* Initial Language */ + font->type=0; /* Initial Code Convert */ + font->outline_top=0; /* Initial Font top outline width */ + font->outline_bottom=0; /* Initial Font bottom outline width */ +@@ -4823,12 +4823,13 @@ void alfont_set_char_extra_spacing(ALFON + + + void alfont_set_language(ALFONT_FONT *f, const char *language) { ++ free(f->language); + if (language == NULL) { + f->language = NULL; + } + else + { +- f->language=(char *)malloc(strlen(language)*sizeof(char)); ++ f->language=(char *)malloc((strlen(language)+1)*sizeof(char)); + strcpy(f->language,language); + } + } diff --git a/alfont.spec b/alfont.spec index 7519491..e21708a 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,13 +1,13 @@ Name: alfont -Version: 2.0.6 -Release: 9%{?dist} +Version: 2.0.9 +Release: 1%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL URL: http://chernsha.sitesled.com/ -# this is http://chernsha.sitesled.com/AlFont206.rar repackaged in .tgz format +# this is http://chernsha.sitesled.com/AlFont209.rar repackaged in .tgz format Source0: %{name}-%{version}.tar.gz -Patch0: alfont-2.0.6-linux.patch +Patch0: alfont-2.0.9-linux.patch BuildRequires: allegro-devel freetype-devel %description @@ -30,7 +30,10 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -z .linux -sed -i s'/\r//g' freetype/docs/FTL.TXT +for i in include/alfont*.h freetype/docs/FTL.TXT; do + sed -i.orig s'/\r//g' $i + touch -r $i.orig $i +done %build @@ -57,17 +60,18 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %files -%defattr(-,root,root,-) %doc CHANGES.txt README.txt freetype/docs/FTL.TXT %{_libdir}/lib%{name}.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/%{name}*.h %{_libdir}/lib%{name}.so %changelog +* Thu Jul 5 2012 Hans de Goede - 2.0.9-1 +- New upstream release 2.0.9 + * Thu Jan 12 2012 Fedora Release Engineering - 2.0.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 1546682..de6b0e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12ffff67b0089c70037ad3d3f6306b9f alfont-2.0.6.tar.gz +71112b3089f941a7cfd9e2eeae2f99df alfont-2.0.9.tar.gz From 64090f4d45d693c41c148948a7587058051d04ed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:46:28 -0500 Subject: [PATCH 11/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index e21708a..fab9c21 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 2.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jul 5 2012 Hans de Goede - 2.0.9-1 - New upstream release 2.0.9 From 959f1c62f3cce0748be5352509ce7e978fb805bb Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 29 Jul 2012 12:10:50 +0200 Subject: [PATCH 12/46] Fix undefined reference to _msize --- alfont-2.0.9-remove-alfont_get_string.patch | 284 ++++++++++++++++++++ alfont.spec | 7 +- 2 files changed, 290 insertions(+), 1 deletion(-) create mode 100644 alfont-2.0.9-remove-alfont_get_string.patch diff --git a/alfont-2.0.9-remove-alfont_get_string.patch b/alfont-2.0.9-remove-alfont_get_string.patch new file mode 100644 index 0000000..f4b76e4 --- /dev/null +++ b/alfont-2.0.9-remove-alfont_get_string.patch @@ -0,0 +1,284 @@ +Remove alfont_get_string + +alfont_get_string has a weird, weird API where its destination is char **out, +yet it does not return an allocated buffer in out, instead it uses _msize +on it to check if the passed in buffer is big enough ?? Which means the +parameter could have been a char * just as well ?? + +Anyways we don't have _msize on Linux, and no alfont using apps actually use +alfont_get_string(), so this patch just removes it completely, fixing the +_msize problem. + +Signed-off-by: Hans de Goede +diff -up alfont-2.0.9/include/alfont.h~ alfont-2.0.9/include/alfont.h +--- alfont-2.0.9/include/alfont.h~ 2012-07-29 11:51:08.000000000 +0200 ++++ alfont-2.0.9/include/alfont.h 2012-07-29 11:58:53.194121909 +0200 +@@ -103,8 +103,6 @@ ALFONT_DLL_DECLSPEC int alfont_ugetc(ALF + ALFONT_DLL_DECLSPEC int alfont_ugetx(ALFONT_FONT *f, char **s); //Returns the character pointered by `s' in the current encoding format, and advances the pointer to the next character after the one just returned + ALFONT_DLL_DECLSPEC int alfont_ugetxc(ALFONT_FONT *f, const char **s); //Returns the character pointered by `s' in the current encoding format, and advances the pointer to the next character after the one just returned + +-ALFONT_DLL_DECLSPEC void alfont_get_string(ALFONT_FONT *f, const char *s , char **out); //Gets the converted string pointered by `s' in the current encoding format +- + ALFONT_DLL_DECLSPEC void alfont_set_font_outline_top(ALFONT_FONT *f, int w); //Sets Font top outline width + ALFONT_DLL_DECLSPEC int alfont_get_font_outline_top(ALFONT_FONT *f); //Returns Font top outline width + ALFONT_DLL_DECLSPEC void alfont_set_font_outline_bottom(ALFONT_FONT *f, int w); //Sets Font bottom outline width +diff -up alfont-2.0.9/src/alfont.c~ alfont-2.0.9/src/alfont.c +--- alfont-2.0.9/src/alfont.c~ 2012-07-29 11:51:08.000000000 +0200 ++++ alfont-2.0.9/src/alfont.c 2012-07-29 11:58:44.277233388 +0200 +@@ -4156,256 +4156,6 @@ int alfont_ugetxc(ALFONT_FONT *f, const + return character; + } + +-void alfont_get_string(ALFONT_FONT *f, const char *s , char **out){ +- char *lpszW; +- char *lpszW_pointer=NULL; //used for freeing string +- char *s_pointer=NULL; //used for original string fixed by autofix +- char *s_pointer_temp=NULL; //temporary used for autofix string +- char *precedingchar_pointer=NULL; //used for precedingchar character +- int nLen; +- int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. +- int curr_uformat; +- +- #ifdef ALFONT_DOS +- iconv_t c_pt; +- size_t fromlen, tolen; +- char *sin, *sout; +- #endif +- +- if (s == NULL) { +- return; +- } +- +- nLen = strlen(s) + 1; +- s_pointer = (char *)malloc(nLen*sizeof(char)); +- memset(s_pointer, 0, nLen); +- strcpy(s_pointer, s); +- +- //Auto Fix for cutted string +- //For ASCII convert to unicode +- //Add the previous character to the s string +- //If find the cutted character, store it from the converted s string and remove it from the original s string +- if (f->autofix==TRUE) { +- if (f->type==2) { +- curr_uformat=get_uformat(); +- +- #ifdef ALFONT_DOS +- if ((c_pt = iconv_open("UTF-16LE", f->language)) != (iconv_t)-1) { +- +- fromlen = strlen(s) + 1; +- tolen = MB_CUR_MAX * fromlen * (sizeof(wchar_t) + 1); +- +- //add the previous character to the s string +- if (f->precedingchar != 0) { +- free(s_pointer); +- fromlen = strlen(s) + 1 + 1; +- tolen = MB_CUR_MAX * fromlen * (sizeof(wchar_t) + 1); +- s_pointer = (char *)malloc(tolen*sizeof(char)); +- memset(s_pointer, 0, tolen); +- precedingchar_pointer=(char *)malloc(2*sizeof(char)); +- memset(precedingchar_pointer, 0, 2); +- sprintf(precedingchar_pointer, "%c", f->precedingchar); +- strcpy(s_pointer,precedingchar_pointer); +- if (precedingchar_pointer) { +- free(precedingchar_pointer); +- precedingchar_pointer = NULL; +- } +- strcat(s_pointer, s); +- f->precedingchar = 0; +- } +- +- iconv(c_pt, NULL, NULL, NULL, NULL); +- lpszW = (char *)malloc(tolen*sizeof(char)); +- memset(lpszW, 0, tolen); +- sin = s; +- sout = lpszW; +- ret = iconv(c_pt, &sin, &fromlen, &sout, &tolen); +- iconv_close(c_pt); +- +- s_pointer_temp = s_pointer; +- +- if (ret == -1) { //If the ret is -1, the final one will can be a shortcutted character. +- //store the last character to precedingchar character +- //get the final character +- set_uformat(curr_uformat); +- while (*s_pointer_temp != '\0') { +- f->precedingchar = *s_pointer_temp; +- s_pointer_temp++; +- } +- //remove the final character +- s_pointer_temp--; +- *s_pointer_temp = '\0'; +- } +- if (lpszW) { +- free(lpszW); +- lpszW = NULL; +- } +- } +- #else +- +- +- #ifdef ALFONT_LINUX +- nLen = strlen(s_pointer) * 5 + 1; +- #else +- nLen = strlen(s_pointer) + 1; +- #endif +- +- //add the previous character to the s string +- if (f->precedingchar != 0) { +- free(s_pointer); +- nLen = strlen(s) + 1 + 1; +- s_pointer = (char *)malloc(nLen*sizeof(char)); +- memset(s_pointer, 0, nLen); +- precedingchar_pointer=(char *)malloc(2*sizeof(char)); +- memset(precedingchar_pointer, 0, 2); +- sprintf(precedingchar_pointer, "%c", f->precedingchar); +- strcpy(s_pointer,precedingchar_pointer); +- if (precedingchar_pointer) { +- free(precedingchar_pointer); +- precedingchar_pointer = NULL; +- } +- strcat(s_pointer, s); +- f->precedingchar = 0; +- } +- +- setlocale(LC_CTYPE,f->language); +- set_uformat(U_UNICODE); +- +- lpszW = (char *)malloc(nLen*sizeof(wchar_t)); +- memset(lpszW, 0, nLen); +- ret = mbstowcs((wchar_t *)lpszW, s_pointer, nLen); +- +- s_pointer_temp = s_pointer; +- +- if (ret == -1) { //If the ret is -1, the final one will can be a shortcutted character. +- //store the last character to precedingchar character +- //get the final character +- set_uformat(curr_uformat); +- while (*s_pointer_temp != '\0') { +- f->precedingchar = *s_pointer_temp; +- s_pointer_temp++; +- } +- //remove the final character +- s_pointer_temp--; +- *s_pointer_temp = '\0'; +- } +- if (lpszW) { +- free(lpszW); +- lpszW = NULL; +- } +- #endif +- //recover to original codepage +- set_uformat(curr_uformat); +- } +- } +- +- +- //Font Code Convert +- +- +- if (f->type==1) { +- +- #ifdef ALFONT_DOS +- if ((c_pt = iconv_open(f->language, "UTF-16LE")) == (iconv_t)-1) { +- lpszW = (char *)s_pointer; +- } +- else { +- iconv(c_pt, NULL, NULL, NULL, NULL); +- fromlen = strlen(s_pointer) + 1; +- tolen = MB_CUR_MAX * fromlen * (sizeof(wchar_t) + 1); +- lpszW = (char *)malloc(tolen*sizeof(char)); +- memset(lpszW, 0, tolen); +- sin = s_pointer; +- sout = lpszW; +- ret = iconv(c_pt, &sin, &fromlen, &sout, &tolen); +- iconv_close(c_pt); +- if (ret == -1) { +- lpszW = (char *)s_pointer; +- } +- } +- #else +- setlocale(LC_CTYPE,f->language); +- nLen= MB_CUR_MAX * wcslen((const wchar_t*)s_pointer) + 1; +- lpszW = (char *)malloc(nLen*sizeof(char)); +- memset(lpszW, 0, nLen); +- wcstombs(lpszW, (const wchar_t *)s_pointer, nLen); +- #endif +- } +- else if(f->type==2) { +- curr_uformat=get_uformat(); +- +- #ifdef ALFONT_DOS +- if ((c_pt = iconv_open("UTF-16LE", f->language)) == (iconv_t)-1) { +- lpszW = (char *)s_pointer; +- } +- else { +- iconv(c_pt, NULL, NULL, NULL, NULL); +- fromlen = strlen(s_pointer) + 1; +- tolen = MB_CUR_MAX * fromlen * (sizeof(wchar_t) + 1); +- lpszW = (char *)malloc(tolen*sizeof(char)); +- memset(lpszW, 0, tolen); +- sin = s_pointer; +- sout = lpszW; +- ret = iconv(c_pt, &sin, &fromlen, &sout, &tolen); +- iconv_close(c_pt); +- if (ret == -1) { +- lpszW = (char *)s_pointer; +- } +- else { +- set_uformat(U_UNICODE); +- } +- } +- #else +- setlocale(LC_CTYPE,f->language); +- set_uformat(U_UNICODE); +- +- #ifdef ALFONT_LINUX +- nLen = strlen(s_pointer) * 5 + 1; +- #else +- nLen= strlen(s_pointer) + 1; +- #endif +- +- lpszW = (char *)malloc(nLen*sizeof(wchar_t)); +- memset(lpszW, 0, nLen); +- mbstowcs((wchar_t *)lpszW, s_pointer, nLen); +- #endif +- } +- else { +- #ifdef ALFONT_LINUX +- set_uformat(U_UTF8); +- nLen= ustrlen(s_pointer) + 1; +- #endif +- lpszW = (char *)s_pointer; +- } +- +- memset(*out, 0, _msize(*out)); +- if (_msize(*out) > 0 && _msize(lpszW) >= _msize(*out)) +- { +- memcpy(*out, lpszW, _msize(*out)); +- } +- else if (_msize(*out) > 0 && _msize(*out) > _msize(lpszW)) +- { +- memcpy(*out, lpszW, _msize(lpszW)); +- } +- +- if ((f->type==1)||(f->type==2)) { +- if (lpszW) +- free(lpszW); +- } +- +- if(s_pointer) { +- free(s_pointer); +- } +- +- #ifndef ALFONT_DOS +- setlocale(LC_CTYPE,""); +- #endif +- +- if (f->type==2) { +- set_uformat(curr_uformat); +- } +-} +- + int alfont_need_uconvert(ALFONT_FONT *f, const char *str) { + char *lpszW; + char *str_pointer=NULL; //used for original string fixed by autofix diff --git a/alfont.spec b/alfont.spec index fab9c21..c7e5a75 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -8,6 +8,7 @@ URL: http://chernsha.sitesled.com/ # this is http://chernsha.sitesled.com/AlFont209.rar repackaged in .tgz format Source0: %{name}-%{version}.tar.gz Patch0: alfont-2.0.9-linux.patch +Patch1: alfont-2.0.9-remove-alfont_get_string.patch BuildRequires: allegro-devel freetype-devel %description @@ -30,6 +31,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -z .linux +%patch1 -p1 for i in include/alfont*.h freetype/docs/FTL.TXT; do sed -i.orig s'/\r//g' $i touch -r $i.orig $i @@ -69,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Sun Jul 29 2012 Hans de Goede - 2.0.9-3 +- Fix undefined reference to _msize + * Wed Jul 18 2012 Fedora Release Engineering - 2.0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From fa4997a13b6c26346230811b779e812eba8cce35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:26:27 -0600 Subject: [PATCH 13/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index c7e5a75..5b771f9 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.0.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 29 2012 Hans de Goede - 2.0.9-3 - Fix undefined reference to _msize From 1acfd4ad91663bc0eb636c30c365b5546ec468e5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:32:56 -0500 Subject: [PATCH 14/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 5b771f9..0202986 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.0.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 2.0.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 77cc94ed2b4628a249a750a02c8a98313b4d164f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:26:01 -0500 Subject: [PATCH 15/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 0202986..e30d011 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.0.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1a8491e77a08d3e007d6ab9dcf08d68fd1766cd2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:16:55 +0000 Subject: [PATCH 16/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index e30d011..93307ff 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.0.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 9095e2a7e5de56ea6c093c0da9a10ba9ee696a15 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:46:15 +0000 Subject: [PATCH 17/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 93307ff..7a7e0c7 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.0.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 2.0.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 8241696977caeffdd26a7e0d7c99033be80526c9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:05:22 +0000 Subject: [PATCH 18/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 7a7e0c7..d581eb9 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 2.0.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From cc217ec3e618af225c277f55c4b7c6f304a3e96f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:51:53 +0000 Subject: [PATCH 19/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index d581eb9..5a226a5 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 2.0.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0c59dc1050748de4c25b002afa0c74fd524f87d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:44:43 +0000 Subject: [PATCH 20/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 5a226a5..d069b07 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 76ab9621a9a877579b9a81a94330df989570c732 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:29:42 +0000 Subject: [PATCH 21/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index d069b07..00ad1a9 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.0.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.0.9-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f9a0d82042f1eac3f4d4a270f398c511d87b9a9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:05:44 +0000 Subject: [PATCH 22/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 00ad1a9..e273478 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 2.0.9-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 67599ce9add4ac1c0124706780476be1c62c64cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:07:32 +0000 Subject: [PATCH 23/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index e273478..a17c053 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Font rendering library for the Allegro game library Group: System Environment/Libraries License: FTL @@ -71,6 +71,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.9-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.9-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 58bac89adf23a388dfe065e37fb0e774093541d4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 18 Jul 2018 11:23:40 +0200 Subject: [PATCH 24/46] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- alfont.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alfont.spec b/alfont.spec index a17c053..d537453 100644 --- a/alfont.spec +++ b/alfont.spec @@ -9,6 +9,7 @@ URL: http://chernsha.sitesled.com/ Source0: %{name}-%{version}.tar.gz Patch0: alfont-2.0.9-linux.patch Patch1: alfont-2.0.9-remove-alfont_get_string.patch +BuildRequires: gcc BuildRequires: allegro-devel freetype-devel %description From 0ebd2b70bd815a533507665c9db5f518fc2bf04b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:29 +0100 Subject: [PATCH 25/46] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- alfont.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alfont.spec b/alfont.spec index d537453..fb03b37 100644 --- a/alfont.spec +++ b/alfont.spec @@ -58,8 +58,7 @@ ln -s lib%{name}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From b52a3fdfe69e427a5dfab1c9844286d7f338452a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 26/46] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- alfont.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/alfont.spec b/alfont.spec index fb03b37..18360d3 100644 --- a/alfont.spec +++ b/alfont.spec @@ -2,7 +2,6 @@ Name: alfont Version: 2.0.9 Release: 14%{?dist} Summary: Font rendering library for the Allegro game library -Group: System Environment/Libraries License: FTL URL: http://chernsha.sitesled.com/ # this is http://chernsha.sitesled.com/AlFont209.rar repackaged in .tgz format @@ -20,7 +19,6 @@ text using freetype fonts on Allegro bitmaps. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: allegro-devel From 6beef25c417a14ee34e8f4363f85146c9c1d6316 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:10:15 +0000 Subject: [PATCH 27/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 18360d3..11e052d 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.0.9-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 029e966da93fc9eb5883818eac451bb889490732 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:44:52 +0000 Subject: [PATCH 28/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 11e052d..cd60394 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.0.9-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3f69ae12ea6c4a32e7d4471272c5ce478504211b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:24:24 +0000 Subject: [PATCH 29/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index cd60394..d76086d 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.9-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e8d4f6d3b20e7ded86ca71f511609dd9e88f7a38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:54:45 +0000 Subject: [PATCH 30/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index d76086d..3c14b32 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.9-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.9-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7a1c275ba86ef790ee96a3437438913363e61a7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:54:13 +0000 Subject: [PATCH 31/46] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 3c14b32..0948dd6 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,10 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 2.0.9-19 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.9-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 56cb87716aab15a8c173929a933ef9d4bac7e938 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:58:12 +0000 Subject: [PATCH 32/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 0948dd6..9f4b40b 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.9-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 2.0.9-19 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From de409bec534821c8d56db103954dc7467a31024e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:30:20 +0000 Subject: [PATCH 33/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 96cfe900ff023a0c58db5c16c76d68809d876d42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:25:40 +0000 Subject: [PATCH 34/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 9f4b40b..37c93e8 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.9-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 2.0.9-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5924b7ab4c95c842ff995cf8179f7217d483f154 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:06:23 +0000 Subject: [PATCH 35/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 37c93e8..2196bd1 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.9-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.9-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 14f8692c1697c68e33cefaf0422e44926a9cc1ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:37:43 +0000 Subject: [PATCH 36/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 2196bd1..76349f9 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.0.9-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a4f243787acdde6e4ec6db1c4872a7c36203db2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:34:42 +0000 Subject: [PATCH 37/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 76349f9..ddd1d53 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.9-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 2.0.9-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 50a288f94ddff6255a83af16a40daed714823130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:06:30 +0000 Subject: [PATCH 38/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index ddd1d53..ee57e7b 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.9-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.0.9-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f98f30cd1f525d530e81de69d0cd681a18bbd902 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:40:10 +0000 Subject: [PATCH 39/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index ee57e7b..48362ae 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.9-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.9-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ec4a2a1fd3915affdd79189477a1823e552bc182 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:53:14 +0000 Subject: [PATCH 40/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 48362ae..c3a84c2 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -69,6 +69,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.9-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.9-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4abf80ace4492763506944e241898f192a10c2f9 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 41/46] Eliminate use of obsolete %patchN syntax (#2283636) --- alfont.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfont.spec b/alfont.spec index c3a84c2..711e171 100644 --- a/alfont.spec +++ b/alfont.spec @@ -29,8 +29,8 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -z .linux -%patch1 -p1 +%patch -P0 -p1 -z .linux +%patch -P1 -p1 for i in include/alfont*.h freetype/docs/FTL.TXT; do sed -i.orig s'/\r//g' $i touch -r $i.orig $i From 5acc5f254ae76d31da4c2477d477b8711891a1d0 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 15 Jun 2024 14:12:13 +0200 Subject: [PATCH 42/46] Fix FTBFS (rhbz#2260975) Use distro LD_FLAGS when linking --- alfont-2.0.9-build-fixes.patch | 309 +++++++++++++++++++++++++++++++++ alfont.rpmlintrc | 4 + alfont.spec | 17 +- 3 files changed, 325 insertions(+), 5 deletions(-) create mode 100644 alfont-2.0.9-build-fixes.patch create mode 100644 alfont.rpmlintrc diff --git a/alfont-2.0.9-build-fixes.patch b/alfont-2.0.9-build-fixes.patch new file mode 100644 index 0000000..57fbf20 --- /dev/null +++ b/alfont-2.0.9-build-fixes.patch @@ -0,0 +1,309 @@ +diff -up alfont-2.0.9/src/alfont.c~ alfont-2.0.9/src/alfont.c +--- alfont-2.0.9/src/alfont.c~ 2024-06-15 13:56:38.455325588 +0200 ++++ alfont-2.0.9/src/alfont.c 2024-06-15 13:56:43.799293099 +0200 +@@ -515,7 +515,7 @@ ALFONT_FONT *alfont_load_font_from_mem(c + memcpy((void *)font->data, (void *)data, data_len); + + /* load the font */ +- error = FT_New_Memory_Face(ft_library, font->data, font->data_size, 0, &font->face); ++ error = FT_New_Memory_Face(ft_library, (const FT_Byte *)font->data, font->data_size, 0, &font->face); + + if (error) { + free(font->data); +@@ -609,7 +609,7 @@ void alfont_textout_aa_ex(BITMAP *bmp, A + char *lpszW; + char *lpszW_tmp; + int x_tmp; +- int max_advancex; ++ int max_advancex=0; + char *lpszW_pointer=NULL; //used for freeing string + char *s_pointer=NULL; //used for original string fixed by autofix + char *s_pointer_temp=NULL; //temporary used for autofix string +@@ -618,11 +618,10 @@ void alfont_textout_aa_ex(BITMAP *bmp, A + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. + int character; + int alpha_table[256]; +- int last_glyph_index; + int first_x=0, final_x=0, final_y=0; +- int curr_uformat; ++ int curr_uformat=0; + int first_flag=TRUE; //First Char flag +- BITMAP *masked_bmp; //the masked bmp used by Font hollow ++ BITMAP *masked_bmp=NULL; //the masked bmp used by Font hollow + + #ifdef ALFONT_DOS + iconv_t c_pt; +@@ -889,7 +888,6 @@ void alfont_textout_aa_ex(BITMAP *bmp, A + + /* draw char by char (using allegro unicode funcs) */ + acquire_bitmap(bmp); +- last_glyph_index = 0; + + if (f->fixed_width == TRUE) + { +@@ -978,7 +976,6 @@ void alfont_textout_aa_ex(BITMAP *bmp, A + real_x += v.x >> 6; + real_y += v.y >> 6; + }*/ +- last_glyph_index = glyph_index; + + /* draw only if exists */ + if ((cglyph.aa_available) && (cglyph.aabmp)) { +@@ -1774,18 +1771,18 @@ void alfont_textout_ex(BITMAP *bmp, ALFO + char *lpszW; + char *lpszW_tmp; + int x_tmp; +- int max_advancex; ++ int max_advancex=0; + char *lpszW_pointer=NULL; //used for freeing string + char *s_pointer=NULL; //used for original string fixed by autofix + char *s_pointer_temp=NULL; //temporary used for autofix string + char *precedingchar_pointer=NULL; //used for precedingchar character + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. +- int character, last_glyph_index; ++ int character; + int first_x=0, final_x=0, final_y=0; +- int curr_uformat; ++ int curr_uformat=0; + int first_flag=TRUE; //First Char flag +- BITMAP *masked_bmp; //the masked bmp used by Font hollow ++ BITMAP *masked_bmp=NULL; //the masked bmp used by Font hollow + #ifdef ALFONT_DOS + iconv_t c_pt; + size_t fromlen, tolen; +@@ -2026,8 +2023,6 @@ void alfont_textout_ex(BITMAP *bmp, ALFO + + /* draw char by char (using allegro unicode funcs) */ + acquire_bitmap(bmp); +- last_glyph_index = 0; +- + + if (f->fixed_width == TRUE) + { +@@ -2115,7 +2110,6 @@ void alfont_textout_ex(BITMAP *bmp, ALFO + real_x += v.x >> 6; + real_y += v.y >> 6; + }*/ +- last_glyph_index = glyph_index; + + /* draw only if exists */ + if ((cglyph.mono_available) && (cglyph.bmp)) { +@@ -2628,14 +2622,14 @@ int alfont_text_height(ALFONT_FONT *f) { + int alfont_text_length(ALFONT_FONT *f, const char *str) { + char *lpszW; + char *lpszW_tmp; +- int max_advancex; ++ int max_advancex=0; + char *lpszW_pointer=NULL; //used for freeing string + char *str_pointer=NULL; //used for original string fixed by autofix + char *str_pointer_temp=NULL; //temporary used for autofix string + char *precedingchar_pointer=NULL; //used for precedingchar character + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. +- int curr_uformat; ++ int curr_uformat=0; + int total_length = 0, character, last_glyph_index; + int glyph_index; + int glyph_index_tmp; +@@ -2953,7 +2947,7 @@ int alfont_text_length(ALFONT_FONT *f, c + } + + int alfont_char_length(ALFONT_FONT *f, int character) { +- int curr_uformat; ++ int curr_uformat=0; + int total_length = 0, last_glyph_index; + int glyph_index; + +@@ -3034,7 +3028,7 @@ int alfont_text_count(ALFONT_FONT *f, co + char *precedingchar_pointer=NULL; //used for precedingchar character + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. +- int curr_uformat; ++ int curr_uformat=0; + int string_count=0; + #ifdef ALFONT_DOS + iconv_t c_pt; +@@ -3282,14 +3276,13 @@ int alfont_text_count(ALFONT_FONT *f, co + + int alfont_ugetc(ALFONT_FONT *f, const char *s) { + char *lpszW; +- char *lpszW_pointer=NULL; //used for freeing string + char *s_pointer=NULL; //used for original string fixed by autofix + char *s_pointer_temp=NULL; //temporary used for autofix string + char *precedingchar_pointer=NULL; //used for precedingchar character + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. + int character; +- int curr_uformat; ++ int curr_uformat=0; + #ifdef ALFONT_DOS + iconv_t c_pt; + size_t fromlen, tolen; +@@ -3526,20 +3519,16 @@ int alfont_ugetc(ALFONT_FONT *f, const c + + int alfont_ugetx(ALFONT_FONT *f, char **s) { + char *lpszW; +- char *lpszW_pointer=NULL; //used for freeing string + char *s_pointer=NULL; //used for original string fixed by autofix + char *s_pointer_temp=NULL; //temporary used for autofix string + char *precedingchar_pointer=NULL; //used for precedingchar character + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. + int character; +- int curr_uformat; ++ int curr_uformat=0; + +- char *lpszWS; ++ const char *lpszWS; + char *lpszWA; +- int sLen; //length before advances the *s pointer to the next character +- int aLen; //length after advances the *s pointer to the next character +- int lIndex; + + #ifdef ALFONT_DOS + iconv_t c_pt; +@@ -3551,8 +3540,6 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + return 0; + } + +- sLen = strlen(*s); +- + nLen = strlen(*s) + 1; + s_pointer = (char *)malloc(nLen*sizeof(char)); + memset(s_pointer, 0, nLen); +@@ -3761,9 +3748,9 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + //advances the *s pointer to the next character + + if (f->type==1) { +- ugetxc((char**)s); ++ ugetxc((const char**)s); + #ifdef ALFONT_LINUX +- ugetxc((char**)s); ++ ugetxc((const char**)s); + #endif + } + else if(f->type==2) { +@@ -3772,10 +3759,7 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + ugetxc(&lpszWS); + #endif + #ifdef ALFONT_DOS +- if ((c_pt = iconv_open(f->language, "UTF-16LE")) == (iconv_t)-1) { +- aLen = strlen(lpszWS); +- } +- else { ++ if ((c_pt = iconv_open(f->language, "UTF-16LE")) != (iconv_t)-1) { + iconv(c_pt, NULL, NULL, NULL, NULL); + fromlen = strlen(lpszWS) + 1; + tolen = MB_CUR_MAX * fromlen * (sizeof(wchar_t) + 1); +@@ -3790,7 +3774,6 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + free(lpszWA); + lpszWA = lpszWS + } +- aLen = strlen(lpszWA); + } + #else + setlocale(LC_CTYPE,f->language); +@@ -3798,14 +3781,8 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + lpszWA = (char *)malloc(nLen*sizeof(char)); + memset(lpszWA, 0, nLen); + wcstombs(lpszWA, (const wchar_t *)lpszWS, nLen); +- aLen = strlen(lpszWA); + #endif + +- for (lIndex = 0; lIndex < sLen - aLen; lIndex++) +- { +- (*(*s)++); +- } +- + if (lpszWA) { + free(lpszWA); + } +@@ -3814,9 +3791,9 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + #ifdef ALFONT_LINUX + set_uformat(U_UTF8); + #endif +- ugetxc((char**)s); ++ ugetxc((const char**)s); + #ifdef ALFONT_LINUX +- ugetxc((char**)s); ++ ugetxc((const char**)s); + #endif + } + +@@ -3842,20 +3819,16 @@ int alfont_ugetx(ALFONT_FONT *f, char ** + + int alfont_ugetxc(ALFONT_FONT *f, const char **s) { + char *lpszW; +- char *lpszW_pointer=NULL; //used for freeing string + char *s_pointer=NULL; //used for original string fixed by autofix + char *s_pointer_temp=NULL; //temporary used for autofix string + char *precedingchar_pointer=NULL; //used for precedingchar character + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. + int character; +- int curr_uformat; ++ int curr_uformat=0; + +- char *lpszWS; ++ const char *lpszWS; + char *lpszWA; +- int sLen; //length before advances the *s pointer to the next character +- int aLen; //length after advances the *s pointer to the next character +- int lIndex; + + #ifdef ALFONT_DOS + iconv_t c_pt; +@@ -3867,8 +3840,6 @@ int alfont_ugetxc(ALFONT_FONT *f, const + return 0; + } + +- sLen = strlen(*s); +- + nLen = strlen(*s) + 1; + s_pointer = (char *)malloc(nLen*sizeof(char)); + memset(s_pointer, 0, nLen); +@@ -4088,10 +4059,7 @@ int alfont_ugetxc(ALFONT_FONT *f, const + ugetxc(&lpszWS); + #endif + #ifdef ALFONT_DOS +- if ((c_pt = iconv_open(f->language, "UTF-16LE")) == (iconv_t)-1) { +- aLen = strlen(lpszWS); +- } +- else { ++ if ((c_pt = iconv_open(f->language, "UTF-16LE")) != (iconv_t)-1) { + iconv(c_pt, NULL, NULL, NULL, NULL); + fromlen = strlen(lpszWS) + 1; + tolen = MB_CUR_MAX * fromlen * (sizeof(wchar_t) + 1); +@@ -4106,7 +4074,6 @@ int alfont_ugetxc(ALFONT_FONT *f, const + free(lpszWA); + lpszWA = lpszWS + } +- aLen = strlen(lpszWA); + } + #else + setlocale(LC_CTYPE,f->language); +@@ -4114,14 +4081,8 @@ int alfont_ugetxc(ALFONT_FONT *f, const + lpszWA = (char *)malloc(nLen*sizeof(char)); + memset(lpszWA, 0, nLen); + wcstombs(lpszWA, (const wchar_t *)lpszWS, nLen); +- aLen = strlen(lpszWA); + #endif + +- for (lIndex = 0; lIndex < sLen - aLen; lIndex++) +- { +- (*(*s)++); +- } +- + if (lpszWA) { + free(lpszWA); + } +@@ -4164,7 +4125,7 @@ int alfont_need_uconvert(ALFONT_FONT *f, + int need_unicode_convert=TRUE; + int nLen; + int ret; //decide that if the ASCII Code convert to Unicode Code is all OK when used for autofix string or used for general convert. +- int curr_uformat; ++ int curr_uformat=0; + #ifdef ALFONT_DOS + iconv_t c_pt; + size_t fromlen, tolen; diff --git a/alfont.rpmlintrc b/alfont.rpmlintrc new file mode 100644 index 0000000..fc50c84 --- /dev/null +++ b/alfont.rpmlintrc @@ -0,0 +1,4 @@ +# -devel has no docs +addFilter("no-documentation") +# Source0 is not an URL +addFilter("invalid-url") diff --git a/alfont.spec b/alfont.spec index 711e171..b65ceab 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -8,6 +8,7 @@ URL: http://chernsha.sitesled.com/ Source0: %{name}-%{version}.tar.gz Patch0: alfont-2.0.9-linux.patch Patch1: alfont-2.0.9-remove-alfont_get_string.patch +Patch2: alfont-2.0.9-build-fixes.patch BuildRequires: gcc BuildRequires: allegro-devel freetype-devel @@ -28,11 +29,11 @@ developing applications that use %{name}. %prep -%setup -q -%patch -P0 -p1 -z .linux -%patch -P1 -p1 +%autosetup -p1 for i in include/alfont*.h freetype/docs/FTL.TXT; do sed -i.orig s'/\r//g' $i + iconv -f ISO-8859-1 -t UTF-8 $i > $i.utf8 + mv $i.utf8 $i touch -r $i.orig $i done @@ -44,6 +45,7 @@ done gcc -fPIC -DPIC $RPM_OPT_FLAGS -Iinclude `freetype-config --cflags` \ -o src/alfont.o -c src/alfont.c gcc -shared -Wl,-soname,lib%{name}.so.2 -o lib%{name}.so.%{version} \ + $RPM_OPT_FLAGS $RPM_LD_FLAGS \ src/alfont.o $(freetype-config --libs) $(allegro-config --libs) @@ -60,7 +62,8 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %files -%doc CHANGES.txt README.txt freetype/docs/FTL.TXT +%doc CHANGES.txt README.txt +%license freetype/docs/FTL.TXT %{_libdir}/lib%{name}.so.* %files devel @@ -69,6 +72,10 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Sat Jun 15 2024 Hans de Goede - 2.0.9-28 +- Fix FTBFS (rhbz#2260975) +- Use distro LD_FLAGS when linking + * Mon Jan 22 2024 Fedora Release Engineering - 2.0.9-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 624d7c0ee58a85cd1aab6ac1daf84f8c8be90383 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:49:40 +0000 Subject: [PATCH 43/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index b65ceab..47160dc 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -72,6 +72,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.9-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 15 2024 Hans de Goede - 2.0.9-28 - Fix FTBFS (rhbz#2260975) - Use distro LD_FLAGS when linking From de67b6abbb54b96176f31da209536a8ae439149b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:50:39 +0000 Subject: [PATCH 44/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 47160dc..116ce7f 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -72,6 +72,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.9-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 2.0.9-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4354eb2ed9be9a79c06078e618a672d677258b84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:53:15 +0000 Subject: [PATCH 45/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 116ce7f..0a34e5b 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -72,6 +72,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.9-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.0.9-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dd8f4d7bb145d36893cd99571f6e9c01f74ddda9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:34:47 +0000 Subject: [PATCH 46/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- alfont.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alfont.spec b/alfont.spec index 0a34e5b..6256dca 100644 --- a/alfont.spec +++ b/alfont.spec @@ -1,6 +1,6 @@ Name: alfont Version: 2.0.9 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Font rendering library for the Allegro game library License: FTL URL: http://chernsha.sitesled.com/ @@ -72,6 +72,9 @@ install -m 644 include/%{name}*.h $RPM_BUILD_ROOT%{_includedir} %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.9-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.0.9-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild