* [ptxdist] [PATCH v3] xorg-font-alias: version bump 1.0.3 -> 1.0.5
@ 2025-10-28 9:47 Sven Püschel
2025-11-07 8:53 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Sven Püschel @ 2025-10-28 9:47 UTC (permalink / raw)
To: ptxdist; +Cc: Sven Püschel
Release tarballs now use xz instead of bz2.
Regenerated the patch using 'git ptx-patches', as the old patch only
applied when 'ptxdist --git extract' was used.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
...riable-to-100dpi-and-75dpi-fonts.alias.patch | 17 ++++++++---------
.../series | 0
rules/xorg-font-alias.make | 8 +++++---
3 files changed, 13 insertions(+), 12 deletions(-)
rename patches/{font-alias-1.0.3 => font-alias-1.0.5}/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch (86%)
rename patches/{font-alias-1.0.3 => font-alias-1.0.5}/series (100%)
diff --git a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch b/patches/font-alias-1.0.5/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
similarity index 86%
rename from patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
rename to patches/font-alias-1.0.5/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
index dd20525c3..9ff62d233 100644
--- a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
+++ b/patches/font-alias-1.0.5/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
@@ -13,13 +13,13 @@ to mainline has yet received no answer.
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
---
- 100dpi/fonts.alias | 1 +
- 75dpi/fonts.alias | 1 +
- misc/fonts.alias | 1 -
- 3 files changed, 2 insertions(+), 1 deletions(-)
+ 100dpi/fonts.alias | 1 +
+ 75dpi/fonts.alias | 1 +
+ misc/fonts.alias | 1 -
+ 3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/100dpi/fonts.alias b/100dpi/fonts.alias
-index 9a4c461..9c5aa7b 100644
+index 9a4c46168707..9c5aa7b7212f 100644
--- a/100dpi/fonts.alias
+++ b/100dpi/fonts.alias
@@ -1,3 +1,4 @@
@@ -28,7 +28,7 @@ index 9a4c461..9c5aa7b 100644
lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
diff --git a/75dpi/fonts.alias b/75dpi/fonts.alias
-index a3d464f..c3f9dd1 100644
+index a3d464ffc055..c3f9dd1f24f5 100644
--- a/75dpi/fonts.alias
+++ b/75dpi/fonts.alias
@@ -1,3 +1,4 @@
@@ -37,11 +37,10 @@ index a3d464f..c3f9dd1 100644
lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1
lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1
diff --git a/misc/fonts.alias b/misc/fonts.alias
-index 0398476..d4c49f2 100644
+index 732933c9fa7b..ae74934cfb7b 100644
--- a/misc/fonts.alias
+++ b/misc/fonts.alias
-@@ -1,6 +1,5 @@
- ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
+@@ -1,5 +1,4 @@
fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
diff --git a/patches/font-alias-1.0.3/series b/patches/font-alias-1.0.5/series
similarity index 100%
rename from patches/font-alias-1.0.3/series
rename to patches/font-alias-1.0.5/series
diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
index 59df1ff6a..decc28185 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias
#
# Paths and names
#
-XORG_FONT_ALIAS_VERSION := 1.0.3
-XORG_FONT_ALIAS_MD5 := 6d25f64796fef34b53b439c2e9efa562
+XORG_FONT_ALIAS_VERSION := 1.0.5
+XORG_FONT_ALIAS_MD5 := 79f4c023e27d1db1dfd90d041ce89835
XORG_FONT_ALIAS := font-alias-$(XORG_FONT_ALIAS_VERSION)
-XORG_FONT_ALIAS_SUFFIX := tar.bz2
+XORG_FONT_ALIAS_SUFFIX := tar.xz
XORG_FONT_ALIAS_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX))
XORG_FONT_ALIAS_SOURCE := $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
XORG_FONT_ALIAS_DIR := $(BUILDDIR)/$(XORG_FONT_ALIAS)
XORG_FONT_ALIAS_LICENSE := Vakulenko
+XORG_FONT_ALIAS_LICENSE_FILES := \
+ file://COPYING;md5=bf0158b89be493d523d69d9f29265038
# ----------------------------------------------------------------------------
# Prepare
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] xorg-font-alias: version bump 1.0.3 -> 1.0.5
2025-10-28 9:47 [ptxdist] [PATCH v3] xorg-font-alias: version bump 1.0.3 -> 1.0.5 Sven Püschel
@ 2025-11-07 8:53 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-11-07 8:53 UTC (permalink / raw)
To: ptxdist; +Cc: Sven Püschel
Thanks, applied as a465705de5293cbe2eb57678aaaec574fd952b54.
Michael
[sent from post-receive hook]
On Fri, 07 Nov 2025 09:53:22 +0100, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Release tarballs now use xz instead of bz2.
>
> Regenerated the patch using 'git ptx-patches', as the old patch only
> applied when 'ptxdist --git extract' was used.
>
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251028094849.2117316-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch b/patches/font-alias-1.0.5/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
> similarity index 86%
> rename from patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
> rename to patches/font-alias-1.0.5/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
> index dd20525c300a..9ff62d2330f7 100644
> --- a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
> +++ b/patches/font-alias-1.0.5/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
> @@ -13,13 +13,13 @@ to mainline has yet received no answer.
>
> Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
> ---
> - 100dpi/fonts.alias | 1 +
> - 75dpi/fonts.alias | 1 +
> - misc/fonts.alias | 1 -
> - 3 files changed, 2 insertions(+), 1 deletions(-)
> + 100dpi/fonts.alias | 1 +
> + 75dpi/fonts.alias | 1 +
> + misc/fonts.alias | 1 -
> + 3 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/100dpi/fonts.alias b/100dpi/fonts.alias
> -index 9a4c461..9c5aa7b 100644
> +index 9a4c46168707..9c5aa7b7212f 100644
> --- a/100dpi/fonts.alias
> +++ b/100dpi/fonts.alias
> @@ -1,3 +1,4 @@
> @@ -28,7 +28,7 @@ index 9a4c461..9c5aa7b 100644
> lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
> lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
> diff --git a/75dpi/fonts.alias b/75dpi/fonts.alias
> -index a3d464f..c3f9dd1 100644
> +index a3d464ffc055..c3f9dd1f24f5 100644
> --- a/75dpi/fonts.alias
> +++ b/75dpi/fonts.alias
> @@ -1,3 +1,4 @@
> @@ -37,11 +37,10 @@ index a3d464f..c3f9dd1 100644
> lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1
> lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1
> diff --git a/misc/fonts.alias b/misc/fonts.alias
> -index 0398476..d4c49f2 100644
> +index 732933c9fa7b..ae74934cfb7b 100644
> --- a/misc/fonts.alias
> +++ b/misc/fonts.alias
> -@@ -1,6 +1,5 @@
> - ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
> +@@ -1,5 +1,4 @@
> fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
> -variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
> 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
> diff --git a/patches/font-alias-1.0.3/series b/patches/font-alias-1.0.5/series
> similarity index 100%
> rename from patches/font-alias-1.0.3/series
> rename to patches/font-alias-1.0.5/series
> diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
> index 59df1ff6a41e..decc28185e03 100644
> --- a/rules/xorg-font-alias.make
> +++ b/rules/xorg-font-alias.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias
> #
> # Paths and names
> #
> -XORG_FONT_ALIAS_VERSION := 1.0.3
> -XORG_FONT_ALIAS_MD5 := 6d25f64796fef34b53b439c2e9efa562
> +XORG_FONT_ALIAS_VERSION := 1.0.5
> +XORG_FONT_ALIAS_MD5 := 79f4c023e27d1db1dfd90d041ce89835
> XORG_FONT_ALIAS := font-alias-$(XORG_FONT_ALIAS_VERSION)
> -XORG_FONT_ALIAS_SUFFIX := tar.bz2
> +XORG_FONT_ALIAS_SUFFIX := tar.xz
> XORG_FONT_ALIAS_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX))
> XORG_FONT_ALIAS_SOURCE := $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
> XORG_FONT_ALIAS_DIR := $(BUILDDIR)/$(XORG_FONT_ALIAS)
> XORG_FONT_ALIAS_LICENSE := Vakulenko
> +XORG_FONT_ALIAS_LICENSE_FILES := \
> + file://COPYING;md5=bf0158b89be493d523d69d9f29265038
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-11-07 8:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-28 9:47 [ptxdist] [PATCH v3] xorg-font-alias: version bump 1.0.3 -> 1.0.5 Sven Püschel
2025-11-07 8:53 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox