Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
57f97fd6
Commit
57f97fd6
authored
May 17, 2012
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tools: Remove the fnt2bdf tool, we no longer use X11 fonts.
parent
ab816a3a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
140 deletions
+0
-140
.gitignore
.gitignore
+0
-1
Makefile.in
tools/Makefile.in
+0
-5
fnt2bdf.c
tools/fnt2bdf.c
+0
-0
font_convert.sh
tools/font_convert.sh
+0
-134
No files found.
.gitignore
View file @
57f97fd6
...
...
@@ -280,7 +280,6 @@ programs/wscript/ihost.tlb
rsrc.pot
server/wineserver
server/wineserver-installed
tools/fnt2bdf
tools/fnt2fon
tools/make_ctests
tools/make_xftmpl
...
...
tools/Makefile.in
View file @
57f97fd6
...
...
@@ -3,7 +3,6 @@ EXTRAINCL = @FREETYPEINCL@
FREETYPELIBS
=
@FREETYPELIBS@
PROGRAMS
=
\
fnt2bdf
$(EXEEXT)
\
fnt2fon
$(EXEEXT)
\
make_ctests
$(EXEEXT)
\
make_xftmpl
$(EXEEXT)
\
...
...
@@ -19,7 +18,6 @@ EXTRA_MANPAGES = \
winemaker.fr.man
C_SRCS
=
\
fnt2bdf.c
\
fnt2fon.c
\
make_ctests.c
\
make_xftmpl.c
\
...
...
@@ -52,9 +50,6 @@ make_ctests$(EXEEXT): make_ctests.o
make_xftmpl$(EXEEXT)
:
make_xftmpl.o
$(CC)
$(CFLAGS)
-o
$@
make_xftmpl.o
$(LIBPORT)
$(LDFLAGS)
fnt2bdf$(EXEEXT)
:
fnt2bdf.o
$(CC)
$(CFLAGS)
-o
$@
fnt2bdf.o
$(LIBPORT)
$(LDFLAGS)
fnt2fon$(EXEEXT)
:
fnt2fon.o
$(CC)
$(CFLAGS)
-o
$@
fnt2fon.o
$(LIBPORT)
$(LDFLAGS)
...
...
tools/fnt2bdf.c
deleted
100644 → 0
View file @
ab816a3a
This diff is collapsed.
Click to expand it.
tools/font_convert.sh
deleted
100755 → 0
View file @
ab816a3a
#! /bin/bash
#
# Copyright 2000 Peter Ganten
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#
# default settings
TMPDIR
=
/tmp/fconv.
$$
;
if
[
-f
`
which
mktemp
`
]
;
then
TFILE
=
`
mktemp
-q
/tmp/fconv.XXXXXX
`
else
TFILE
=
`
tempfile
`
;
fi
# Where the fnt2bdf utility resides
FC
=
`
which fnt2bdf
`
;
if
[
-z
"
$FC
"
]
;
then
FC
=
$HOME
""
/wine/tools/fnt2bdf
;
fi
;
# which OEM_CHARSET to use
CHARSET
=
"winsys"
;
TARGET
=
/usr/X11R6/lib/X11/fonts/misc
;
BDFTOPCF
=
/usr/X11R6/bin/bdftopcf
;
PAT
=
"*.fon"
;
Q
=
""
;
OLDPWD
=
`
pwd
`
;
usage
()
{
echo
"usage: "
`
basename
$0
`
" [-q] [-c charset] [-t fontdir] [-b bdftopcf] [-f fnt2bdf]"
echo
" [-p pattern] windir"
echo
echo
"this utility scans a directory and its subdirectories for bitmap-fonts"
echo
"in Windows format, converts them to PCF-fons and installs them. If X"
echo
"is running, the X fontpath is re-adjusted."
echo
echo
"options:"
echo
" -q quit operation."
echo
" -c charset charset name for OEM_CHARSET fonts, default:
$CHARSET
"
echo
" -t fontdir directory to install the converted fonts in. This"
echo
" directory should be a known fontdirectory to X, default:"
echo
"
$TARGET
"
;
echo
" -b bdftopcf name of the program to call for bdf to pcf conversion,"
echo
" default:
$BDFTOPCF
"
;
echo
" -f fnt2bdf name of the program to call for winfont to bdf conversion,"
echo
" default:
$FC
"
echo
" -p pattern Shell-Pattern of the filenames to look for. By default, the"
echo
" utility will look for the pattern "
$PAT
" (case insensitive)."
echo
" windir base directory to search."
exit
1
;
}
while
[
"
$1
"
]
;
do
case
$1
in
-c
)
shift
;
if
[
"
$1
"
]
;
then
CHARSET
=
$1
;
shift
;
else
usage
;
fi
;
;;
-t
)
shift
;
if
[
"
$1
"
]
;
then
TARGET
=
$1
;
shift
;
else
usage
;
fi
;
;;
-b
)
shift
;
if
[
"
$1
"
]
;
then
BDFTOPCF
=
$1
;
shift
;
else
usage
;
fi
;
;;
-f
)
shift
;
if
[
"
$1
"
]
;
then
FC
=
$1
;
shift
;
else
usage
;
fi
;
;;
-p
)
shift
;
if
[
"
$1
"
]
;
then
PAT
=
$1
;
shift
;
else
usage
;
fi
;
;;
-q
)
shift
;
Q
=
":"
;
;;
-
*
)
usage
;
;;
*
)
if
[
"
$WIND
"
]
;
then
usage
;
else
WIND
=
$1
;
shift
;
fi
;
;;
esac
;
done
;
if
[
!
"
$WIND
"
]
;
then
usage
;
fi
;
if
[
!
-d
"
$WIND
"
]
;
then
$Q
echo
"
$WIND
is not a directory"
;
exit
1
;
fi
;
if
[
!
-d
"
$TARGET
"
]
;
then
$Q
echo
"
$TARGET
is not a directory"
;
exit
1
;
fi
;
type
-p
$BDFTOPCF
1>/dev/null
||
{
$Q
echo
"Can 't execute
$BDFTOPCF
"
;
exit
1
;
}
type
-p
$FC
1>/dev/null
||
{
$Q
echo
"Can't execute
$FC
"
;
exit
1
;
}
$Q
echo
-n
"looking for bitmap fonts (
\"
$PAT
\"
) in directory
\"
$WIND
\"
... "
;
FONTS
=
`
find
$WIND
-iname
"
$PAT
"
1>
$TFILE
2>/dev/null
`
;
if
[
$?
-ne
0
]
;
then
$Q
echo
"
$PAT
is an invalid search expression"
;
exit
1
;
fi
;
i
=
0
;
{
while
read
dummy
;
do
FONTS[
$i
]=
"
$dummy
"
;
i
=
$[$i
+1]
;
done
;
}
<
$TFILE
rm
$TFILE
;
$Q
echo
"done."
if
[
-z
"
$FONTS
"
]
;
then
$Q
echo
"Can't find any fonts in
$WIND
"
;
exit
1
;
fi
;
mkdir
"
$TMPDIR
"
for
i
in
"
${
FONTS
[@]
}
"
;
do
cp
$i
$TMPDIR
;
done
cd
"
$TMPDIR
"
for
i
in
"
${
FONTS
[@]
}
"
;
do
FNT
=
`
basename
"
$i
"
`
;
FNT
=
${
FNT
%.???
}
;
$Q
echo
"converting
$i
"
;
if
[
"
$Q
"
]
;
then
$FC
-c
$CHARSET
-f
$FNT
"
$i
"
2>/dev/null
;
else
$FC
-c
$CHARSET
-f
$FNT
"
$i
"
;
fi
;
done
;
for
i
in
*
.bdf
;
do
if
[
"
$i
"
=
"*.bdf"
]
;
then
echo
"No fonts extracted"
;
rm
-rf
"
$TMPDIR
"
;
exit
0
;
fi
;
bdftopcf
"
$i
"
|
gzip
-c
>
${
i
%.???
}
.pcf.gz
;
$Q
echo
"installing
${
i
%.???
}
.pcfi.gz"
;
mv
"
${
i
%.???
}
.pcf.gz"
$TARGET
2>/dev/null
if
[
$?
-ne
0
]
;
then
$Q
echo
"Can't install fonts to
$TARGET
. Try again as the root user."
;
$Q
echo
"Cleaning up..."
;
cd
"
$OLDPWD
"
;
rm
-rf
"
$TMPDIR
"
;
exit
1
;
fi
;
rm
"
$i
"
;
done
;
cd
$TARGET
;
$Q
echo
"running mkfontdir"
;
if
[
"
$Q
"
]
;
then
mkfontdir 1>/dev/null 2>/dev/null
;
else
mkfontdir
fi
;
rm
-rf
"
$TMPDIR
"
if
[
"
$DISPLAY
"
]
;
then
$Q
echo
"adjusting X font database"
;
xset fp rehash
;
fi
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment