Skip to content

Commit

Permalink
fc25: Add initial support for Fedora 25
Browse files Browse the repository at this point in the history
Bump to versions given in the Fedora 25 repo: fontconfig 2.12.1 and
freetype 2.7.1
  • Loading branch information
Jared Hancock committed Jan 9, 2017
1 parent 690e17b commit 246acfa
Show file tree
Hide file tree
Showing 8 changed files with 536 additions and 504 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BASE = fedora-24
BASE = fedora-25
DIRS = $(wildcard */)

define makerpm =
Expand Down
3 changes: 2 additions & 1 deletion fontconfig-infinality-ultimate/04-Makefile.conf.d.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
DATA = $(config_DATA) $(template_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in README
@@ -343,25 +343,8 @@ target_alias = @target_alias@
@@ -343,26 +343,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-BUILT_SOURCES = README
-DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)
-CONF_LINKS = \
- 10-hinting-$(PREFERRED_HINTING).conf \
- 10-scale-bitmap-fonts.conf \
- 20-unhint-small-vera.conf \
- 30-urw-aliases.conf \
Expand Down
19 changes: 8 additions & 11 deletions fontconfig-infinality-ultimate/fontconfig-infinality-ultimate.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Summary: Font configuration and customization library
Name: fontconfig-infinality-ultimate
Version: 2.11.94
Release: 5%{?dist}
Version: 2.12.1
Release: 1%{?dist}
# src/ftglue.[ch] is in Public Domain
# src/fccache.c contains Public Domain code
# fc-case/CaseFolding.txt is in the UCD
Expand All @@ -17,13 +17,11 @@ Source2: presets.tar.bz2

# https://bugzilla.redhat.com/show_bug.cgi?id=140335
Patch0: fontconfig-sleep-less.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1236034
Patch1: fontconfig-lock-cache.patch
Patch3: 01-configure.patch
Patch4: 02-configure.ac.patch
Patch5: 03-Makefile.in.patch
Patch6: 04-Makefile.conf.d.patch
Patch7: 05-Makefile.am.in.patch
Patch2: 01-configure.patch
Patch3: 02-configure.ac.patch
Patch4: 03-Makefile.in.patch
Patch5: 04-Makefile.conf.d.patch
Patch6: 05-Makefile.am.in.patch

BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version}
Expand Down Expand Up @@ -77,12 +75,11 @@ which is useful for developing applications that uses fontconfig.
cd ..
%setup -q -a 1 -n fontconfig-%{version}
%patch0 -p1 -b .sleep-less
%patch1 -p1 -b .lock-cache
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1

aclocal
libtoolize -f
Expand Down
Loading

0 comments on commit 246acfa

Please sign in to comment.