packages/xorg-x11-fonts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:ccf3d01e882d8a96c4711ca990d590d84685f120
Branches Tags
packages:main
...
compare: packages:9f10e6ab5fe4b4acedc1decdfaf4b5b9ced4e66f
Branches Tags
packages:main

11 Commits
ccf3d01e88 ... 9f10e6ab5f

Author SHA1 Message Date
openeuler-ci-bot
9f10e6ab5f
!23 Add version for provides and obsoletes, replace tabs with spaces 
From: @ultra_planet 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
 2024-09-04 03:41:07 +00:00
lingsheng
a07c6baf65 Add version for provides and obsoletes, replace tabs with spaces 2024-09-03 07:23:04 +00:00
openeuler-ci-bot
b87ba84c42
!10 fix license 
From: @xinghe_1 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
 2024-06-17 01:55:15 +00:00
xh
8a303e70b6 fix license 2024-06-14 06:32:18 +00:00
openeuler-ci-bot
f64f4f6d5f !3 remove OTF fonts 
Merge pull request !3 from Anonymous_Z/anonymous_z
 2020-02-26 16:30:24 +08:00
zhanglu
62c60bd3ad remove OTF fonts 2020-02-06 23:40:36 +08:00
zhanglu
07a1369c7f remove OTF fonts 2020-02-06 22:40:52 +08:00
openeuler-ci-bot
e65b120daf !2 remove ethiopic TTF fonts 
Merge pull request !2 from sugarfillet/master
 2020-01-19 19:18:17 +08:00
sugarfillet
bfc04db552 remove ethiopic TTF fonts 2020-01-16 16:53:36 +08:00
openeuler-ci-bot
ceeef51802 !1 optimization the spec 
Merge pull request !1 from huzunhao/master
 2020-01-11 18:23:11 +08:00
songnannan
64fd075a5d optimization the spec 2020-01-09 15:34:15 +08:00
4 changed files with 84 additions and 118 deletions
Show Stats Expand all files Collapse all files

42
0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch
View File

