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

Merge pull request #7252 from Rmys/master

Browse Source 
fontconfig:ver. bump symlinks fix
This commit is contained in:
Rmys
2019-11-09 22:08:51 +03:00
committed by GitHub
parent 5de21261aa 1c521a1cfe
commit fe2062c790
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/font/fontconfig/actions.py
+4 -1
View File
@@ -10,6 +10,8 @@ from pisi.actionsapi import libtools
from pisi.actionsapi import get from pisi.actionsapi import get
def setup(): def setup():
#Make sure the system regenerates src/fcobjshash.h.
shelltools.system("rm -rf src/fcobjshash.h")
# Do not rebuild docs # Do not rebuild docs
shelltools.export("HASDOCBOOK", "no") shelltools.export("HASDOCBOOK", "no")
@@ -35,7 +37,8 @@ def install():
disabled_configs = ("10-no-sub-pixel.conf",) disabled_configs = ("10-no-sub-pixel.conf",)
for cfg in enabled_configs: for cfg in enabled_configs:
pisitools.dosym("../conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg) pisitools.dosym("/usr/share/fontconfig/conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg)
#pisitools.dosym("../conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg)
for cfg in disabled_configs: for cfg in disabled_configs:
pisitools.remove("/usr/share/fontconfig/conf.avail/%s" % cfg) pisitools.remove("/usr/share/fontconfig/conf.avail/%s" % cfg)
desktop/font/fontconfig/pspec.xml
+11 -4
View File
@@ -21,7 +21,7 @@
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- prefer dejavu over bitstream --> <!-- prefer dejavu over bitstream -->
<Patch level="1">0001-fix-test-with-freetype2-2.7.1.patch</Patch> <!-- <Patch level="1">0001-fix-test-with-freetype2-2.7.1.patch</Patch> -->
<Patch level="1">prefer_dejavu.patch</Patch> <Patch level="1">prefer_dejavu.patch</Patch>
<!-- <Patch level="1">anymetrics_urw.patch</Patch> --> <!-- <Patch level="1">anymetrics_urw.patch</Patch> -->
<Patch level="1">use_legacy_lcdfilter_on_small_monospace.patch</Patch> <Patch level="1">use_legacy_lcdfilter_on_small_monospace.patch</Patch>
@@ -30,9 +30,9 @@
<Patch level="1">fontconfig-2.8.0-sleep-less.patch</Patch> <Patch level="1">fontconfig-2.8.0-sleep-less.patch</Patch>
<!-- remove deprecated user conf dir --> <!-- remove deprecated user conf dir -->
<Patch level="0">deprecated-user-conf.patch</Patch> <Patch level="0">deprecated-user-conf.patch</Patch>
<Patch level="1">fontconfig-const-name-in-range.patch</Patch> <!-- <Patch level="1">fontconfig-const-name-in-range.patch</Patch> -->
<Patch level="1">fontconfig-implicit-object-for-const-name.patch</Patch> <!-- <Patch level="1">fontconfig-implicit-object-for-const-name.patch</Patch> -->
<Patch level="1">fontconfig-locale.patch</Patch> <!-- <Patch level="1">fontconfig-locale.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -97,6 +97,13 @@
</Package> </Package>
<History> <History>
<Update release="8">
<Date>2019-11-09</Date>
<Version>2.13.1</Version>
<Comment>Version Bump symlinks fix</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="7"> <Update release="7">
<Date>2018-07-30</Date> <Date>2018-07-30</Date>
<Version>2.13.0</Version> <Version>2.13.0</Version>