Skip to content
This repository has been archived by the owner on Mar 1, 2019. It is now read-only.

Commit

Permalink
2.11.94 version & patch upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
@bohoomil
bohoomil committed Mar 29, 2016
1 parent 909014a commit 751d9ae
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 16,454 deletions.
16,151 changes: 0 additions & 16,151 deletions fontconfig_patches/00-upstream_2.11.93.patch
View file

This file was deleted.

24 changes: 13 additions & 11 deletions fontconfig_patches/01-configure.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- a/configure 2014-03-24 07:04:16.000000000 +0100
+++ b/configure 2015-03-18 21:26:18.805031769 +0100
--- a/configure 2015-06-02 10:33:38.000000000 +0200
+++ b/configure 2016-03-29 04:40:06.331325596 +0200
@@ -655,6 +655,7 @@ XMLDIR
CONFIGDIR
BASECONFIGDIR
Expand All @@ -8,15 +8,15 @@
FC_FONTDATE
FC_CACHEDIR
fc_cachedir
@@ -833,6 +834,7 @@ with_default_fonts
@@ -842,6 +843,7 @@ with_default_fonts
with_add_fonts
with_cache_dir
with_templatedir
+with_templateinfdir
with_baseconfigdir
with_configdir
with_xmldir
@@ -1518,6 +1520,10 @@ Optional Packages:
@@ -1528,6 +1530,10 @@ Optional Packages:
[default=LOCALSTATEDIR/cache/fontconfig]
--with-templatedir=DIR Use DIR to store the configuration template files
[default=DATADIR/fontconfig/conf.avail]
Expand All @@ -27,7 +27,7 @@
--with-baseconfigdir=DIR
Use DIR to store the base configuration files
[default=SYSCONFDIR/fonts]
@@ -14856,6 +14862,12 @@ else
@@ -15183,6 +15189,12 @@ else
templatedir=yes
fi

Expand All @@ -40,7 +40,7 @@

# Check whether --with-baseconfigdir was given.
if test "${with_baseconfigdir+set}" = set; then :
@@ -14888,6 +14900,13 @@ no|yes)
@@ -15215,6 +15227,13 @@ no|yes)
*)
;;
esac
Expand All @@ -54,20 +54,22 @@
case "$baseconfigdir" in
no|yes)
baseconfigdir='${sysconfdir}'/fonts
@@ -14911,6 +14930,7 @@ no|yes)
@@ -15238,6 +15257,7 @@ no|yes)
esac

TEMPLATEDIR=${templatedir}
+TEMPLATEINFDIR=${templateinfdir}
BASECONFIGDIR=${baseconfigdir}
CONFIGDIR=${configdir}
XMLDIR=${xmldir}
@@ -15939,7 +15959,7 @@ _ACEOF
@@ -16301,8 +16321,8 @@ _ACEOF



-ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
+ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile src/Makefile conf.d/Makefile conf.d.infinality/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"

-ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-blanks/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
-
+ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-blanks/Makefile fc-case/Makefile src/Makefile conf.d/Makefile conf.d.infinality/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
4 changes: 2 additions & 2 deletions fontconfig_patches/02-configure.ac.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- a/configure.ac 2015-03-18 21:12:24.000000000 +0100
+++ b/configure.ac 2015-03-18 21:35:29.224165540 +0100
--- a/configure.ac 2015-06-02 10:33:03.000000000 +0200
+++ b/configure.ac 2016-03-29 04:42:20.964043231 +0200
@@ -520,9 +520,14 @@ AC_SUBST(FC_FONTDATE)

