From 17c69c4df08a333cfb360e9bff8efd804c6fee54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:11:15 +0000 Subject: [PATCH 01/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xlsfonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlsfonts.spec b/xlsfonts.spec index 2391564..a672d55 100644 --- a/xlsfonts.spec +++ b/xlsfonts.spec @@ -1,7 +1,7 @@ Summary: X font list utility Name: xlsfonts Version: 1.0.7 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: http://www.x.org @@ -37,6 +37,9 @@ xlsfonts lists the fonts available on an X server. %{_mandir}/man1/xlsfonts.1* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 22 2024 Ali Erdinc Koroglu - 1.0.7-6 - Fix RHBZ #2261808 From bcf219083757c8074e5f04601d2bede3b941beab Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:08:14 -0300 Subject: [PATCH 02/12] Convert to %autorelease and %autochangelog --- changelog | 34 ++++++++++++++++++++++++++++++++++ xlsfonts.spec | 39 ++------------------------------------- 2 files changed, 36 insertions(+), 37 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7dc641b --- /dev/null +++ b/changelog @@ -0,0 +1,34 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 22 2024 Ali Erdinc Koroglu - 1.0.7-6 +- Fix RHBZ #2261808 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Apr 4 2022 Ali Erdinc Koroglu - 1.0.7-1 +- New upstream release 1.0.7 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Apr 16 2021 Peter Hutterer - 1.0.6-2 +- Add Obsoletes for xorg-x11-utils +- Use the make_build rpm macro + +* Tue Jan 19 2021 Adam Jackson - 1.0.6-1 +- Initial split packaging (#1918037) + diff --git a/xlsfonts.spec b/xlsfonts.spec index a672d55..0565f74 100644 --- a/xlsfonts.spec +++ b/xlsfonts.spec @@ -1,12 +1,10 @@ Summary: X font list utility Name: xlsfonts Version: 1.0.7 -Release: 7%{?dist} +Release: %autorelease License: MIT URL: http://www.x.org - Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz - # https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/commit/2b9d8f5bac5d Patch0: 2b9d8f5bac5d.patch @@ -37,37 +35,4 @@ xlsfonts lists the fonts available on an X server. %{_mandir}/man1/xlsfonts.1* %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Feb 22 2024 Ali Erdinc Koroglu - 1.0.7-6 -- Fix RHBZ #2261808 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Apr 4 2022 Ali Erdinc Koroglu - 1.0.7-1 -- New upstream release 1.0.7 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Apr 16 2021 Peter Hutterer - 1.0.6-2 -- Add Obsoletes for xorg-x11-utils -- Use the make_build rpm macro - -* Tue Jan 19 2021 Adam Jackson - 1.0.6-1 -- Initial split packaging (#1918037) - +%autochangelog From 7e2bcf5bff9036d3a8c1bf818d12441739024dce Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:12:14 -0300 Subject: [PATCH 03/12] update xlsfonts to 1.0.8 fixes rhbz#2294798 --- sources | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources b/sources index 668f36a..98213fa 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (xlsfonts-1.0.7.tar.xz) = ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0 +SHA512 (xlsfonts-1.0.8.tar.xz) = 401c86d902f173c440c08a22067a51e7238949c8d3c71eba7a8df11955edfec27525c8cbbcf2e96ed444fa20b15f98cf65a01343215d1ed9ba84fce849d02927 +SHA512 (xlsfonts-1.0.8.tar.xz.sig) = b004d91368f48bcdb3ac575a43b8ba844f1828831286e0c904f8fbe73eb298ca4f32a0b83b2dafb6ddcefbb96e82b214959d4d008808624d05cb09ec833fbe40 From 8edfa474d516f620ca93bbc1befed14542c0fb24 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:12:55 -0300 Subject: [PATCH 04/12] update xlsfonts to 1.0.8 fixes rhbz#2294798 --- xlsfonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xlsfonts.spec b/xlsfonts.spec index 0565f74..ebaec60 100644 --- a/xlsfonts.spec +++ b/xlsfonts.spec @@ -1,12 +1,12 @@ Summary: X font list utility Name: xlsfonts -Version: 1.0.7 +Version: 1.0.8 Release: %autorelease License: MIT URL: http://www.x.org Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz # https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/commit/2b9d8f5bac5d -Patch0: 2b9d8f5bac5d.patch +# Patch0: 2b9d8f5bac5d.patch BuildRequires: gcc BuildRequires: make From e8baf3ac7353ed468f792c43837e5a260d57e983 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:14:04 -0300 Subject: [PATCH 05/12] removed upstreamed patches --- 2b9d8f5bac5d.patch | 172 --------------------------------------------- xlsfonts.spec | 3 - 2 files changed, 175 deletions(-) delete mode 100644 2b9d8f5bac5d.patch diff --git a/2b9d8f5bac5d.patch b/2b9d8f5bac5d.patch deleted file mode 100644 index ef54314..0000000 --- a/2b9d8f5bac5d.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 2b9d8f5bac5d2352f8021548b4852014ed683b2c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Tue, 5 Dec 2023 15:41:28 -0800 -Subject: [PATCH] Fix -Wincompatible-pointer-types warning from gcc (issue #1) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -xlsfonts.c: In function ‘get_list’: -xlsfonts.c:204:23: warning: assignment to ‘char **’ from incompatible - pointer type ‘const char **’ [-Wincompatible-pointer-types] - 204 | fonts = &pattern; - | ^ - -v2: Split the open vs. list code to allow preserving the constness -of the argument to get_list, at the cost of less code sharing between -the two paths - -Closes: #1 -Signed-off-by: Alan Coopersmith ---- - xlsfonts.c | 105 ++++++++++++++++++++++++++++++----------------------- - 1 file changed, 59 insertions(+), 46 deletions(-) - -diff --git a/xlsfonts.c b/xlsfonts.c -index b834637..0afc53f 100644 ---- a/xlsfonts.c -+++ b/xlsfonts.c -@@ -58,7 +58,7 @@ static int font_cnt = 0; - static int min_max; - - typedef struct { -- char *name; -+ const char *name; - XFontStruct *info; - } FontList; - -@@ -73,7 +73,7 @@ static int IgnoreError(Display *disp, XErrorEvent *event); - static void PrintProperty(XFontProp *prop); - static void ComputeFontType(XFontStruct *fs); - static void print_character_metrics(register XFontStruct *info); --static void do_query_font(Display *dpy, char *name); -+static void do_query_font(Display *dpy, const char *name); - - void - usage(const char *errmsg) -@@ -191,57 +191,70 @@ main(int argc, char **argv) - static void - get_list(const char *pattern) - { -- int available = nnames + 1, i; -- char **fonts; - XFontStruct *info; - -- /* Get list of fonts matching pattern */ -- for (;;) { -- if (open_instead_of_list) { -- info = XLoadQueryFont(dpy, pattern); -+ if (open_instead_of_list) { -+ info = XLoadQueryFont(dpy, pattern); - -- if (info) { -- fonts = &pattern; -- available = 1; -- XUnloadFont(dpy, info->fid); -- } -- else { -- fonts = NULL; -- } -- break; -+ if (info == NULL) { -+ fprintf(stderr, "%s: pattern \"%s\" unmatched\n", -+ program_name, pattern); -+ return; - } - -- if (long_list == L_MEDIUM) -- fonts = XListFontsWithInfo(dpy, pattern, nnames, &available, &info); -- else -- fonts = XListFonts(dpy, pattern, nnames, &available); -- if (fonts == NULL || available < nnames) -- break; -- if (long_list == L_MEDIUM) -- XFreeFontInfo(fonts, info, available); -- else -- XFreeFontNames(fonts); -- nnames = available * 2; -- } -- -- if (fonts == NULL) { -- fprintf(stderr, "%s: pattern \"%s\" unmatched\n", -- program_name, pattern); -- return; -- } -- -- font_list = realloc(font_list, (font_cnt + available) * sizeof(FontList)); -- if (font_list == NULL) -- Fatal_Error("Out of memory!"); -- for (i = 0; i < available; i++) { -- font_list[font_cnt].name = fonts[i]; -- if (long_list == L_MEDIUM) -- font_list[font_cnt].info = info + i; -- else -+ font_list = realloc(font_list, (font_cnt + 1) * sizeof(FontList)); -+ if (font_list == NULL) -+ Fatal_Error("Out of memory!"); -+ font_list[font_cnt].name = pattern; -+ if (long_list == L_MEDIUM) { -+ font_list[font_cnt].info = info; -+ XUnloadFont(dpy, info->fid); -+ } -+ else { - font_list[font_cnt].info = NULL; -- -+ XFreeFont(dpy, info); -+ } - font_cnt++; - } -+ else { -+ /* Get list of fonts matching pattern */ -+ int available = nnames + 1; -+ char **fonts; -+ -+ for (;;) { -+ if (long_list == L_MEDIUM) -+ fonts = XListFontsWithInfo(dpy, pattern, nnames, &available, -+ &info); -+ else -+ fonts = XListFonts(dpy, pattern, nnames, &available); -+ if (fonts == NULL) { -+ fprintf(stderr, "%s: pattern \"%s\" unmatched\n", -+ program_name, pattern); -+ return; -+ } -+ if (available < nnames) -+ break; -+ if (long_list == L_MEDIUM) -+ XFreeFontInfo(fonts, info, available); -+ else -+ XFreeFontNames(fonts); -+ nnames = available * 2; -+ } -+ -+ font_list = realloc(font_list, -+ (font_cnt + available) * sizeof(FontList)); -+ if (font_list == NULL) -+ Fatal_Error("Out of memory!"); -+ for (int i = 0; i < available; i++) { -+ font_list[font_cnt].name = fonts[i]; -+ if (long_list == L_MEDIUM) -+ font_list[font_cnt].info = info + i; -+ else -+ font_list[font_cnt].info = NULL; -+ -+ font_cnt++; -+ } -+ } - } - - static int -@@ -625,7 +638,7 @@ print_character_metrics(register XFontStruct *info) - } - - static void --do_query_font(Display *display, char *name) -+do_query_font(Display *display, const char *name) - { - register int i; - register XFontStruct *info = XLoadQueryFont(display, name); --- -GitLab - diff --git a/xlsfonts.spec b/xlsfonts.spec index ebaec60..ecdf540 100644 --- a/xlsfonts.spec +++ b/xlsfonts.spec @@ -5,9 +5,6 @@ Release: %autorelease License: MIT URL: http://www.x.org Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz -# https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/commit/2b9d8f5bac5d -# Patch0: 2b9d8f5bac5d.patch - BuildRequires: gcc BuildRequires: make BuildRequires: gettext-devel From 3ff662dabc3310b86713ad12466bbda2f0dba4b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:58:32 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3814fe826ca7acb100a7cc9e846638cfd9ecef47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:54:42 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9d60c795e1a51ed22d91ff7c5cc30b5128254a32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:44:20 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d1d4570b28860e66484803151ba85ab85055176c Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Fri, 10 Jul 2026 00:54:26 -0300 Subject: [PATCH 09/12] update to 1.0.9 fixes rhbz#2497950 switch from autotools to meson build system Signed-off-by: Filipe Rosset --- sources | 3 +-- xlsfonts.spec | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sources b/sources index 98213fa..6946991 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (xlsfonts-1.0.8.tar.xz) = 401c86d902f173c440c08a22067a51e7238949c8d3c71eba7a8df11955edfec27525c8cbbcf2e96ed444fa20b15f98cf65a01343215d1ed9ba84fce849d02927 -SHA512 (xlsfonts-1.0.8.tar.xz.sig) = b004d91368f48bcdb3ac575a43b8ba844f1828831286e0c904f8fbe73eb298ca4f32a0b83b2dafb6ddcefbb96e82b214959d4d008808624d05cb09ec833fbe40 +SHA512 (xlsfonts-1.0.9.tar.xz) = c08d8ad107eabcd8ffc2653de172b2b3192c3823890e95feb226c5689335b8cb3d8d3a78168f62f07b7f84bf55b1cf8e2230df2fed1c414a56f36cfa150224b1 diff --git a/xlsfonts.spec b/xlsfonts.spec index ecdf540..d46adf5 100644 --- a/xlsfonts.spec +++ b/xlsfonts.spec @@ -1,16 +1,14 @@ Summary: X font list utility Name: xlsfonts -Version: 1.0.8 +Version: 1.0.9 Release: %autorelease License: MIT -URL: http://www.x.org -Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz +URL: https://www.x.org +Source: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz BuildRequires: gcc -BuildRequires: make -BuildRequires: gettext-devel -BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig(x11) -Obsoletes: xorg-x11-utils < 7.5-39 +BuildRequires: pkgconfig(xproto) %description xlsfonts lists the fonts available on an X server. @@ -19,11 +17,14 @@ xlsfonts lists the fonts available on an X server. %autosetup -p1 %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install + +%check +%meson_test %files %doc README.md From 698a613df37219d3d90c6f56c84fd3a83729304e Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Fri, 10 Jul 2026 00:57:40 -0300 Subject: [PATCH 10/12] opt-in to packit for rawhide Signed-off-by: Filipe Rosset --- .packit.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..c0a5f29 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: xlsfonts.spec + +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_committers: ['packit','all_admins'] + dist_git_branches: + - fedora-rawhide + From 5c7f438e2a1e99a63f0aec25017656125da9da37 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Fri, 10 Jul 2026 01:00:03 -0300 Subject: [PATCH 11/12] fix sources Signed-off-by: Filipe Rosset --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 6946991..aabbafd 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (xlsfonts-1.0.9.tar.xz) = c08d8ad107eabcd8ffc2653de172b2b3192c3823890e95feb226c5689335b8cb3d8d3a78168f62f07b7f84bf55b1cf8e2230df2fed1c414a56f36cfa150224b1 +SHA512 (xlsfonts-1.0.9.tar.xz.sig) = 906d809665b8b57016fba45e33e6623101bd46fcb2f5a635247af2766afdcd3f48817549bc5dbe9a6490b5896f65bd2e306aad445513ddc5aa2d27152d565324 From 7fa74cf0d6cb1bb04afd0353d66ab37e0acf1600 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:17:11 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild