diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-06-17 18:13:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-18 00:25:10 +0200 |
| commit | 3e01616a61844192fb3944982ebe298aaa1f1052 (patch) | |
| tree | 38caa0022918a4338bdda453f98fccabcbe2db46 /patches/cmatrix-1.2a | |
| parent | 544b49aaf590a7f0d923f099fff2f3a77f1b8976 (diff) | |
| download | ptxdist-3e01616a61844192fb3944982ebe298aaa1f1052.tar.gz ptxdist-3e01616a61844192fb3944982ebe298aaa1f1052.tar.xz | |
cmatrix: add new package
This is a must have tool for linux hackers. This tool isn't
cross-compile friendly. The added patch removes the static filename
check for consolefonts path. This is removed and should handeld by a
select on KBD_CONSOLEFONTS.
Another issue is that "make install-data-local" should install fonts
into consolefonts directory. This is also a static path without a
${prefix} variable. This is solved by install the necessary fonts
manually in targetinstall. Currently there is no X11 font support.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
[mol: regenerate patches with git-ptx-patches]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/cmatrix-1.2a')
| -rw-r--r-- | patches/cmatrix-1.2a/0001-cmatrix-add-DESTDIR-and-drop-X11-fonts.patch | 53 | ||||
| l--------- | patches/cmatrix-1.2a/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/cmatrix-1.2a/series | 4 |
3 files changed, 58 insertions, 0 deletions
diff --git a/patches/cmatrix-1.2a/0001-cmatrix-add-DESTDIR-and-drop-X11-fonts.patch b/patches/cmatrix-1.2a/0001-cmatrix-add-DESTDIR-and-drop-X11-fonts.patch new file mode 100644 index 000000000..913a445f5 --- /dev/null +++ b/patches/cmatrix-1.2a/0001-cmatrix-add-DESTDIR-and-drop-X11-fonts.patch @@ -0,0 +1,53 @@ +From: Alexander Aring <alex.aring@gmail.com> +Date: Mon, 16 Jun 2014 21:34:27 +0200 +Subject: [PATCH] cmatrix: add DESTDIR and drop X11 fonts + +This patch adds $(DESTDIR) for testing if path exists and installpaths. +Also remove of X11 fonts install. + +Signed-off-by: Alexander Aring <alex.aring@gmail.com> +--- + Makefile.am | 33 ++++----------------------------- + 1 file changed, 4 insertions(+), 29 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0baa7949a551..051f18bf1f8e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,32 +8,7 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README \ + matrix.psf.gz mtx.pcf cmatrix.1 cmatrix.spec + + install-data-local: +- @if test -d /usr/share/consolefonts; then \ +- echo " Installing matrix fonts in /usr/share/consolefonts..."; \ +- $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \ +- $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \ +- fi +- @if test -d /usr/lib/kbd/consolefonts; then \ +- echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \ +- $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \ +- $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \ +- fi +- @if test -d /usr/lib/X11/fonts/misc; then \ +- echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \ +- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \ +- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \ +- echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \ +- $(MKFONTDIR) /usr/lib/X11/fonts/misc; \ +- echo " Done. If this is the first time you have installed CMatrix you will"; \ +- echo " probably have to restart X window in order to use the mtx.pcf font."; \ +- else \ +- if test -d /usr/X11R6/lib/X11/fonts/misc; then \ +- echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \ +- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \ +- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \ +- echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \ +- $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \ +- echo " Done. If this is the first time you have installed CMatrix you will"; \ +- echo " probably have to restart X window in order to use the mtx.pcf font."; \ +- fi \ +- fi ++ mkdir $(DESTDIR)/usr/share/consolefonts ++ echo " Installing matrix fonts in $(DESTDIR)/usr/share/consolefonts..."; \ ++ $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \ ++ $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/share/consolefonts diff --git a/patches/cmatrix-1.2a/autogen.sh b/patches/cmatrix-1.2a/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/cmatrix-1.2a/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/cmatrix-1.2a/series b/patches/cmatrix-1.2a/series new file mode 100644 index 000000000..c0ba19b75 --- /dev/null +++ b/patches/cmatrix-1.2a/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-cmatrix-add-DESTDIR-and-drop-X11-fonts.patch +# 5a3011f61b85fca723ea2c8dc2fff8a4 - git-ptx-patches magic |