Accepting request 428969 from home:namtrac:branches:M17N

- Also build ftinspect

OBS-URL: https://build.opensuse.org/request/show/428969
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=121

ft2demos.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 20 11:58:32 UTC 2016 - idonmez@suse.com
+
+- Also build ftinspect 
+
 -------------------------------------------------------------------
 Fri Sep  9 16:14:34 UTC 2016 - develop7@develop7.info
 

ft2demos.spec

@@ -35,9 +35,14 @@ Source1016:     bug-647375_tt2.ttf
 Patch201:       overflow.patch
 # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc
 Patch202:       don-t-mark-libpng-as-required-library.patch
+# PATCH-FIX-UPSTREAM -- Fix patch to static freetype library
+Patch203:       ftinspect-library.patch
 Patch308961:    bugzilla-308961-cmex-workaround.patch
 BuildRequires:  libpng-devel
 BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(harfbuzz)
 Supplements:    fonts-config
 Conflicts:      dtc < 1.4.0
 # silence our clamav check
@@ -53,23 +58,32 @@ Freetype2 utilities and demo programs.
 %patch308961 -p 1
 pushd ../ft2demos-%{version}
 %patch201 -p1
+%patch203 -p1
 popd
 %patch202 -p1
 
 %build
 export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
-%configure --without-bzip2
+%configure \
+    --enable-static \
+    --without-bzip2
+
 make %{?_smp_mflags}
 pushd ..
     ln -s freetype-%{freetype_version} freetype2
     cd ft2demos-%{version}
     make %{?_smp_mflags}
+
+    cd src
+    qmake-qt5 ftinspect.pro
+    make
 popd
 
 %install
 mkdir -p %{buildroot}%{_bindir}
 pushd ../ft2demos-%{version}/bin/.libs
     install -m 755 ft* %{buildroot}%{_bindir}
+    install -m 755 ../../src/ftinspect %{buildroot}%{_bindir}
 popd
 
 %check

ftinspect-library.patch

@@ -0,0 +1,13 @@
+Index: ft2demos-2.7/src/ftinspect.pro
+===================================================================
+--- ft2demos-2.7.orig/src/ftinspect.pro
++++ ft2demos-2.7/src/ftinspect.pro
+@@ -5,7 +5,7 @@ INCLUDEPATH += ../../freetype2/include
+ #
+ # You should adapt this to your setup.
+ unix|macx {
+-  LIBS += ../../freetype2/objs/libfreetype.a
++  LIBS += ../../freetype2/objs/.libs/libfreetype.a
+ 
+   CONFIG += link_pkgconfig
+   PKGCONFIG += libpng harfbuzz zlib bzip2