@ -1,42 +0,0 @@
From 1cc96f25aff9898a93f2a575d9f6c57574da042f Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Thu, 23 Oct 2014 12:57:43 +0200
Subject: [PATCH font/encodings] jisx0201.1976-0.enc: Add undefined mapping for
0x7f - 0xa0 range
The jisx0201 encoding has a hole in it in the 0x7f - 0xa0 range, see:
http://en.wikipedia.org/wiki/JIS_X_0201
The document for the format of the encoding files says:
"Codes not listed are assumed to map through the identity (i.e. to the same
numerical value). In order to override this default mapping, you may specify
a range of codes to be undefined by using an `UNDEFINE' line"
jisx0201.1976-0.enc was not doing this, causing all the codes on the range
to be mapped 1:1. This specifically is causing problems for ttmkfdir, which
checks that a font covers (most of) an encoding before adding a line for that
encoding to fonts.scale, and the hole not properly being undefined causes
this check to fail for atleast the Sazanami fonts.
Cc: Akira TAGOH <tagoh@redhat.com>
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1009350
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
large/jisx0201.1976-0.enc | 1 +
1 file changed, 1 insertion(+)
diff --git a/large/jisx0201.1976-0.enc b/large/jisx0201.1976-0.enc
index 915d50c..328bc7a 100644
--- a/large/jisx0201.1976-0.enc
+++ b/large/jisx0201.1976-0.enc
@@ -68,6 +68,7 @@ ENDMAPPING
STARTMAPPING unicode
0x5C 0x00A5 # YEN SIGN
0x7E 0x203E # OVERLINE
+UNDEFINE 0x7F 0xA0
0x00A1 0x00DF 0xFF61
ENDMAPPING
STARTMAPPING cmap 1 1
--
2.1.0

BIN
encodings-1.0.4.tar.bz2
View File

Binary file not shown.

BIN
encodings-1.0.5.tar.bz2 Normal file
View File

Binary file not shown.

154
xorg-x11-fonts.spec
View File

@ -4,13 +4,13 @@
Summary: X.Org X11 fonts Summary: X.Org X11 fonts
Name: xorg-x11-fonts Name: xorg-x11-fonts
Version: 7.5 Version: 7.5
Release: 21 Release: 26
License: MIT and Lucida and Public Domain License: MIT and Lucida-Bitmap-Fonts and Public Domain
URL: http://www.x.org URL: http://www.x.org
BuildArch: noarch BuildArch: noarch
Source0: http://www.x.org/pub/individual/font/encodings-1.0.4.tar.bz2 Source0: http://www.x.org/pub/individual/font/encodings-1.0.5.tar.bz2
Source1: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 Source1: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
Source2: http://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 Source2: http://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
Source3: http://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 Source3: http://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
@ -43,28 +43,26 @@ Source29: http://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2
Source30: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 Source30: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
Source31: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2 Source31: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2
Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch
BuildRequires: bdftopcf font-util >= 1.1.0 pkgconfig(xorg-macros) >= 1.3 ucs2any BuildRequires: bdftopcf font-util >= 1.1.0 pkgconfig(xorg-macros) >= 1.3 ucs2any
Requires(post): fontconfig mkfontdir Requires(post): fontconfig mkfontdir
Requires(postun): fontconfig mkfontdir Requires(postun): fontconfig mkfontdir
Obsoletes: xorg-x11-fonts-base Provides: xorg-x11-fonts-base = %{version}-%{release}
Obsoletes: xorg-x11-fonts-misc Provides: xorg-x11-fonts-misc = %{version}-%{release}
Obsoletes: xorg-x11-fonts-75dpi Provides: xorg-x11-fonts-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-100dpi Provides: xorg-x11-fonts-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-1-75dpi Provides: xorg-x11-fonts-ISO8859-1-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-1-100dpi Provides: xorg-x11-fonts-ISO8859-1-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-15-100dpi Provides: xorg-x11-fonts-ISO8859-15-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-base Obsoletes: xorg-x11-fonts-base < %{version}-%{release}
Provides: xorg-x11-fonts-misc Obsoletes: xorg-x11-fonts-misc < %{version}-%{release}
Provides: xorg-x11-fonts-75dpi Obsoletes: xorg-x11-fonts-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-100dpi Obsoletes: xorg-x11-fonts-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-1-75dpi Obsoletes: xorg-x11-fonts-ISO8859-1-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-1-100dpi Obsoletes: xorg-x11-fonts-ISO8859-1-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-15-100dpi Obsoletes: xorg-x11-fonts-ISO8859-15-100dpi < %{version}-%{release}
%description %description
X.Org X Window System fonts. This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic X.Org X Window System fonts. This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
@ -77,30 +75,29 @@ Contains a set of 100dpi fonts in the ISO8859-15 encoding which provide Euro sup
%package others %package others
Summary: Other X.Org X11 fonts Summary: Other X.Org X11 fonts
Requires(post): fontconfig mkfontdir mkfontscale ttmkfdir Requires(post): fontconfig mkfontdir mkfontscale
Requires(postun): fontconfig mkfontdir mkfontscale ttmkfdir Requires(postun): fontconfig mkfontdir mkfontscale
Obsoletes: xorg-x11-fonts-cyrillic Provides: xorg-x11-fonts-cyrillic = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ethiopic Provides: xorg-x11-fonts-Type1 = %{version}-%{release}
Obsoletes: xorg-x11-fonts-Type1 Provides: xorg-x11-fonts-ISO8859-14-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-14-75dpi Provides: xorg-x11-fonts-ISO8859-14-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-14-100dpi Provides: xorg-x11-fonts-ISO8859-15-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-15-75dpi Provides: xorg-x11-fonts-ISO8859-2-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-2-75dpi Provides: xorg-x11-fonts-ISO8859-2-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-2-100dpi Provides: xorg-x11-fonts-ISO8859-9-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi Provides: xorg-x11-fonts-ISO8859-9-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi
Provides: xorg-x11-fonts-cyrillic Obsoletes: xorg-x11-fonts-cyrillic < %{version}-%{release}
Provides: xorg-x11-fonts-ethiopic Obsoletes: xorg-x11-fonts-ethiopic < %{version}-%{release}
Provides: xorg-x11-fonts-Type1 Obsoletes: xorg-x11-fonts-Type1 < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-14-75dpi Obsoletes: xorg-x11-fonts-ISO8859-14-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-14-100dpi Obsoletes: xorg-x11-fonts-ISO8859-14-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-15-75dpi Obsoletes: xorg-x11-fonts-ISO8859-15-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-2-75dpi Obsoletes: xorg-x11-fonts-ISO8859-2-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-2-100dpi Obsoletes: xorg-x11-fonts-ISO8859-2-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-9-75dpi Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-9-100dpi Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi < %{version}-%{release}
%description others %description others
This package includes other X.Org X Window System fonts. This package includes other X.Org X Window System fonts.
@ -121,9 +118,6 @@ Contains a set of Cyrillic fonts.
%prep %prep
%setup -q -c xorg-x11-fonts-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 %setup -q -c xorg-x11-fonts-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31
pushd encodings-*
%patch1 -p1
popd
%build %build
{ {
@ -189,9 +183,6 @@ done
%postun %postun
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc
fi
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi
fi fi
@ -202,8 +193,6 @@ done
%post others %post others
{ {
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF
xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF
xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1 xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi
@ -212,14 +201,6 @@ done
%postun others %postun others
{ {
FONTDIR=%{_x11fontdir}/TTF
if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir $FONTDIR
fi
FONTDIR=%{_x11fontdir}/OTF
if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR
fi
FONTDIR=%{_x11fontdir}/Type1 FONTDIR=%{_x11fontdir}/Type1
if [ "$1" = "0" -a -d $FONTDIR ]; then if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR xorg-x11-fonts-update-dirs $FONTDIR
@ -365,22 +346,22 @@ done
%{_x11fontdir}/100dpi/lut[BR]S??-ISO8859-15.pcf* %{_x11fontdir}/100dpi/lut[BR]S??-ISO8859-15.pcf*
%files others %files others
%{_catalogue}/xorg-x11-fonts-TTF %exclude %{_catalogue}/xorg-x11-fonts-TTF
%{_catalogue}/xorg-x11-fonts-OTF %exclude %{_catalogue}/xorg-x11-fonts-OTF
%dir %{_x11fontdir}/TTF %exclude %dir %{_x11fontdir}/TTF
%{_x11fontdir}/TTF/GohaTibebZemen.ttf %exclude %{_x11fontdir}/TTF/GohaTibebZemen.ttf
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/encodings.dir %exclude %{_x11fontdir}/TTF/encodings.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.dir %exclude %{_x11fontdir}/TTF/fonts.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.alias %exclude %{_x11fontdir}/TTF/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.scale %exclude %{_x11fontdir}/TTF/fonts.scale
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.cache-* %exclude %{_x11fontdir}/TTF/fonts.cache-*
%dir %{_x11fontdir}/OTF %exclude %dir %{_x11fontdir}/OTF
%{_x11fontdir}/OTF/GohaTibebZemen.otf %exclude %{_x11fontdir}/OTF/GohaTibebZemen.otf
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/encodings.dir %exclude %{_x11fontdir}/OTF/encodings.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.dir %exclude %{_x11fontdir}/OTF/fonts.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.alias %exclude %{_x11fontdir}/OTF/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.scale %exclude %{_x11fontdir}/OTF/fonts.scale
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.cache-* %exclude %{_x11fontdir}/OTF/fonts.cache-*
%{_catalogue}/xorg-x11-fonts-cyrillic %{_catalogue}/xorg-x11-fonts-cyrillic
%dir %{_x11fontdir}/cyrillic %dir %{_x11fontdir}/cyrillic
@ -546,5 +527,32 @@ done
%{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf* %{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf*
%changelog %changelog
* Thu Aug 01 2024 lingsheng <lingsheng1@h-partners.com> - 7.5-26
- Add version for provides and obsoletes, replace tabs with spaces
* Fri Jun 14 2024 xinghe <xinghe2@h-partners.com> - 7.5-25
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:fix license
* Thu Feb 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 7.5-24
- Type:enhancement
- Id:NA
- SUG:NA
- DESC: remove ethiopic OTF fonts
* Thu Jan 16 2020 Shuaishuai Song <songshuaishuai2@openeuler.org> - 7.5-23
- Type:enhancement
- Id:NA
- SUG:NA
- DESC: remove ethiopic TTF fonts
* Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 7.5-22
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:update encodings version to 1.0.5
* Thu Sep 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.5-21 * Thu Sep 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.5-21
- Package init - Package init