diff --git a/enable-long-family-names-by-default.patch b/enable-long-family-names-by-default.patch new file mode 100644 index 0000000..baf1d25 --- /dev/null +++ b/enable-long-family-names-by-default.patch @@ -0,0 +1,11 @@ +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -856,7 +856,7 @@ FT_BEGIN_HEADER + /* If this option is activated, it can be controlled with the */ + /* `no-long-family-names' property of the pcf driver module. */ + /* */ +-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES + + + /*************************************************************************/ diff --git a/freetype2.changes b/freetype2.changes index 9c4e32a..adeb0c7 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Fri Feb 9 11:11:36 UTC 2018 - fstrba@suse.com -- Define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES to obtain 2.7.1 - behaviour +- Added patch: + * enable-long-family-names-by-default.patch + + Define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES to obtain 2.7.1 + behaviour ------------------------------------------------------------------- Wed Feb 7 09:17:10 UTC 2018 - fstrba@suse.com diff --git a/freetype2.spec b/freetype2.spec index d23ba7b..c096288 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -35,6 +35,7 @@ Patch1: don-t-mark-libpng-as-required-library.patch Patch2: psaux-flex.patch Patch3: 0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch Patch4: 0001-truetype-Better-protection-against-invalid-VF-data.patch +Patch5: enable-long-family-names-by-default.patch BuildRequires: gawk BuildRequires: libbz2-devel BuildRequires: libpng-devel @@ -89,9 +90,10 @@ It also contains a small tutorial for using that library. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build -export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE -DPCF_CONFIG_OPTION_LONG_FAMILY_NAMES $(getconf LFS_CFLAGS)" +export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" %configure \ --with-bzip2 \ --with-png \