summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-fonts/unifont/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-fonts/unifont/files')
-rw-r--r--media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch63
-rw-r--r--media-fonts/unifont/files/unifont-6.3.20140204-make.patch71
-rw-r--r--media-fonts/unifont/files/unifont-7.0.01-font-Makefile.patch10
3 files changed, 144 insertions, 0 deletions
diff --git a/media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch b/media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch
new file mode 100644
index 000000000000..80c90e0a65a4
--- /dev/null
+++ b/media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch
@@ -0,0 +1,63 @@
+diff -Naur unifont-5.1.20080914.orig/font/Makefile unifont-5.1.20080914/font/Makefile
+--- unifont-5.1.20080914.orig/font/Makefile 2008-09-08 11:22:52.000000000 +0900
++++ unifont-5.1.20080914/font/Makefile 2008-12-31 23:29:52.000000000 +0900
+@@ -29,8 +29,8 @@
+ #
+ PKGDEST = $(DESTDIR)/usr/share/unifont
+ FONTDEST = $(DESTDIR)/usr/share/fonts
+-PCFDEST = $(FONTDEST)/X11/misc
+-TTFDEST = $(FONTDEST)/truetype/unifont
++PCFDEST = $(FONTDEST)/unifont
++TTFDEST = $(FONTDEST)/unifont
+ #
+ # destination directory for compiled fonts
+ #
+diff -Naur unifont-5.1.20080914.orig/hoge.y unifont-5.1.20080914/hoge.y
+--- unifont-5.1.20080914.orig/hoge.y 1970-01-01 09:00:00.000000000 +0900
++++ unifont-5.1.20080914/hoge.y 2008-12-31 23:55:28.000000000 +0900
+@@ -0,0 +1,15 @@
++STARTFONT 2.1
++FONT -gnu-unifont-medium-r-normal--16-160-75-75-c-80-iso10646-1
++SIZE 16 75 75
++FONTBOUNDINGBOX 16 16 0 -2
++STARTPROPERTIES 7
++PIXEL_SIZE 16
++POINT_SIZE 160
++FONT_ASCENT 14
++FONT_DESCENT 2
++CHARSET_REGISTRY "iso10646"
++CHARSET_ENCODING "1"
++DEFAULT_CHAR 32
++ENDPROPERTIES
++CHARS 0
++ENDFONT
+diff -Naur unifont-5.1.20080914.orig/src/Makefile unifont-5.1.20080914/src/Makefile
+--- unifont-5.1.20080914.orig/src/Makefile 2008-09-08 04:01:56.000000000 +0900
++++ unifont-5.1.20080914/src/Makefile 2009-01-01 00:05:08.000000000 +0900
+@@ -1,5 +1,5 @@
+
+-CFLAGS = -g -O2 -Wall
++CFLAGS += -g -Wall
+
+ INSTALLBINDIR = ../bin
+
+@@ -26,8 +26,8 @@
+
+ all: $(CPROGS)
+ install -m0755 -d $(INSTALLBINDIR)
+- install -s -m0755 $(CPROGS) $(INSTALLBINDIR)
+- install -m0755 $(PPROGS) $(INSTALLBINDIR)
++ install -m0755 $(CPROGS) $(INSTALLBINDIR)
++ install -m0755 $(PPROGS) $(INSTALLBINDIR)
+ rm -f $(CPROGS)
+
+ install:
+@@ -40,7 +40,7 @@
+ install -m0755 -d $(INSTALLDIR)
+ set -e ; \
+ cd $(INSTALLBINDIR) ; \
+- install -s -m0755 $(CPROGS) $(INSTALLDIR)
++ install -m0755 $(CPROGS) $(INSTALLDIR)
+ set -e ; \
+ cd ../bin ; \
+ install -m0755 $(PPROGS) $(INSTALLDIR)
diff --git a/media-fonts/unifont/files/unifont-6.3.20140204-make.patch b/media-fonts/unifont/files/unifont-6.3.20140204-make.patch
new file mode 100644
index 000000000000..b95fc0baca0a
--- /dev/null
+++ b/media-fonts/unifont/files/unifont-6.3.20140204-make.patch
@@ -0,0 +1,71 @@
+diff --git a/font/Makefile b/font/Makefile
+index e57a57d..04ed214 100644
+--- a/font/Makefile
++++ b/font/Makefile
+@@ -116,7 +116,7 @@ TTFSRC = ttfsrc
+ all: compiled
+
+ compiled: $(UNIFILES) $(COMBINING) $(UPPER_FILES) $(UPPER_COMBINING)
+- make compiled-files
++ $(MAKE) compiled-files
+
+ compiled-files: pcf psf bmp ttf csurttf upperttf uppercsurttf bigpic coverage
+ install -p index.html $(COMPILED_DIR)/index.html
+@@ -277,7 +277,7 @@ ttf:
+ $(HEXDIR)/bmp-combining.txt \
+ $(TTFSRC)/combining.txt
+ cd $(TTFSRC) ; \
+- make FONTFILE="unifont" COMBINING="combining" \
++ $(MAKE) FONTFILE="unifont" COMBINING="combining" \
+ FONTNAME="Unifont" PSNAME="Unifont"
+ mv $(TTFSRC)/unifont.sfd $(COMPILED_DIR)/unifont-$(VERSION).sfd
+ mv $(TTFSRC)/unifont.ttf \
+@@ -287,7 +287,7 @@ ttf:
+ $(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
+ $(TTFSRC)/unifont_sample.bdf
+ cd $(TTFSRC) ; \
+- make sbit FONTFILE="unifont_sample" COMBINING="" \
++ $(MAKE) sbit FONTFILE="unifont_sample" COMBINING="" \
+ FONTNAME="Unifont Sample" PSNAME="UnifontSample"
+ mv $(TTFSRC)/unifont_sample.ttf \
+ $(COMPILED_DIR)/unifont_sample-$(VERSION).ttf
+@@ -303,7 +303,7 @@ csurttf:
+ sort -u plane00csur/csur-combining.txt $(HEXDIR)/bmp-combining.txt \
+ > $(TTFSRC)/combining_csur.txt
+ cd $(TTFSRC) ; \
+- make outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
++ $(MAKE) outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
+ FONTNAME="Unifont CSUR" PSNAME="UnifontCSUR"
+ mv $(TTFSRC)/unifont_csur.sfd \
+ $(COMPILED_DIR)/unifont_csur-$(VERSION).sfd
+@@ -320,7 +320,7 @@ upperttf:
+ $(TTFSRC)/unifont_upper.hex
+ sort -u $(UPPER_COMBINING) > $(TTFSRC)/combining_upper.txt
+ cd $(TTFSRC) ; \
+- make outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
++ $(MAKE) outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
+ FONTNAME="Unifont Upper" PSNAME="UnifontUpper"
+ mv $(TTFSRC)/unifont_upper.sfd \
+ $(COMPILED_DIR)/unifont_upper-$(VERSION).sfd
+@@ -339,7 +339,7 @@ uppercsurttf:
+ sort -u plane0[1-F]csur/*combining*.txt \
+ > $(TTFSRC)/combining_upper_csur.txt
+ cd $(TTFSRC) ; \
+- make outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
++ $(MAKE) outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
+ FONTNAME="Unifont Upper CSUR" PSNAME="UnifontUpperCSUR"
+ mv $(TTFSRC)/unifont_upper_csur.sfd \
+ $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).sfd
+diff --git a/Makefile b/Makefile
+index 3240c2b..f933067 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@ bindir:
+ buildfont:
+ if [ x$(BUILDFONT) != x ] ; \
+ then \
+- set -e ; make -C font ; \
++ set -e ; $(MAKE) -C font ; \
+ fi
+
+ #
diff --git a/media-fonts/unifont/files/unifont-7.0.01-font-Makefile.patch b/media-fonts/unifont/files/unifont-7.0.01-font-Makefile.patch
new file mode 100644
index 000000000000..f82a28b88690
--- /dev/null
+++ b/media-fonts/unifont/files/unifont-7.0.01-font-Makefile.patch
@@ -0,0 +1,10 @@
+--- a/font/Makefile
++++ b/font/Makefile
+@@ -309,7 +309,6 @@
+ $(BINDIR)/unihex2png -p 00$$i \
+ -i $(COMPILED_DIR)/unifont_csur_sample-$(VERSION).hex \
+ -o $(PNGDIR)/csur/uni00$$i.png ; \
+- done ; \
+ done
+ for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+ for j in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \