freetype 2.10.1-4 (znver1;armv7hnl;i686;aarch64;x86_64) 2020-10233
9999

Status published
Submitter tpgxyz [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/673642
Packages
freetype-2.10.1-4.znver1.source
freetype-debuginfo-2.10.1-4.znver1.debuginfo
freetype-demos-2.10.1-4.znver1.binary
freetype-demos-debuginfo-2.10.1-4.znver1.debuginfo
lib64freetype6-2.10.1-4.znver1.binary
lib64freetype6-debuginfo-2.10.1-4.znver1.debuginfo
lib64freetype6-devel-2.10.1-4.znver1.binary
freetype-2.10.1-4.armv7hnl.source
freetype-debuginfo-2.10.1-4.armv7hnl.debuginfo
freetype-demos-2.10.1-4.armv7hnl.binary
freetype-demos-debuginfo-2.10.1-4.armv7hnl.debuginfo
libfreetype6-2.10.1-4.armv7hnl.binary
libfreetype6-debuginfo-2.10.1-4.armv7hnl.debuginfo
libfreetype6-devel-2.10.1-4.armv7hnl.binary
freetype-2.10.1-4.i686.source
freetype-debuginfo-2.10.1-4.i686.debuginfo
freetype-demos-2.10.1-4.i686.binary
freetype-demos-debuginfo-2.10.1-4.i686.debuginfo
libfreetype6-2.10.1-4.i686.binary
libfreetype6-debuginfo-2.10.1-4.i686.debuginfo
libfreetype6-devel-2.10.1-4.i686.binary
freetype-2.10.1-4.aarch64.source
freetype-debuginfo-2.10.1-4.aarch64.debuginfo
freetype-demos-2.10.1-4.aarch64.binary
freetype-demos-debuginfo-2.10.1-4.aarch64.debuginfo
lib64freetype6-2.10.1-4.aarch64.binary
lib64freetype6-debuginfo-2.10.1-4.aarch64.debuginfo
lib64freetype6-devel-2.10.1-4.aarch64.binary
freetype-2.10.1-4.x86_64.source
freetype-debuginfo-2.10.1-4.x86_64.debuginfo
freetype-demos-2.10.1-4.x86_64.binary
freetype-demos-debuginfo-2.10.1-4.x86_64.debuginfo
lib64freetype6-2.10.1-4.x86_64.binary
lib64freetype6-debuginfo-2.10.1-4.x86_64.debuginfo
lib64freetype6-devel-2.10.1-4.x86_64.binary
Build Date 2020-01-17 08:51:07 +0000 UTC
Last Updated 2020-01-19 19:45:05.21665458 +0000 UTC 
$ git diff --patch-with-stat --summary ba59e4592c5fd86ab6292804b517cc8bce681bc4..4ee5cc4ff831235b5cffaebd005474443dc9e6ed

 0002-Enable-infinality-subpixel-hinting.patch | 20 ++++-----
 freetype-2.3.0-enable-spr.patch               | 11 +++++
 freetype.spec                                 | 62 ++++++++++++++-------------
 ft2demos-2.3.12-mathlib.diff                  | 12 ------
 4 files changed, 52 insertions(+), 53 deletions(-)
 create mode 100644 freetype-2.3.0-enable-spr.patch
 delete mode 100644 ft2demos-2.3.12-mathlib.diff

diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 5f43915..a5d3f54 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -10,21 +10,19 @@ Subject: [PATCH 2/4] Enable infinality subpixel hinting
  include/freetype/config/ftoption.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
-   /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
-   /*                                                                       */
+diff -Naur freetype-2.10.1/include/freetype/config/ftoption.h freetype-2.10.1.tpg/include/freetype/config/ftoption.h
+--- freetype-2.10.1/include/freetype/config/ftoption.h	2019-02-23 09:09:06.000000000 +0000
++++ freetype-2.10.1.tpg/include/freetype/config/ftoption.h	2019-12-17 12:27:38.882239079 +0000
+@@ -658,8 +658,8 @@
+    * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+    */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
 -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2
 -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
 +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2         */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     ( 1 | 2 )
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )
  
  
-   /*************************************************************************/
--- 
+   /**************************************************************************
+--
 2.15.1
-
diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch
new file mode 100644
index 0000000..a234782
--- /dev/null
+++ b/freetype-2.3.0-enable-spr.patch
@@ -0,0 +1,11 @@
+--- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
++++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
+@@ -92,7 +92,7 @@
+    * macro is not defined, FreeType offers alternative LCD rendering
+    * technology that produces excellent output without LCD filtering.
+    */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /**************************************************************************
diff --git a/freetype.spec b/freetype.spec
index e1148ff..88590ec 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,15 +1,15 @@
 %define major 6
-%define libname	%mklibname freetype %{major}
+%define libname %mklibname freetype %{major}
 %define devname %mklibname -d freetype %{major}
 %global optflags %{optflags} -O3
 %define git_url git://git.sv.gnu.org/freetype/freetype2.git
-%bcond_without	harfbuzz
+%bcond_without harfbuzz
 
 Summary:	A free and portable TrueType font rendering engine
 Name:		freetype
 Version:	2.10.1
 %define docver %(echo %version |cut -d. -f1-3)
-Release:	2
+Release:	4
 License:	FreeType License/GPLv2
 Group:		System/Libraries
 Url:		http://www.freetype.org/
@@ -18,6 +18,9 @@ Source1:	http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.xz
 Source2:	http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.xz
 Patch1:		freetype-2.4.2-CVE-2010-3311.patch
 Patch2:		0001-Enable-table-validation-modules.patch
+Patch3:		0002-Enable-infinality-subpixel-hinting.patch
+# Enable subpixel rendering (ClearType)
+Patch4:		freetype-2.3.0-enable-spr.patch
 
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(zlib)
@@ -69,43 +72,43 @@ capabilities of the FreeType library.
 
 %prep
 %autosetup -p1 -a1 -a2
+
 enable() {
-	if [ "$#" = "1" ]; then
-		KEY=FT_CONFIG_OPTION_${1}
-	else
-		KEY=${1}_CONFIG_OPTION_${2}
-	fi
-	sed -i -e "s|^/\* #define ${KEY} \*/|#define ${KEY} 1|" include/freetype/config/ftoption.h devel/ftoption.h
+    if [ "$#" = "1" ]; then
+	KEY=FT_CONFIG_OPTION_${1}
+    else
+	KEY=${1}_CONFIG_OPTION_${2}
+    fi
+    sed -i -e "s|^/\* #define ${KEY} \*/|#define ${KEY}|" include/freetype/config/ftoption.h devel/ftoption.h builds/unix/ftoption.h
 }
 disable() {
-	if [ "$#" = "1" ]; then
-		KEY=FT_CONFIG_OPTION_${1}
-	else
-		KEY=${1}_CONFIG_OPTION_${2}
-	fi
-	sed -i -e "s|^#define ${KEY}\$|/* #define ${KEY} */|" include/freetype/config/ftoption.h devel/ftoption.h
+    if [ "$#" = "1" ]; then
+	KEY=FT_CONFIG_OPTION_${1}
+    else
+	KEY=${1}_CONFIG_OPTION_${2}
+    fi
+    sed -i -e "s|^#define ${KEY}\$|/* #define ${KEY} */|" include/freetype/config/ftoption.h devel/ftoption.h builds/unix/ftoption.h
 }
 
