Skip to content

Commit 5bb1bb0

Browse files
committed
version: Bump to v13.0.1
1 parent 208ad63 commit 5bb1bb0

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ TMP := /dev/shm
88
# Where to find scfbuild?
99
SCFBUILD := SCFBuild/bin/scfbuild
1010

11-
VERSION := 12.0.1
11+
VERSION := 13.0.1
1212
FONT_PREFIX := TwitterColorEmoji-SVGinOT
1313
REGULAR_FONT := build/$(FONT_PREFIX).ttf
1414
REGULAR_PACKAGE := build/$(FONT_PREFIX)-$(VERSION)
@@ -19,16 +19,16 @@ DEB_PACKAGE := fonts-twemoji-svginot
1919
WINDOWS_TOOLS := windows
2020
WINDOWS_PACKAGE := build/$(FONT_PREFIX)-Win-$(VERSION)
2121

22-
ifeq (, $(shell command -v inkscape))
23-
$(error "No inkscape in PATH, it is required for fallback b/w variant.")
24-
else
22+
ifeq (, $(shell which inkscape))
23+
$(error "No inkscape in PATH, it is required for fallback b/w variant.")
24+
endif
25+
2526
ifeq (0, $(shell inkscape --without-gui 1>&2 2> /dev/null; echo $$?))
26-
# Inkscape < 1.0
27-
INKSCAPE_EXPORT_FLAGS := --without-gui --export-png
27+
# Inkscape < 1.0
28+
INKSCAPE_EXPORT_FLAGS := --without-gui --export-png
2829
else
29-
# Inkscape ≥ 1.0
30-
INKSCAPE_EXPORT_FLAGS := --export-filename
31-
endif
30+
# Inkscape ≥ 1.0
31+
INKSCAPE_EXPORT_FLAGS := --export-filename
3232
endif
3333

