Hello community,

here is the log from the commit of package libwmf for openSUSE:Factory checked 
in at 2018-05-17 18:03:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libwmf (Old)
 and      /work/SRC/openSUSE:Factory/.libwmf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libwmf"

Thu May 17 18:03:27 2018 rev:36 rq:604726 version:0.2.8.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes    2018-03-20 
21:51:40.460446744 +0100
+++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes       2018-05-17 
18:03:32.611994833 +0200
@@ -1,0 +2,7 @@
+Fri May  4 08:43:30 UTC 2018 - idon...@suse.com
+
+- Add use-pkg-config-for-freetype.patch to use pkgconfig to detect
+  Freetype libraries. Add BR autoconf, automake, libtool due to
+  above.
+
+-------------------------------------------------------------------

New:
----
  use-pkg-config-for-freetype.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libwmf.spec ++++++
--- /var/tmp/diff_new_pack.aR92Bo/_old  2018-05-17 18:03:36.023870048 +0200
+++ /var/tmp/diff_new_pack.aR92Bo/_new  2018-05-17 18:03:36.027869901 +0200
@@ -37,10 +37,14 @@
 Patch8:         libwmf-0.2.8.4-CVE-2015-4696.patch
 Patch9:         libwmf-0.2.8.4-CVE-2015-4695.patch
 Patch10:        reproducible.patch
+Patch11:        use-pkg-config-for-freetype.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gd-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-proto-devel
@@ -114,8 +118,11 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
+# Patch11 modifies configure.ac
+autoreconf -fi
 %configure --disable-static --prefix=%{_prefix} $RPM_ARCH-suse-linux 
--enable-magick --libdir=%{_libdir}
 make %{?_smp_mflags}
 

++++++ use-pkg-config-for-freetype.patch ++++++
Index: libwmf-0.2.8.4/configure.ac
===================================================================
--- libwmf-0.2.8.4.orig/configure.ac
+++ libwmf-0.2.8.4/configure.ac
@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=
        fi
 ])
 
-if [ test -n "$FREETYPE_DIR" ]; then
-       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, 
,[$FREETYPE_DIR/bin:$PATH])
-else
-       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
-fi
-
-if [ test -n "$FREETYPE_CONFIG" ]; then
-       if [ test -n "$FREETYPE_DIR" ]; then
-               freetype_cflags="`$FREETYPE_CONFIG --cflags` 
-I$FREETYPE_DIR/include"
-               freetype_libs=`$FREETYPE_CONFIG --libs`
-       else
-               freetype_cflags=`$FREETYPE_CONFIG --cflags`
-               freetype_libs=`$FREETYPE_CONFIG --libs`
-       fi
-else
-       if [ test -n "$FREETYPE_DIR" ]; then
-               freetype_cflags="-I$FREETYPE_DIR/include/freetype2 
-I$FREETYPE_DIR/include"
-               freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
-       else
-               freetype_cflags=""
-               freetype_libs="-lfreetype"
-       fi
-fi
-
-CPPFLAGS="$freetype_cflags $CPPFLAGS"
-LDFLAGS="$LDFLAGS $freetype_libs"
+PKG_CHECK_MODULES(FREETYPE2, freetype2, 
+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
+    LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
+    AC_MSG_ERROR([*** Unable to find FreeType2 library 
(http://www.freetype.org/)])
+)
 
 AC_CHECK_LIB(freetype,FT_Init_FreeType,[
-       WMF_FT_LDFLAGS="$freetype_libs"
+       WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
 ],[    AC_MSG_ERROR([* * * freetype(2) is required * * *])
 ])
 AC_CHECK_HEADER(ft2build.h,[
-       WMF_FT_CFLAGS="$freetype_cflags"
-       WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
+       WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
+       WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
 ],[    AC_MSG_ERROR([* * * freetype(2) is required * * *])
 ])
 

Reply via email to