-%configure --enable-freetype-config
+./autogen.sh
+%configure \
+	--enable-freetype-config \
+%if %{with harfbuzz}
+	--with-harfbuzz=yes \
+%else
+	--with-harfbuzz=no \
+%endif
+	--with-zlib=yes \
+	--with-bzip2=yes \
+	--with-png=yes
 
 enable SUBPIXEL_RENDERING
-enable SYSTEM_ZLIB
-enable USE_BZIP2
-enable USE_PNG
-enable USE_HARFBUZZ
 enable PCF LONG_FAMILY_NAMES
-
 disable CFF OLD_ENGINE
 
-sed -i -e 's,^/\* #define FT_EXPORT_DEF(x).*,#define FT_EXPORT_DEF(x) __attribute__((visibility("default"))) x,' include/freetype/config/ftoption.h devel/ftoption.h
-
-#./autogen.sh --help || :
+sed -i -e 's,^/\* #define FT_EXPORT_DEF(x).*,#define FT_EXPORT_DEF(x) __attribute__((visibility("default"))) x,' include/freetype/config/ftoption.h devel/ftoption.h builds/unix/ftoption.h
 
 %build
-# (tpg) remove rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
-
 %make_build
 
 cd ft2demos-%{version}
@@ -124,7 +127,7 @@ cd -
 install -d %{buildroot}%{_bindir}
 
 for ftdemo in ftbench ftdiff ftdump ftgamma ftgrid ftlint ftmulti ftstring ftvalid ftview; do
-	builds/unix/libtool --mode=install install -m 755 ft2demos-%{docver}/bin/$ftdemo %{buildroot}%{_bindir}
+    builds/unix/libtool --mode=install install -m 755 ft2demos-%{docver}/bin/$ftdemo %{buildroot}%{_bindir}
 done
 
 # compatibility symlink
@@ -155,4 +158,3 @@ ln -sf freetype2 %{buildroot}%{_includedir}/freetype
 %{_bindir}/ftstring
 %{_bindir}/ftvalid
 %{_bindir}/ftview
-
diff --git a/ft2demos-2.3.12-mathlib.diff b/ft2demos-2.3.12-mathlib.diff
deleted file mode 100644
index 9d9685f..0000000
--- a/ft2demos-2.3.12-mathlib.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- graph/x11/rules.mk	2009-03-14 14:58:28.000000000 +0100
-+++ graph/x11/rules.mk.oden	2010-07-16 16:19:49.055725764 +0200
-@@ -77,7 +77,7 @@ ifneq ($(X11_PATH),)
-   ifeq ($(PLATFORM),unix)
--    GRAPH_LINK += $(X11_LIB:%=-R%)
-+    #GRAPH_LINK += $(X11_LIB:%=-R%)
-   endif
--  GRAPH_LINK += $(X11_LIB:%=-L%) -lX11
-+  GRAPH_LINK += -lX11 -lm
- 
-   # Solaris needs a -lsocket in GRAPH_LINK.
-   #

Not Available

benbullard79 [@T] cox.netThese *should* be OK1559d 02hrs
benbullard79 [@T] cox.net*Should* be OK1559d 02hrs