Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2712 from alihanozturk/master

Browse Source 
libXfont:v.bump
This commit is contained in:
Alihan Öztürk
2017-02-02 20:32:02 +02:00
committed by GitHub
parent 9539ad087e b9a6130bda
commit d83a853e2a
6 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/font/fontconfig/files/0001-fix-test-with-freetype2-2.7.1.patch
+41
View File
@@ -0,0 +1,41 @@
From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 10 Jan 2017 10:01:54 +0100
Subject: [PATCH 1/1] fix test with freetype2 2.7.1
Upstream freetype2 applied a patch from openSuSE [0]:
[pcf] Enrich family name with foundry name and glyph width info.
3576487add2f0e9691e8c43f8b0cd8e61aebf14f
This prepends the foundry name plus a space to the family name. We needs
change the font name in expexted test output.
[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f
Signed-off-by: Christian Hesse <mail@eworm.de>
---
test/out.expected | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/out.expected b/test/out.expected
index 39634c5..f3a8856 100644
--- a/test/out.expected
+++ b/test/out.expected
@@ -1,8 +1,8 @@
-Fixed:pixelsize=16
-Fixed:pixelsize=6
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
=
-Fixed:pixelsize=16
-Fixed:pixelsize=6
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
=
-Fixed:pixelsize=16
-Fixed:pixelsize=6
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
--
2.11.0
desktop/font/fontconfig/pspec.xml
+10 -2
View File
@@ -12,17 +12,18 @@
<IsA>library</IsA>
<Summary>A library for configuring and customizing font access</Summary>
<Description>Fontconfig is a library designed to provide system-wide font configuration, customization and application access.</Description>
<Archive sha1sum="08565feea5a4e6375f9d8a7435dac04e52620ff2" type="tarbz2">http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.1.tar.bz2</Archive>
<Archive sha1sum="30d832b754fb10a3b70ebac750a38a0275438ad8" type="tarbz2">https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2</Archive>
<BuildDependencies>
<Dependency>freetype-devel</Dependency>
<Dependency>expat-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- prefer dejavu over bitstream -->
<Patch level="1">0001-fix-test-with-freetype2-2.7.1.patch</Patch>
<Patch level="1">prefer_dejavu.patch</Patch>
<Patch level="1">anymetrics_urw.patch</Patch>
<Patch level="1">use_legacy_lcdfilter_on_small_monospace.patch</Patch>
<Patch level="1">add_hinting_and_antialiasing_to_proper_fonts.patch</Patch>
<!-- <Patch level="1">add_hinting_and_antialiasing_to_proper_fonts.patch</Patch> -->
<!-- Sleep less in fc-cache -->
<Patch level="1">fontconfig-2.8.0-sleep-less.patch</Patch>
<!-- remove deprecated user conf dir -->
@@ -87,6 +88,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-06-09</Date>
<Version>2.12.1</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-09</Date>
<Version>2.11.1</Version>
x11/library/libXcursor/pspec.xml
+7 -1
View File
@@ -65,7 +65,6 @@
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">libXcursor</Dependency>
<Dependency>libX11-32bit</Dependency>
<Dependency>libXfixes-32bit</Dependency>
<Dependency>libXrender-32bit</Dependency>
@@ -76,6 +75,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.1.14</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.14</Version>
x11/library/libXfont/pspec.xml
+10 -4
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>X.Org Xfont library</Summary>
<Description>libXfont is the Xorg library that allows using various types of fonts.</Description>
<Archive sha1sum="e63a354de5dc2d8cba08d50add1519471412a618" type="tarbz2">mirrors://xorg/individual/lib/libXfont-1.5.1.tar.bz2</Archive>
<Archive sha1sum="a9470774f271622c1b425826d1c8836ed96e4a96" type="tarbz2">mirrors://xorg/individual/lib/libXfont-1.5.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libfontenc-devel</Dependency>
<Dependency>util-macros</Dependency>
@@ -20,7 +20,6 @@
<Dependency>xorg-proto</Dependency>
<Dependency>xtrans</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>freetype-devel</Dependency>
</BuildDependencies>
</Source>
@@ -28,8 +27,8 @@
<Name>libXfont</Name>
<RuntimeDependencies>
<Dependency>libfontenc</Dependency>
<Dependency>zlib</Dependency>
<Dependency>freetype</Dependency>
<Dependency>zlib</Dependency>
<Dependency>freetype</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -52,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.5.2</Version>
<Comment>Version bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.5.1</Version>
x11/library/libXft/pspec.xml
+2 -2
View File
@@ -83,9 +83,9 @@
<History>
<Update release="3">
<Date>2017-01-31</Date>
<Date>2017-02-02</Date>
<Version>2.3.2</Version>
<Comment>Release bump</Comment>
<Comment>Rebuild</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
x11/library/libXrender/pspec.xml
+7 -1
View File
@@ -53,7 +53,6 @@
<Summary>32-bit shared libraries for libXrender</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>libX11-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
@@ -67,6 +66,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-02</Date>
<Version>0.9.10</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-02</Date>
<Version>0.9.10</Version>