summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD20
-rw-r--r--ttf-vista-fonts.install30
3 files changed, 35 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 953de453771..3353bb107f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
pkgbase = ttf-vista-fonts
- pkgdesc = Microsoft Vista True Type Fonts
+ pkgdesc = Microsoft Vista and Office 2007 True Type Fonts
pkgver = 1
- pkgrel = 8
- url = http://www.microsoft.com/en-us/download/confirmation.aspx?id=13
+ pkgrel = 9
+ url = https://docs.microsoft.com/en-us/typography/fonts/font-faq
install = ttf-vista-fonts.install
arch = any
- license = custom
+ license = custom:microsoft
makedepends = fontforge
makedepends = fontconfig
makedepends = xorg-font-utils
makedepends = cabextract
- conflicts = ttf-ms-extrafonts
replaces = vista-fonts
- source = http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
- md5sums = 35ff8ebbea457ba426b47ff6d8377284
+ source = ttf-vista-fonts.cab::https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ sha256sums = 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
pkgname = ttf-vista-fonts
diff --git a/PKGBUILD b/PKGBUILD
index 4fa64ca8bba..abfd19e985d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,23 @@
+# Maintainer: mrxx <mrxx at cyberhome dot at>
# Contributor: mutlu_inek <mutlu_inek@yahoo.de>
-# Maintainer: jnbek print "<",join('', qw(j n b e k 1 9 7 2),"_AT_ geeee mail __DOT__ com",">\n";
+# Contributor: jnbek
pkgname=ttf-vista-fonts
pkgver=1
-pkgrel=8
-pkgdesc="Microsoft Vista True Type Fonts"
-url="http://www.microsoft.com/en-us/download/confirmation.aspx?id=13"
-license=('custom')
+pkgrel=9
+pkgdesc="Microsoft Vista and Office 2007 True Type Fonts"
+url="https://docs.microsoft.com/en-us/typography/fonts/font-faq"
+license=('custom:microsoft')
arch=('any')
depends=()
makedepends=('fontforge' 'fontconfig' 'xorg-font-utils' 'cabextract')
-conflicts=('ttf-ms-extrafonts')
-provides=()
replaces=('vista-fonts')
install=$pkgname.install
-source=('http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe')
-md5sums=('35ff8ebbea457ba426b47ff6d8377284')
+source=("${pkgname}.cab::https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe")
+sha256sums=('249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423')
package() {
mkdir -p "$srcdir/$pkgname-$pkgver"
- cabextract --lowercase "$srcdir/PowerPointViewer.exe" -d "$srcdir/$pkgname-$pkgver"
+ cabextract --lowercase "$srcdir/${pkgname}.cab" -d "$srcdir/$pkgname-$pkgver"
cabextract --lowercase -F '*.tt[fc]' "$srcdir/$pkgname-$pkgver/ppviewer.cab" -d "$srcdir/$pkgname-$pkgver"
# cambria.ttc is a TrueType Collection (TTC) which causes problems with
@@ -26,6 +25,7 @@ package() {
# the TTC into a TrueType Font (TTF).
cd "$srcdir/$pkgname-$pkgver"
FONTFORGE_LANGUAGE=ff fontforge -c 'Open("cambria.ttc"); Generate("cambria.ttf")'
+ FONTFORGE_LANGUAGE=ff fontforge -c 'Open("cambria.ttc(Cambria Math)"); Generate("cambria-math.ttf")'
rm cambria.ttc
mkdir -p "$pkgdir/usr/share/fonts/TTF"
diff --git a/ttf-vista-fonts.install b/ttf-vista-fonts.install
index 7d5202312c1..a4f10ce1eda 100644
--- a/ttf-vista-fonts.install
+++ b/ttf-vista-fonts.install
@@ -1,17 +1,21 @@
post_install() {
- echo -n "rebuilding font cache... "
- fc-cache /usr/share/fonts/TTF
- mkfontscale /usr/share/fonts/TTF
- mkfontdir /usr/share/fonts/TTF
- echo "done."
+ rebuild_font_cache
+ echo
+ echo
+ echo "######################################################################"
+ echo "# #"
+ echo "# LICENSE AGREEEMENT for ttf-vista-fonts #"
+ echo "# #"
+ echo "# In accordance to the Microsoft EULA, you are allowed to use these #"
+ echo "# fonts only if a licensed copy of Windows Vista(tm) or later and/or #"
+ echo "# Microsoft Office 2007(tm) or later is installed on this computer. #"
+ echo "# #"
+ echo "######################################################################"
+ echo
}
post_upgrade() {
- echo -n "rebuilding font cache... "
- fc-cache /usr/share/fonts/TTF
- mkfontscale /usr/share/fonts/TTF
- mkfontdir /usr/share/fonts/TTF
- echo "done."
+ rebuild_font_cache
}
pre_remove() {
@@ -20,7 +24,11 @@ pre_remove() {
# arg 1: the old package version
post_remove() {
- echo -n "rebuilding font cache... "
+ rebuild_font_cache
+}
+
+rebuild_font_cache() {
+ echo -n "Rebuilding font cache... "
fc-cache /usr/share/fonts/TTF
mkfontscale /usr/share/fonts/TTF
mkfontdir /usr/share/fonts/TTF