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 /app-i18n/fbiterm/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 'app-i18n/fbiterm/files')
-rw-r--r--app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch13
-rw-r--r--app-i18n/fbiterm/files/fbiterm-0.5-r2-gentoo.diff28
2 files changed, 41 insertions, 0 deletions
diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch b/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch
new file mode 100644
index 000000000000..ae738c814202
--- /dev/null
+++ b/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/fbiterm/src/Makefile.am b/unix/fbiterm/src/Makefile.am
+index 4ffe3da..53f12f4 100644
+--- a/unix/fbiterm/src/Makefile.am
++++ b/unix/fbiterm/src/Makefile.am
+@@ -17,7 +17,7 @@ fbiterm_SOURCES = \
+ fbiterm_LDADD = \
+ -L$(libdir) @X_LIBS@ -lm -lXfont -literm -lfreetype
+
+-CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
++CFLAGS += -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
+
+ install-exec-hook:
+ chmod u+s $(DESTDIR)$(bindir)/fbiterm
diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-r2-gentoo.diff b/app-i18n/fbiterm/files/fbiterm-0.5-r2-gentoo.diff
new file mode 100644
index 000000000000..7a63ebce786b
--- /dev/null
+++ b/app-i18n/fbiterm/files/fbiterm-0.5-r2-gentoo.diff
@@ -0,0 +1,28 @@
+diff -Naur fbiterm.orig/src/Makefile.am fbiterm/src/Makefile.am
+--- fbiterm.orig/src/Makefile.am 2002-12-17 16:39:43.000000000 +0900
++++ fbiterm/src/Makefile.am 2008-11-25 01:35:18.000000000 +0900
+@@ -15,7 +15,7 @@
+ vt.c VTScreenView.c fbiterm.h palette.h VTScreenView.h
+
+ fbiterm_LDADD = \
+- -L$(libdir) @X_LIBS@ -lXfont -literm
++ -L$(libdir) @X_LIBS@ -lm -lXfont -literm -lfreetype
+
+ CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS)
+
+diff -Naur fbiterm.orig/src/fbiterm.h fbiterm/src/fbiterm.h
+--- fbiterm.orig/src/fbiterm.h 2002-10-24 21:44:01.000000000 +0900
++++ fbiterm/src/fbiterm.h 2008-11-25 01:34:12.000000000 +0900
+@@ -53,9 +53,9 @@
+ #define FB_ENV "FRAMEBUFFER"
+ #define FB_DEFDEV "/dev/fb0"
+
+-#define DefaultAsc "/usr/lib/X11/fonts/misc/8x16.pcf.gz"
+-#define DefaultMB "/usr/lib/X11/fonts/misc/unifont.pcf.gz"
+-#define DefaultFont "/usr/local/share/iterm/fonts/8x16.pcf.gz"
++#define DefaultAsc "/usr/share/fonts/misc/8x16.pcf.gz"
++#define DefaultMB "/usr/share/fonts/misc/unifont.pcf.gz"
++#define DefaultFont "/usr/share/iterm/fonts/8x16.pcf.gz"
+
+ enum ITERM_RETCODE
+ {