replace custom toothless G patch with new upstream variant

4 files changed, 7 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5f4a501de04..e7613045c736 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ttf-iosevka-term-custom-git
 	pkgdesc = A slender monospace sans-serif and slab-serif typeface inspired by Pragmata Pro, M+ and PF DIN Mono.
-	pkgver = r1455.ac2576fa
+	pkgver = r1461.43a8ca6d
 	pkgrel = 1
 	url = https://be5invis.github.io/Iosevka/
 	arch = any
@@ -14,10 +14,8 @@ pkgbase = ttf-iosevka-term-custom-git
 	depends = xorg-font-utils
 	source = git+https://github.com/be5invis/Iosevka
 	source = private-build-plans.toml.example
-	source = toothless-G.patch
 	sha256sums = SKIP
-	sha256sums = 287ecd7b677d384bcc2e29f6bf789328e5da5789d2e179d4bc516a0ca1cad0d8
-	sha256sums = 56d1d97b421ab462d71875ecadf57d65ee45fe26edee50922ae9ae96350cff52
+	sha256sums = 9b5ccb10398aac9c07232afea46a74ed5353cdaab7ff53de5389df968aed62d1
 
 pkgname = ttf-iosevka-term-custom-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fb21c94dc555..0d9f58e20295 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andy Kluger <AndyKluger@gmail.com>
 # Contributor: Markus Weimar <mail@markusweimar.de>
 pkgname=ttf-iosevka-term-custom-git
-pkgver=r1455.ac2576fa
+pkgver=r1461.43a8ca6d
 pkgrel=1
 pkgdesc='A slender monospace sans-serif and slab-serif typeface inspired by Pragmata Pro, M+ and PF DIN Mono.'
 arch=('any')
@@ -14,12 +14,10 @@ provides=()
 source=(
   'git+https://github.com/be5invis/Iosevka'
   'private-build-plans.toml.example'
-  'toothless-G.patch'
 )
 sha256sums=(
   'SKIP'
-  '287ecd7b677d384bcc2e29f6bf789328e5da5789d2e179d4bc516a0ca1cad0d8'
-  '56d1d97b421ab462d71875ecadf57d65ee45fe26edee50922ae9ae96350cff52'
+  '9b5ccb10398aac9c07232afea46a74ed5353cdaab7ff53de5389df968aed62d1'
 )
 
 pkgver() {
@@ -35,14 +33,6 @@ prepare() {
     echo ">>> $buildplans not found, using private-build-plans.toml.example"
     cp private-build-plans.toml.example Iosevka/private-build-plans.toml
   fi
-
-  cd Iosevka
-
-  # patch -p1 < ../toothless-G.patch
-
-  # Uncomment the above line to get back the smoother capital G,
-  # as seen in this image (look for "LIGHT"):
-  # https://raw.githubusercontent.com/be5invis/Iosevka/47023ab4058987f58844f6308d8175e735106b8a/images/preview-all.png
 }
 
 build() {
diff --git a/private-build-plans.toml.example b/private-build-plans.toml.example
index c7aeab1221f6..318c94d580fe 100644
--- a/private-build-plans.toml.example
+++ b/private-build-plans.toml.example
@@ -34,6 +34,7 @@ design = [                         # Common styles
   "cv79",                          # curly y
   "cv81",                          # curly Y
   "cv83",                          # curly R
+  "cv92",                          # toothless G
 
 ]
 # upright = []                     # Upright-only styles
@@ -64,6 +65,7 @@ design = [                         # Common styles
   "cv79",                          # curly y
   "cv81",                          # curly Y
   "cv83",                          # curly R
+  "cv92",                          # toothless G
 
 ]
 # upright = []                     # Upright-only styles
@@ -94,6 +96,7 @@ design = [                         # Common styles
   "cv79",                          # curly y
   "cv81",                          # curly Y
   "cv83",                          # curly R
+  "cv92",                          # toothless G
 
 ]
 # upright = []                     # Upright-only styles
diff --git a/toothless-G.patch b/toothless-G.patch
deleted file mode 100644
index 3e8f1fd61118..000000000000
--- a/toothless-G.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/glyphs/letters-unified-basic.ptl b/glyphs/letters-unified-basic.ptl
-index 40fb8784..5cd2ffae 100644
---- a/glyphs/letters-unified-basic.ptl
-+++ b/glyphs/letters-unified-basic.ptl
-@@ -2753,8 +2753,6 @@ export : define [apply] : begin
- 	do "G and related ============================================================================="
- 		define [GShape top sma smb] : glyph-construction
- 			local yBar : top * 0.52 + STROKE * 0.25
--			local fine SHOULDERFINE
--			local sb : shoulderMidSlope fine nothing (-1)
- 			include : dispiro
- 				widths.lhs
- 				g4   RIGHTSB (top - HOOK)
-@@ -2762,12 +2760,13 @@ export : define [apply] : begin
- 				flat (SB + OX) (top - sma)
- 				curl (SB + OX) smb
- 				arcvh
--				g4.right.mid (MIDDLE + (CORRECTION_OMIDX - sb) * STROKE) O [widths.heading STROKE 0 {.y (1) .x (sb)}]
-+				g4   (MIDDLE + CORRECTION_OMIDS) O
- 				archv
--				straight.up.end (RIGHTSB - (STROKE - fine) * HVCONTRAST) sma [widths.heading fine 0 UPWARD]
--			include : HBarTop MIDDLE RIGHTSB yBar
--			include : VBarRight RIGHTSB sma yBar
--			include : VBarRight RIGHTSB sma 0 (STROKE - fine / 2)
-+				flat RIGHTSB sma
-+				curl RIGHTSB yBar [heading UPWARD]
-+			include : dispiro
-+				flat MIDDLE yBar [widths 0 STROKE]
-+				curl RIGHTSB yBar [heading RIGHTWARD]
- 
- 		sketch # G
- 			set-width WIDTH