Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
16956607 Update droid fonts to a June 2013 snapshot s12_25
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 17 Jun 2013 19:16:54 -0700
changeset 1385 0f063bf5cafa
parent 1384 d7ee8015b503
child 1386 850f401bbbe1
16956607 Update droid fonts to a June 2013 snapshot
open-src/font/google-droid/Makefile file | annotate | diff | comparison | revisions
open-src/font/google-droid/getdroid.sh file | annotate | diff | comparison | revisions
pkg/manifests/system-font-truetype-google-droid.p5m file | annotate | diff | comparison | revisions 
--- a/open-src/font/google-droid/Makefile	Wed Jun 05 13:07:35 2013 -0700
+++ b/open-src/font/google-droid/Makefile	Mon Jun 17 19:16:54 2013 -0700
@@ -39,26 +39,22 @@
 ORACLE_TPNO		= 12030
 
 # Version number (used in path names)
-MODULE_VERSION=2010.02.24
+MODULE_VERSION=2013.06.07
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 6ea3273ac2868f72499276a562838289
-TARBALL_SHA1 = 4eef8d0fc11231350cb3fe59cdd19716f192e311
+TARBALL_MD5   = 05d2a6da4cacf5b294d65ea981861cf8
+TARBALL_SHA1  = 50f649133d0f75b889058261f625ae14e89fa09f
+TARBALL_SHA256= 61bb7b67050efcdbf5d434085c9cbe7570ed31d97a5ffa920401132bde0f07b1
 
 # Source tarball
-SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(MODULE_VERSION).tar.gz
+SOURCE_TARBALL_NAME=$(SOURCE_DIRNAME).tar.xz
 SOURCE_TARBALL_NAME_SET=yes
 
-# Directory created when unpacking tarball
-SOURCE_DIRNAME=base
-SOURCE_DIRNAME_SET=yes
-
 # Download site for source
 # Upstream doesn't have a stable download tarball, so we use our mirror
-# to get consistent checksums - updates will come from snapshot link on
-# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
-# Current version was downloaded on 2/24/2010 from 
-# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=54e235b011be9e1e38a2b9be787d0a196493d89e;sf=tgz
+# to get consistent checksums - updates will come from snapshot of
+# https://android.googlesource.com/platform/frameworks/base.git
+# via "make upstream" target below
 SOURCE_URL=http://dlc.sun.com/osol/x/downloads/mirrors/$(SOURCE_TARBALL_NAME)
 SOURCE_URL_SET=yes
 
@@ -71,17 +67,14 @@
 
 TTF_FONT_FILES = \
     $(LICENSE_FILE)		\
-    DroidSans.ttf		\
-    DroidSans-Bold.ttf		\
-    DroidSerif-Regular.ttf	\
-    DroidSerif-Bold.ttf		\
-    DroidSerif-Italic.ttf	\
-    DroidSerif-BoldItalic.ttf	\
-    DroidSansMono.ttf		\
-    DroidSansFallback.ttf
+    *.ttf
 
 TTF_SUBDIR=google-droid
 TTF_SUBDIR_SET=yes
 
 ### Include common rulesets
 include ../Makefile.ttf
+
+# Download latest sources from upstream & make new tarball
+upstream:
+	/bin/bash ./getdroid.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/google-droid/getdroid.sh	Mon Jun 17 19:16:54 2013 -0700
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Try to get upstream latest files. Based on:
+# http://pkgs.fedoraproject.org/cgit/google-droid-fonts.git/plain/getdroid.sh
+
+export PATH=/usr/gnu/bin:/usr/bin
+TMPDIR="$(mktemp -d --tmpdir=/var/tmp getdroid-XXXXXXXXXX)"
+[ $? != 0 ] && exit 1
+umask 022
+pushd "$TMPDIR"
+git init
+git remote add -t HEAD origin http://android.googlesource.com/platform/frameworks/base.git
+git config core.sparseCheckout true
+cat > .git/info/sparse-checkout << EOF
+data/fonts/*
+EOF
+git pull --depth=1 --no-tags origin HEAD
+DATE="$(date --date="@$(git log -1 HEAD --format=%at)" -u +%Y.%m.%d)"
+ARCHIVE="google-droid-fonts-$DATE"
+mv data/fonts "$ARCHIVE"
+chmod -wx "$ARCHIVE"/*
+tar -cvJf "$ARCHIVE.tar.xz" "$ARCHIVE"
+popd
+mv "$TMPDIR/$ARCHIVE.tar.xz" .
+rm -fr "$TMPDIR"
+printf "MODULE_VERSION=${DATE}\n\n"
+for cs in md5 sha1 sha256 ; do
+    printf "TARBALL_%-6s= " ${cs^^}
+    ${cs}sum "$ARCHIVE.tar.xz" | cut -d' ' -f1
+done
+
--- a/pkg/manifests/system-font-truetype-google-droid.p5m	Wed Jun 05 13:07:35 2013 -0700
+++ b/pkg/manifests/system-font-truetype-google-droid.p5m	Mon Jun 17 19:16:54 2013 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -30,15 +30,53 @@
 link path=etc/X11/fontpath.d/google-droid:pri=42 \
     target=../../../usr/share/fonts/TrueType/google-droid
 dir  path=usr/share/fonts/TrueType/google-droid
+file path=usr/share/fonts/TrueType/google-droid/AndroidClock.ttf
+file path=usr/share/fonts/TrueType/google-droid/AndroidClock_Highlight.ttf
+file path=usr/share/fonts/TrueType/google-droid/AndroidClock_Solid.ttf
+file path=usr/share/fonts/TrueType/google-droid/AndroidEmoji.ttf
+file path=usr/share/fonts/TrueType/google-droid/Clockopia.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidKufi-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidKufi-Regular.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidNaskh-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidNaskh-Regular-SystemUI.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidNaskh-Regular.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSans-Bold.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSans.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansArabic.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansArmenian.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansDevanagari-Regular.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansEthiopic-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansEthiopic-Regular.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSansFallback.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansFallbackFull.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansFallbackLegacy.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansGeorgian.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansHebrew-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansHebrew-Regular.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansJapanese.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSansMono.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansTamil-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansTamil-Regular.ttf
+file path=usr/share/fonts/TrueType/google-droid/DroidSansThai.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSerif-Bold.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSerif-BoldItalic.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSerif-Italic.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSerif-Regular.ttf
+file path=usr/share/fonts/TrueType/google-droid/MTLc3m.ttf
+file path=usr/share/fonts/TrueType/google-droid/MTLmr3m.ttf
 file path=usr/share/fonts/TrueType/google-droid/NOTICE
+file path=usr/share/fonts/TrueType/google-droid/Roboto-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-BoldItalic.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-Italic.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-Light.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-LightItalic.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-Regular.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-Thin.ttf
+file path=usr/share/fonts/TrueType/google-droid/Roboto-ThinItalic.ttf
+file path=usr/share/fonts/TrueType/google-droid/RobotoCondensed-Bold.ttf
+file path=usr/share/fonts/TrueType/google-droid/RobotoCondensed-BoldItalic.ttf
+file path=usr/share/fonts/TrueType/google-droid/RobotoCondensed-Italic.ttf
+file path=usr/share/fonts/TrueType/google-droid/RobotoCondensed-Regular.ttf
 file path=usr/share/fonts/TrueType/google-droid/fonts.dir
 file path=usr/share/fonts/TrueType/google-droid/fonts.scale
 legacy pkg=SUNWttf-google-droid \
upstream/oracle/x-cons/x-s12-clone