AC_ARG_WITH(templatedir,
Expand Down
90 changes: 45 additions & 45 deletions fontconfig_patches/03-Makefile.in.patch
View file
Original file line number Diff line number Diff line change
@@ -1,146 +1,146 @@
--- a/doc/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/doc/Makefile.in 2015-03-18 21:40:52.932671653 +0100
@@ -514,6 +514,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-blanks/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-blanks/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -273,6 +273,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-cache/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-cache/Makefile.in 2015-03-18 21:43:52.937006196 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-cache/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-cache/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-case/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-case/Makefile.in 2015-03-18 21:45:27.227510005 +0100
@@ -283,6 +283,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-case/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-case/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -299,6 +299,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-cat/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-cat/Makefile.in 2015-03-18 21:46:51.928365449 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-cat/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-cat/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-glyphname/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-glyphname/Makefile.in 2015-03-18 21:47:41.240280146 +0100
@@ -283,6 +283,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-glyphname/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-glyphname/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -299,6 +299,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-lang/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-lang/Makefile.in 2015-03-18 21:49:04.774578565 +0100
@@ -283,6 +283,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-lang/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-lang/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -299,6 +299,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-list/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-list/Makefile.in 2015-03-18 21:51:13.704329503 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-list/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-list/Makefile.in 2016-03-29 04:45:09.437481817 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-match/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-match/Makefile.in 2015-03-18 21:52:26.998992338 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-match/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-match/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-pattern/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-pattern/Makefile.in 2015-03-18 21:53:13.907720435 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-pattern/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-pattern/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-query/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-query/Makefile.in 2015-03-18 21:54:35.288864307 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-query/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-query/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-scan/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-scan/Makefile.in 2015-03-18 21:55:11.414565316 +0100
@@ -318,6 +318,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-scan/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-scan/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -333,6 +333,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fc-validate/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fc-validate/Makefile.in 2015-03-18 21:55:50.673519841 +0100
@@ -320,6 +320,7 @@ SET_MAKE = @SET_MAKE@
--- a/fc-validate/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fc-validate/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -335,6 +335,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/fontconfig/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/fontconfig/Makefile.in 2015-03-18 21:56:36.035649892 +0100
@@ -261,6 +261,7 @@ SET_MAKE = @SET_MAKE@
--- a/fontconfig/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/fontconfig/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -277,6 +277,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/src/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/src/Makefile.in 2015-03-18 21:57:16.651243142 +0100
@@ -331,6 +331,7 @@ SET_MAKE = @SET_MAKE@
--- a/src/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/src/Makefile.in 2016-03-29 04:45:09.440815218 +0200
@@ -348,6 +348,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
+TEMPLATEINFDIR = @TEMPLATEINFDIR@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMLDIR = @XMLDIR@
--- a/test/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/test/Makefile.in 2015-03-18 21:57:59.763440840 +0100
@@ -472,6 +472,7 @@ SET_MAKE = @SET_MAKE@
--- a/test/Makefile.in 2015-06-02 10:33:37.000000000 +0200
+++ b/test/Makefile.in 2016-03-29 04:45:09.444148620 +0200
@@ -497,6 +497,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATEDIR = @TEMPLATEDIR@
Expand Down
86 changes: 11 additions & 75 deletions fontconfig_patches/04-Makefile.conf.d.patch
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,15 @@
--- a/conf.d/Makefile.am 2014-01-20 09:14:19.000000000 +0100
+++ b/conf.d/Makefile.am 2015-03-18 22:01:22.228445576 +0100
@@ -21,26 +21,9 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.

-BUILT_SOURCES = README
-DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)

-CONF_LINKS = \
- 10-scale-bitmap-fonts.conf \
- 20-unhint-small-vera.conf \
- 30-urw-aliases.conf \
- 30-metric-aliases.conf \
- 40-nonlatin.conf \
- 45-latin.conf \
- 49-sansserif.conf \
- 50-user.conf \
- 51-local.conf \
- 60-latin.conf \
- 65-fonts-persian.conf \
- 65-nonlatin.conf \
- 69-unifont.conf \
- 80-delicious.conf \
- 90-synthetic.conf
+CONF_LINKS =

EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
CLEANFILES = $(DOC_FILES)
@@ -80,24 +63,4 @@ template_DATA = \
80-delicious.conf \
90-synthetic.conf

-README: $(srcdir)/README.in
- sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
-
-install-data-hook:
- mkdir -p $(DESTDIR)$(configdir)
- @(echo cd $(DESTDIR)$(configdir); \
- cd $(DESTDIR)$(configdir); \
- for i in $(CONF_LINKS); do \
- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
- $(RM) $$i; \
- ln -s $(templatedir)/$$i .; \
- done)
-uninstall-local:
- @(echo cd $(DESTDIR)$(configdir); \
- cd $(DESTDIR)$(configdir); \
- for i in $(CONF_LINKS); do \
- echo $(RM) $$i; \
- $(RM) $$i; \
- done)
-
-include $(top_srcdir)/git.mk
--- a/conf.d/Makefile.in 2014-03-24 07:04:15.000000000 +0100
+++ b/conf.d/Makefile.in 2015-03-18 22:06:52.180613814 +0100
@@ -102,7 +102,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = conf.d
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_symbol.m4 \
$(top_srcdir)/m4/ax_cc_for_build.m4 \
@@ -163,7 +163,7 @@ am__uninstall_files_from_dir = { \
--- a/conf.d/Makefile.in 2015-06-02 10:33:36.000000000 +0200
+++ b/conf.d/Makefile.in 2016-03-29 05:13:32.527364325 +0200
@@ -173,7 +173,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)"
+am__installdirs = "$(DESTDIR)$(templatedir)"
DATA = $(config_DATA) $(template_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -324,25 +324,8 @@ target_alias = @target_alias@
am__DIST_COMMON = $(srcdir)/Makefile.in README
@@ -344,25 +344,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Expand All @@ -97,10 +33,10 @@
- 80-delicious.conf \
- 90-synthetic.conf
+CONF_LINKS =

EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
CLEANFILES = $(DOC_FILES)
@@ -504,7 +487,7 @@ check: $(BUILT_SOURCES)
@@ -523,7 +506,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(DATA)
installdirs:
Expand All @@ -109,10 +45,10 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -625,9 +608,6 @@ uninstall-am: uninstall-configDATA unins
uninstall-local uninstall-templateDATA


@@ -646,9 +629,6 @@ uninstall-am: uninstall-configDATA unins
.PRECIOUS: Makefile
-README: $(srcdir)/README.in
- sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
-
Expand Down
Loading

0 comments on commit 751d9ae

Please sign in to comment.