[PR PATCH] font-material-design-icons-ttf: merge with ttf-material-icons, rev bump

[PR PATCH] font-material-design-icons-ttf: merge with ttf-material-icons, rev bump

[dmarto]

[-- Attachment #1: Type: text/plain, Size: 977 bytes --]

There is a new pull request by dmarto against master on the void-packages repository

https://github.com/dmarto/void-packages font-material
https://github.com/void-linux/void-packages/pull/36386

font-material-design-icons-ttf: merge with ttf-material-icons, rev bump
`ttf-material-icons` and `font-material-design-icons-ttf` are the same package down to the checksum, I decided to merge them into `font-material-design-icons-ttf`, because it conform to the latest font naming scheme for void and `google-fonts-ttf` depends on it. 

#### Testing the changes
- I tested the changes in this PR: **YES**

I am not 100% sure my approach is the correct one, but I tested it and it works; if `ttf-material-icons` is installed, it will be replaced with `font-material-design-icons-ttf`. 

That approached seems the best to me, as it brings no inconveniences to users of either package.

A patch file from https://github.com/void-linux/void-packages/pull/36386.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-material-36386.patch --]
[-- Type: text/x-diff, Size: 2434 bytes --]

From 2ad5dd8d227ab682c6894de27d58708c70d10500 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 28 Mar 2022 00:42:05 +0300
Subject: [PATCH] font-material-design-icons-ttf: merge with
 ttf-material-icons, rev bump

---
 srcpkgs/font-material-design-icons-ttf/template |  8 +++++++-
 srcpkgs/ttf-material-icons                      |  1 +
 srcpkgs/ttf-material-icons/template             | 16 ----------------
 3 files changed, 8 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/ttf-material-icons
 delete mode 100644 srcpkgs/ttf-material-icons/template

diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template
index fe3da363cc1e..d05b3c8a0a49 100644
--- a/srcpkgs/font-material-design-icons-ttf/template
+++ b/srcpkgs/font-material-design-icons-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'font-material-design-icons-ttf'
 pkgname=font-material-design-icons-ttf
 version=4.0.0
-revision=1
+revision=2
 wrksrc="material-design-icons-${version}"
 depends="font-util xbps-triggers"
 short_desc="Material Design icons by Google"
@@ -16,3 +16,9 @@ font_dirs="/usr/share/fonts/TTF"
 do_install() {
 	vinstall font/MaterialIcons-Regular.ttf 644 usr/share/fonts/TTF
 }
+
+ttf-material-icons_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/ttf-material-icons b/srcpkgs/ttf-material-icons
new file mode 120000
index 000000000000..4d1e4bb1d94e
--- /dev/null
+++ b/srcpkgs/ttf-material-icons
@@ -0,0 +1 @@
+font-material-design-icons-ttf
\ No newline at end of file
diff --git a/srcpkgs/ttf-material-icons/template b/srcpkgs/ttf-material-icons/template
deleted file mode 100644
index b429c563c477..000000000000
--- a/srcpkgs/ttf-material-icons/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'ttf-material-icons'
-pkgname=ttf-material-icons
-version=4.0.0
-revision=1
-wrksrc=material-design-icons-${version}
-short_desc="Material Design icons by Google"
-maintainer="Michael Carlberg <c@rlberg.se>"
-license=CC
-homepage=http://google.github.io/material-design-icons/
-distfiles=https://github.com/google/material-design-icons/archive/${version}.tar.gz
-checksum=b1b068d625d5e15d6ec0059209cec67bc4c46e39c4611b859d6f6680dbf23934
-
-do_install() {
-	vinstall font/MaterialIcons-Regular.ttf  644 usr/share/fonts/TTF
-	vlicense LICENSE
-}

Re: [PR PATCH] [Merged]: font-material-design-icons-ttf: merge with ttf-material-icons, rev bump

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

There's a merged pull request on the void-packages repository

font-material-design-icons-ttf: merge with ttf-material-icons, rev bump
https://github.com/void-linux/void-packages/pull/36386

Description:
`ttf-material-icons` and `font-material-design-icons-ttf` are the same package down to the checksum, I decided to merge them into `font-material-design-icons-ttf`, because it conform to the latest font naming scheme for void and `google-fonts-ttf` depends on it. 

#### Testing the changes
- I tested the changes in this PR: **YES**

I am not 100% sure my approach is the correct one, but I tested it and it works; if `ttf-material-icons` is installed, it will be replaced with `font-material-design-icons-ttf`. 

That approached seems the best to me, as it brings no inconveniences to users of either package.