3434
# There are two SVG source directories to keep the assets separate
@@ -48,10 +48,10 @@ SVG_COLOR_FILES := $(patsubst build/stage/%.svg, build/svg-color/%.svg, $(SVG_ST
4848

4949
.PHONY: all update package regular-package linux-package osx-package windows-package copy-extra clean
5050

51-
all: $(REGULAR_FONT) $(OSX_FONT)
51+
all: package
5252

5353
update:
54-
cp ../twemoji/2/svg/* assets/twemoji-svg/
54+
cp ../twemoji/assets/svg/* assets/twemoji-svg/
5555

5656
# Create the operating system specific packages
5757
package: regular-package linux-package deb-package osx-package windows-package

README.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ want to try them. Primary issues are the 0x2639 and 0x263a characters.
8686
Install for the current user without root:
8787
```sh
8888
# 1. Download the latest version
89-
wget https://github.com/eosrei/twemoji-color-font/releases/download/v12.0.1/TwitterColorEmoji-SVGinOT-Linux-12.0.1.tar.gz
89+
wget https://github.com/eosrei/twemoji-color-font/releases/download/v13.0.1/TwitterColorEmoji-SVGinOT-Linux-13.0.1.tar.gz
9090
# 2. Uncompress the file
91-
tar zxf TwitterColorEmoji-SVGinOT-Linux-12.0.1.tar.gz
91+
tar zxf TwitterColorEmoji-SVGinOT-Linux-13.0.1.tar.gz
9292
# 3. Run the installer
93-
cd TwitterColorEmoji-SVGinOT-Linux-12.0.1
93+
cd TwitterColorEmoji-SVGinOT-Linux-13.0.1
9494
./install.sh
9595
```
9696

@@ -125,10 +125,10 @@ emerge twemoji-color-font
125125
Both SVGinOT versions are available from releases:
126126
https://github.com/eosrei/twemoji-color-font/releases
127127

128-
1. `TwitterColorEmoji-SVGinOT-12.0.1.zip` - The regular version of the font
128+
1. `TwitterColorEmoji-SVGinOT-13.0.1.zip` - The regular version of the font
129129
installs like any other font and can be specifically selected, but OS X will
130130
default to the `Apple Color Emoji` font for emojis.
131-
2. `TwitterColorEmoji-SVGinOT-OSX-12.0.1.zip` - A hack to replace the `Apple
131+
2. `TwitterColorEmoji-SVGinOT-OSX-13.0.1.zip` - A hack to replace the `Apple
132132
Color Emoji` font by [using the same internal name][12]. Install and accept
133133
the warning in Font Book.
134134

@@ -156,7 +156,7 @@ from releases: https://github.com/eosrei/twemoji-color-font/releases
156156
The regular version of the font installs like any other font and can be
157157
specifically selected, but Windows will default to the `Segoe UI Emoji`
158158
font for emoji characters. Download:
159-
https://github.com/eosrei/twemoji-color-font/releases/download/v12.0.1/TwitterColorEmoji-SVGinOT-12.0.1.zip
159+
https://github.com/eosrei/twemoji-color-font/releases/download/v13.0.1/TwitterColorEmoji-SVGinOT-13.0.1.zip
160160

161161
### Replace the default Windows emoji fonts
162162

@@ -171,7 +171,7 @@ install script requires both [Python][16] and pip in the PATH.
171171
1. Download the most recent Python 3 for Windows: https://www.python.org/downloads/windows/
172172
2. Start the installer, select "Add Python 3.6 to PATH", finish the install process, then reboot.
173173
3. Download Twitter Color Emoji Windows package from releases:
174-
https://github.com/eosrei/twemoji-color-font/releases/download/v12.0.1/TwitterColorEmoji-SVGinOT-Win-12.0.1.zip
174+
https://github.com/eosrei/twemoji-color-font/releases/download/v13.0.1/TwitterColorEmoji-SVGinOT-Win-13.0.1.zip
175175
4. Uncompress the file.
176176
5. Open the new TwitterColorEmoji directory.
177177
6. Run install.cmd. *Note: This will take some time.*
@@ -192,6 +192,7 @@ are also included in the release files.
192192
[18]:linux/uninstall.sh
193193

194194
## Building
195+
195196
Overview:
196197

197198
1. B&W SVGs are generated on-the-fly from the color SVGs
@@ -201,26 +202,26 @@ Overview:
201202

202203
Requires:
203204

204-
* Inkscape
205+
* Inkscape 1.0+
205206
* Imagemagick
206207
* potrace/mkbitmap
207-
* FontTools 3.0+
208-
* FontForge 20160405+
208+
* FontTools 4.14+
209+
* FontForge 20190801+
209210
* SVGO
210211
* make
211212
* [SCFBuild][13] *(Created for this project!)*
212213

213214
[13]: https://github.com/13rac1/scfbuild
214215

215-
Setup and build on Ubuntu 18.04 LTS:
216+
Setup and build on Ubuntu 20.04 LTS:
216217

217218
```sh
218219
sudo apt-get update
219220
sudo apt-get install inkscape potrace npm nodejs fontforge \
220-
devscripts python-fontforge python-pip python-yaml imagemagick \
221+
devscripts python3-fontforge python3-pip python3-yaml imagemagick \
221222
git make debhelper build-essential
222223
sudo npm install -g svgo
223-
sudo pip install fonttools
224+
sudo pip3 install fonttools
224225
git clone https://github.com/eosrei/twemoji-color-font.git
225226
cd twemoji-color-font
226227
git clone https://github.com/13rac1/scfbuild.git SCFBuild

linux/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
fonts-twemoji-svginot (13.0.1-1) bionic; urgency=medium
2+
3+
* Update to twemoji 13.0.1.
4+
5+
-- Brad Erickson <[email protected]> Sat, 12 Sep 2020 12:20:15 -0700
6+
17
fonts-twemoji-svginot (12.0.1-1) bionic; urgency=medium
28

39
* Update to twemoji 12.0.1.

0 commit comments

Comments
 (0)