From 1d7d16aef7a68dca39c37b84a42c0bbd2b349c63 Mon Sep 17 00:00:00 2001 From: Xavier Date: Fri, 23 Sep 2022 22:18:35 -0400 Subject: [PATCH] Stray file housekeeping. --- ocp-git.install | 24 --------- unifont.patch | 128 ------------------------------------------------ 2 files changed, 152 deletions(-) delete mode 100644 ocp-git.install delete mode 100644 unifont.patch diff --git a/ocp-git.install b/ocp-git.install deleted file mode 100644 index 6f87023..0000000 --- a/ocp-git.install +++ /dev/null @@ -1,24 +0,0 @@ -infodir=usr/share/info - -post_install() { - echo - echo Please note that you need to rebuild ocp-git after installing any of the optional dependencies for it. - echo - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/ocp.info.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install -} - -pre_remove() { - install-info --delete $infodir/ocp.info.gz $infodir/dir 2> /dev/null -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/unifont.patch b/unifont.patch deleted file mode 100644 index bade385..0000000 --- a/unifont.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --unified --recursive --text package.orig/ocp/configure package.new/ocp/configure ---- package.orig/ocp/configure 2020-06-06 15:41:09.851035735 +0300 -+++ package.new/ocp/configure 2020-06-06 15:46:16.263149466 +0300 -@@ -9851,15 +9851,15 @@ - 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" -@@ -9871,18 +9871,18 @@ - 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 X11, SDL1.x and SDL2)" "$LINENO" 5 -+ as_fn_error $? "$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and 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" -@@ -9894,18 +9894,18 @@ - 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 X11, SDL1.x and SDL2)" "$LINENO" 5 -+ as_fn_error $? "$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and 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" -@@ -9917,7 +9917,7 @@ - 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 X11, SDL1.x and SDL2)" "$LINENO" 5 -+ as_fn_error $? "$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)" "$LINENO" 5 - fi - - cat >>confdefs.h <<_ACEOF -diff --unified --recursive --text package.orig/ocp/configure.ac package.new/ocp/configure.ac ---- package.orig/ocp/configure.ac 2020-06-06 15:41:09.851035735 +0300 -+++ package.new/ocp/configure.ac 2020-06-06 15:47:48.977121525 +0300 -@@ -580,9 +580,9 @@ - - dnl locate the ttf-unifont - AS_AC_EXPAND(UNIFONTDIR, $with_unifontdir) -- AC_CHECK_FILE($UNIFONTDIR/unifont.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) -- AC_CHECK_FILE($UNIFONTDIR/unifont_csur.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) -- AC_CHECK_FILE($UNIFONTDIR/unifont_upper.ttf, , AC_MSG_ERROR([$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) -+ AC_CHECK_FILE($UNIFONTDIR/Unifont.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) -+ AC_CHECK_FILE($UNIFONTDIR/Unifont_CSUR.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) -+ AC_CHECK_FILE($UNIFONTDIR/Unifont_Upper.ttf, , AC_MSG_ERROR([$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by X11, SDL1.x and SDL2)])) - AC_DEFINE_UNQUOTED(UNIFONTDIR, "$UNIFONTDIR") - fi - -diff --unified --recursive --text package.orig/ocp/stuff/poutput-fontengine.c package.new/ocp/stuff/poutput-fontengine.c ---- package.orig/ocp/stuff/poutput-fontengine.c 2020-06-06 15:41:09.891036012 +0300 -+++ package.new/ocp/stuff/poutput-fontengine.c 2020-06-06 15:48:33.550761797 +0300 -@@ -393,22 +393,22 @@ - 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(); - } -