Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fe69e0ea05 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/libXft-2.3.3.tar.bz2
|
libXft-2.3.8.tar.xz
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
48f543fe495f545df1794fa36a0a708558ae298c SOURCES/libXft-2.3.3.tar.bz2
|
|
||||||
33
fix_font_loading.patch
Normal file
33
fix_font_loading.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From be61145144f61674d1c3e6130fabf3a63d9c6529 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Thomas E. Dickey" <dickey@invisible-island.net>
|
||||||
|
Date: Sun, 30 Apr 2023 20:19:04 -0400
|
||||||
|
Subject: [PATCH] issue 19: Problem loading "SourceCodePro-Regular" font in
|
||||||
|
Fedora
|
||||||
|
|
||||||
|
Ignore face flag FT_FACE_FLAG_COLOR if FT_FACE_FLAG_SVG is set,
|
||||||
|
allowing adobe-source-code-pro font to work.
|
||||||
|
|
||||||
|
This bug was introduced by a change in freetype2 #1151,
|
||||||
|
62bc04f4c5b4369cc493ff24b1de27aabd79e0c6
|
||||||
|
|
||||||
|
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
|
||||||
|
---
|
||||||
|
src/xftfreetype.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/xftfreetype.c b/src/xftfreetype.c
|
||||||
|
index b91f8f4..9fa91db 100644
|
||||||
|
--- a/src/xftfreetype.c
|
||||||
|
+++ b/src/xftfreetype.c
|
||||||
|
@@ -849,7 +849,7 @@ XftFontOpenInfo (Display *dpy,
|
||||||
|
if (!(face->face_flags & FT_FACE_FLAG_SCALABLE))
|
||||||
|
antialias = FcFalse;
|
||||||
|
|
||||||
|
- color = FT_HAS_COLOR(face) ? FcTrue : FcFalse;
|
||||||
|
+ color = (FT_HAS_COLOR(face) && !FT_HAS_SVG(face)) ? FcTrue : FcFalse;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Find the appropriate picture format
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
@ -1,13 +1,18 @@
|
|||||||
Summary: X.Org X11 libXft runtime library
|
Summary: X.Org X11 libXft runtime library
|
||||||
Name: libXft
|
Name: libXft
|
||||||
Version: 2.3.3
|
Version: 2.3.8
|
||||||
Release: 1%{?dist}
|
Release: 8%{?dist}
|
||||||
License: MIT
|
License: HPND-sell-variant
|
||||||
Group: System Environment/Libraries
|
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
|
|
||||||
Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
|
Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
# Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=2154735
|
||||||
|
# Upstream issue: https://gitlab.freedesktop.org/xorg/lib/libxft/-/issues/19
|
||||||
|
# Upstream fix: https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/26
|
||||||
|
Patch: fix_font_loading.patch
|
||||||
|
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: xorg-x11-util-macros
|
BuildRequires: xorg-x11-util-macros
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
BuildRequires: pkgconfig(xrender)
|
BuildRequires: pkgconfig(xrender)
|
||||||
@ -21,14 +26,13 @@ X.Org X11 libXft runtime library
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: X.Org X11 libXft development package
|
Summary: X.Org X11 libXft development package
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
X.Org X11 libXft development package
|
X.Org X11 libXft development package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -v --install --force
|
autoreconf -v --install --force
|
||||||
@ -57,12 +61,77 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
|||||||
%{_includedir}/X11/Xft/XftCompat.h
|
%{_includedir}/X11/Xft/XftCompat.h
|
||||||
%{_libdir}/libXft.so
|
%{_libdir}/libXft.so
|
||||||
%{_libdir}/pkgconfig/xft.pc
|
%{_libdir}/pkgconfig/xft.pc
|
||||||
%{_mandir}/man3/Xft.3*
|
%{_mandir}/man3/Xft*.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 03 2020 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2.3.3-1
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.3.8-8
|
||||||
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.3.8-7
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Sep 06 2023 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2.3.8-4
|
||||||
|
- SPDX Migration
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue May 02 2023 Lumír Balhar <lbalhar@redhat.com> - 2.3.8-2
|
||||||
|
- Fix font loading
|
||||||
|
Resolves: rhbz#2154735
|
||||||
|
|
||||||
|
* Mon Apr 24 2023 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2.3.8-1
|
||||||
|
- libXft 2.3.8-1
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Nov 04 2022 Benjamin Tissoires <benjamin.tissoires@redhat.com> 2.3.6-1
|
||||||
|
- libXft 2.3.6-1
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Sep 21 2021 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2.3.4-1
|
||||||
|
- libXft 2.3.4
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 5 11:25:22 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 2.3.3-5
|
||||||
|
- Add BuildRequires for make
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 20 2019 Adam Jackson <ajax@redhat.com> - 2.3.3-1
|
||||||
- libXft 2.3.3
|
- libXft 2.3.3
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 2.3.2-10
|
* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 2.3.2-10
|
||||||
- Drop useless %%defattr
|
- Drop useless %%defattr
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user