openkylin
/
msttcorefonts
mirror of https://gitee.com/openkylin/msttcorefonts.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 04:07:25 +08:00
parent c86814ec9d
commit 33be8b35ab
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
debian/patches/diff.patch vendored
View File

@ -1,6 +1,15 @@
diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/msttcorefonts-3.7/update-ms-fonts /data/openKylin/source-repack/data2/msttcorefonts/msttcorefonts-3.7ubuntu6/update-ms-fonts
--- a/update-ms-fonts 2018-01-11 19:28:55.000000000 +0800
+++ b/update-ms-fonts 2018-11-28 09:47:11.000000000 +0800
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Sat, 14 May 2022 04:07:25 +0800
Subject: diff
---
update-ms-fonts | 198 ++++++++++++++++----------------------------------------
1 file changed, 55 insertions(+), 143 deletions(-)
diff --git a/update-ms-fonts b/update-ms-fonts
index 9a0012b..4fdd4f8 100755
--- a/update-ms-fonts
+++ b/update-ms-fonts
@@ -1,36 +1,21 @@
#!/bin/sh
-# Download and install the Microsoft Core Fonts for the Web
@ -8,9 +17,10 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
-# (C) 2000,2001 Eric Sharkey.
-# You may freely distribute this file under the terms of the GNU General
-# Public License, version 2 or later.
-
-#abort if anything goes wrong
-#set -e
+
+set -e
+
+. /usr/share/debconf/confmodule
@ -42,7 +52,7 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
mstt_exit_with_error() {
echo "$1" >&2
echo "The fonts are NOT installed." >&2
@@ -38,28 +23,33 @@
@@ -38,28 +23,33 @@ mstt_exit_with_error() {
exit 1
}
@ -59,6 +69,9 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
- http://internode.dl.sourceforge.net/sourceforge/corefonts/
- http://voxel.dl.sourceforge.net/sourceforge/corefonts/
- http://kent.dl.sourceforge.net/sourceforge/corefonts/"
-
-if [ "$URLOVERRIDE" ] ; then
- URLROOTS="$URLOVERRIDE"
+db_get msttcorefonts/accepted-mscorefonts-eula || true
+if [ "$RET" != "true" ]; then
+ mstt_exit_with_error "user did not accept the $license license"
@ -66,9 +79,7 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
+
+if [ -z "$QUIET_MODE" ] ; then
+ cat <<EOF
-if [ "$URLOVERRIDE" ] ; then
- URLROOTS="$URLOVERRIDE"
+
+These fonts were provided by Microsoft "in the interest of cross-
+platform compatibility". This is no longer the case, but they are
+still available from third parties.
@ -91,7 +102,7 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
cat <<EOF > msfonts.info
48d9bc613917709d3b0e0f4a6d4fe33a5c544c5035dffe9e90bc11e50e822071 Andale_Mono.ttf andale32.exe andalemo.ttf
dad7c04acb26e23dfe4780e79375ca193ddaf68409317e81577a30674668830e Arial_Black.ttf arialb32.exe ariblk.ttf
@@ -93,120 +83,44 @@
@@ -93,120 +83,44 @@ c8f5065ba91680f596af3b0378e2c3e713b95a523be3d56ae185ca2b8f5f0b23 Verdana_Bold.tt
10d099c88521b1b9e380b7690cbe47b54bb19396ca515358cfdc15ac249e2f5d Webdings.ttf webdin32.exe webdings.ttf
EOF
@ -178,7 +189,8 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
- # Reset counters for checksum
- FONTFILES=$FFDONE
- FFDONE=""
-
+:> /var/lib/msttcorefonts/ms-fonts
- for ff in $FONTFILES; do
- # verify checksum before unpacking, to be safe
- if grep "$ff\$" /var/lib/msttcorefonts/cabfiles.sha256sums | sha256sum -c ; then
@ -193,8 +205,7 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
- fi
- rm $ff
- done
+:> /var/lib/msttcorefonts/ms-fonts
-
- FONTFILES=$FFDONE
- FFDONE=""
- #Add some level of predictability by folding everything to lower case
@ -241,7 +252,7 @@ diff -ru -xdebian /data/openKylin/source-repack/data2/msttcorefonts/upstream/mst
cd /
rm -rf $SCRATCHDIR
@@ -223,6 +137,4 @@
@@ -223,6 +137,4 @@ if [ -z "$QUIETMODE" ] ; then
fi
fi