1
0
Fork 0
mirror of https://aur.archlinux.org/ocp.git synced 2024-10-18 11:32:58 +00:00
ocp/fix-unifont.diff
Mikael Eriksson d185f8fb95 v0.2.2-1
2020-08-24 04:04:15 +02:00

114 lines
5.2 KiB
Diff

Index: asdf/configure
===================================================================
--- asdf.orig/configure
+++ asdf/configure
@@ -9849,15 +9849,15 @@ fi
prefix=$prefix_save
exec_prefix=$exec_prefix_save
- as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont.ttf" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont.ttf" >&5
-$as_echo_n "checking for $UNIFONTDIR/unifont.ttf... " >&6; }
+ as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont.ttf" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont.ttf" >&5
+$as_echo_n "checking for $UNIFONTDIR/Unifont.ttf... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$UNIFONTDIR/unifont.ttf"; then
+if test -r "$UNIFONTDIR/Unifont.ttf"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -9869,18 +9869,18 @@ $as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
else
- as_fn_error $? "$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
+ as_fn_error $? "$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
fi
- as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont_csur.ttf" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont_csur.ttf" >&5
-$as_echo_n "checking for $UNIFONTDIR/unifont_csur.ttf... " >&6; }
+ as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont_CSUR.ttf" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont_CSUR.ttf" >&5
+$as_echo_n "checking for $UNIFONTDIR/Unifont_CSUR.ttf... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$UNIFONTDIR/unifont_csur.ttf"; then
+if test -r "$UNIFONTDIR/Unifont_CSUR.ttf"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -9892,18 +9892,18 @@ $as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
else
- as_fn_error $? "$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
+ as_fn_error $? "$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
fi
- as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont_upper.ttf" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont_upper.ttf" >&5
-$as_echo_n "checking for $UNIFONTDIR/unifont_upper.ttf... " >&6; }
+ as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont_Upper.ttf" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont_Upper.ttf" >&5
+$as_echo_n "checking for $UNIFONTDIR/Unifont_Upper.ttf... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$UNIFONTDIR/unifont_upper.ttf"; then
+if test -r "$UNIFONTDIR/Unifont_Upper.ttf"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -9915,7 +9915,7 @@ $as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
else
- as_fn_error $? "$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
+ as_fn_error $? "$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
fi
cat >>confdefs.h <<_ACEOF
Index: asdf/stuff/poutput-fontengine.c
===================================================================
--- asdf.orig/stuff/poutput-fontengine.c
+++ asdf/stuff/poutput-fontengine.c
@@ -393,22 +393,22 @@ int fontengine_init (void)
return 1;
}
- unifont_bmp = TTF_OpenFontFilename(UNIFONTDIR "/unifont.ttf", 16, 0, 0, 0);
+ unifont_bmp = TTF_OpenFontFilename(UNIFONTDIR "/Unifont.ttf", 16, 0, 0, 0);
if (!unifont_bmp)
{
- fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont.ttf\") failed: %s\n", TTF_GetError());
+ fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont.ttf\") failed: %s\n", TTF_GetError());
TTF_ClearError();
}
- unifont_csur = TTF_OpenFontFilename(UNIFONTDIR "/unifont_csur.ttf", 16, 0, 0, 0);
+ unifont_csur = TTF_OpenFontFilename(UNIFONTDIR "/Unifont_CSUR.ttf", 16, 0, 0, 0);
if (!unifont_csur)
{
- fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont_csur.ttf\") failed: %s\n", TTF_GetError());
+ fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_CSUR.ttf\") failed: %s\n", TTF_GetError());
TTF_ClearError();
}
- unifont_upper = TTF_OpenFontFilename(UNIFONTDIR "/unifont_upper.ttf", 16, 0, 0, 0);
+ unifont_upper = TTF_OpenFontFilename(UNIFONTDIR "/Unifont_Upper.ttf", 16, 0, 0, 0);
if (!unifont_upper)
{
- fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont_upper.ttf\") failed: %s\n", TTF_GetError());
+ fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_Upper.ttf\") failed: %s\n", TTF_GetError());
TTF_ClearError();
}