From 085f95d1c82b8b94ea5522fce088c963a2545e3d Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Wed, 3 Nov 2021 12:51:15 +0300
Subject: [PATCH] media-gfx/gfxboot: fix bigsize

---
 .../gfxboot/files/gfxboot-fix_bigsize.patch   | 13 +++++++
 .../gfxboot/files/gfxboot-fix_freetype.patch  | 13 -------
 ....4.3-r1.ebuild => gfxboot-4.4.3-r2.ebuild} |  1 +
 media-gfx/gfxboot/gfxboot-4.4.3.ebuild        | 34 -------------------
 4 files changed, 14 insertions(+), 47 deletions(-)
 create mode 100644 media-gfx/gfxboot/files/gfxboot-fix_bigsize.patch
 delete mode 100644 media-gfx/gfxboot/files/gfxboot-fix_freetype.patch
 rename media-gfx/gfxboot/{gfxboot-4.4.3-r1.ebuild => gfxboot-4.4.3-r2.ebuild} (94%)
 delete mode 100644 media-gfx/gfxboot/gfxboot-4.4.3.ebuild

diff --git a/media-gfx/gfxboot/files/gfxboot-fix_bigsize.patch b/media-gfx/gfxboot/files/gfxboot-fix_bigsize.patch
new file mode 100644
index 000000000..2c5067e51
--- /dev/null
+++ b/media-gfx/gfxboot/files/gfxboot-fix_bigsize.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 97b60d7..5f50ff7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ vocabulary.h: mk_vocabulary
+ 	./mk_vocabulary -c >$@
+ 
+ jpeg.o: jpeg.S
+-	as --32 -ahlsn=jpeg.lst -o $@ $<
++	as --32 -mx86-used-note=no -ahlsn=jpeg.lst -o $@ $<
+ 
+ install: all
+ 	install -d -m 755 $(DESTDIR)/usr/sbin
diff --git a/media-gfx/gfxboot/files/gfxboot-fix_freetype.patch b/media-gfx/gfxboot/files/gfxboot-fix_freetype.patch
deleted file mode 100644
index 9709d7107..000000000
--- a/media-gfx/gfxboot/files/gfxboot-fix_freetype.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git gfxboot-font.c gfxboot-font.c
-index c0b03c0..f879c10 100644
---- gfxboot-font.c
-+++ gfxboot-font.c
-@@ -13,7 +13,7 @@
- 
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/ftsynth.h>
-+#include <freetype2/ftsynth.h>
- 
- 
- #define MAGIC 0xd2828e06
diff --git a/media-gfx/gfxboot/gfxboot-4.4.3-r1.ebuild b/media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild
similarity index 94%
rename from media-gfx/gfxboot/gfxboot-4.4.3-r1.ebuild
rename to media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild
index e37ed9261..b0fcf0033 100644
--- a/media-gfx/gfxboot/gfxboot-4.4.3-r1.ebuild
+++ b/media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild
@@ -26,6 +26,7 @@ RESTRICT="mirror"
 
 PATCHES=(
 	"${FILESDIR}/gfxboot-fix_warning.patch"
+	"${FILESDIR}/gfxboot-fix_bigsize.patch"
 )
 
 src_install() {
diff --git a/media-gfx/gfxboot/gfxboot-4.4.3.ebuild b/media-gfx/gfxboot/gfxboot-4.4.3.ebuild
deleted file mode 100644
index 652418c71..000000000
--- a/media-gfx/gfxboot/gfxboot-4.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
-
-EAPI=5
-
-DESCRIPTION="tool to test and create graphical boot logos"
-HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/gfxboot/${PV}-1/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~x86 ~amd64"
-
-IUSE=""
-
-DEPEND="app-arch/cpio
-	dev-lang/nasm
-	>=media-libs/freetype-2
-	app-text/xmlto
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.1.2
-	dev-perl/HTML-Parser"
-RDEPEND="${DEPEND}"
-RESTRICT="mirror"
-
-PATCHES=(
-	"${FILESDIR}/gfxboot-fix_warning.patch"
-	"${FILESDIR}/gfxboot-fix_freetype.patch"
-)
-
-src_install() {
-	emake DESTDIR="${D}" THEMES="" install || die
-}