OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
Browse Source

fontconfig: Updated (2.8.0 -> 2.11.1)

master
Nagy Károly Gábriel 9 years ago
parent
13cbe02eb3
commit
1c7ca40a4e
4 changed files with 5 additions and 77 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -45
      xorg/fontconfig/default-fontpath.patch
  2. +2
    -2
      xorg/fontconfig/fontconfig.conf
  3. +3
    -3
      xorg/fontconfig/fontconfig.desc
  4. +0
    -27
      xorg/fontconfig/libdir_fc_cache_test.patch

+ 0
- 45
xorg/fontconfig/default-fontpath.patch
View File

@ -1,45 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../fontconfig/default-fontpath.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Do not leave the default FC_FONTPATH undefined.
- Bart Kreska <wytnijto@smlw.pl> (Rage Against Gravity)
- Rene Rebe <rene@exactcode.de>
--- fontconfig-2.3.93/configure.in.orig 2006-02-01 17:44:59.873780384 +0000
+++ fontconfig-2.3.93/configure.in 2006-02-01 18:48:52.103192960 +0000
@@ -385,6 +385,9 @@
case "$FC_ADD_FONTS" in
"")
+ # If no font directories were found, then X11 is probably
+ # not installed yet. Define default X11 font path
+ FC_FONTPATH="<dir>/usr/X11/lib/X11/fonts</dir>"
;;
*)
FC_FONTPATH=`echo $FC_ADD_FONTS |
--- fontconfig-2.3.93/configure 2005-12-21 04:43:42.000000000 +0100
+++ fontconfig-2.3.93-fixed/configure 2006-02-02 12:15:35.000000000 +0100
@@ -22476,6 +22476,9 @@
case "$FC_ADD_FONTS" in
"")
+ # If no font directories were found, then X11 is probably
+ # not installed yet. Define default X11 font path
+ FC_FONTPATH="<dir>/usr/X11/lib/X11/fonts</dir>"
;;
*)
FC_FONTPATH=`echo $FC_ADD_FONTS |

+ 2
- 2
xorg/fontconfig/fontconfig.conf
View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../fontconfig/fontconfig.conf # Filename: package/.../fontconfig/fontconfig.conf
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2008 - 2015 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -27,5 +27,5 @@ if atstage cross; then
} }
hook_add premake 3 'make_helpers' hook_add premake 3 'make_helpers'
fi fi
hook_add preconf 9 'autoreconf -vif'
hook_add postmake 5 "cp -fv $confdir/fonts-local $root/etc/fonts/local.conf" hook_add postmake 5 "cp -fv $confdir/fonts-local $root/etc/fonts/local.conf"

+ 3
- 3
xorg/fontconfig/fontconfig.desc
View File

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../fontconfig/fontconfig.desc [COPY] Filename: package/.../fontconfig/fontconfig.desc
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2015 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] [COPY]
[COPY] More information can be found in the files COPYING and README. [COPY] More information can be found in the files COPYING and README.
@ -26,7 +26,7 @@
[L] OpenSource [L] OpenSource
[S] Stable [S] Stable
[V] 2.8.0
[V] 2.11.1
[P] X -?---5---9 112.400 [P] X -?---5---9 112.400
[D] 419652651 fontconfig-2.8.0.tar.gz http://www.fontconfig.org/release/
[D] 3534115283 fontconfig-2.11.1.tar.gz http://www.fontconfig.org/release/

+ 0
- 27
xorg/fontconfig/libdir_fc_cache_test.patch
View File

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../fontconfig/libdir_fc_cache_test.patch
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.in.orig 2008-09-02 08:07:04.000000000 -0400
+++ ./Makefile.in 2008-09-02 08:07:51.000000000 -0400
@@ -803,7 +803,7 @@
fi; fi
@(if $(RUN_FC_CACHE_TEST); then \
echo " $(bindir)/fc-cache -s -f -v"; \
- $(bindir)/fc-cache -s -f -v; \
+ LD_LIBRARY_PATH=$(libdir):$$LD_LIBRARY_PATH $(bindir)/fc-cache -s -f -v; \
else \
echo "***"; \
echo "*** Warning: fonts.cache not built"; \

Write Preview
Loading…
Cancel
Save