Accepting request 586392 from home:elvigia:branches:graphics

- libgd-config.patch: do not inject false dependencies into 
  packages, GD does not need extra libs to be used.
  this also allows us to clean up -devel package dependencies.

OBS-URL: https://build.opensuse.org/request/show/586392
OBS-URL: https://build.opensuse.org/package/show/graphics/gd?expand=0&rev=46

gd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 13 13:31:37 UTC 2018 - crrodriguez@opensuse.org
+
+- libgd-config.patch: do not inject false dependencies into 
+  packages, GD does not need extra libs to be used.
+  this also allows us to clean up -devel package dependencies.
+
 -------------------------------------------------------------------
 Mon Jan 22 14:58:51 UTC 2018 - pgajdos@suse.com
 

gd.spec

@@ -34,6 +34,7 @@ Patch2:         gd-format.patch
 # could be upstreamed
 Patch3:         gd-aliasing.patch
 Patch4:         gd-CVE-2018-5711.patch
+Patch5:         libgd-config.patch
 # needed for tests
 BuildRequires:  dejavu
 BuildRequires:  libjpeg-devel
@@ -43,9 +44,6 @@ BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(libwebp)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xau)
-BuildRequires:  pkgconfig(xdmcp)
 BuildRequires:  pkgconfig(xpm)
 Provides:       gdlib = %{version}
 Obsoletes:      gdlib < %{version}
@@ -71,15 +69,6 @@ Summary:        Drawing Library for Programs with PNG and JPEG Output
 Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{version}
 Requires:       glibc-devel
-Requires:       libjpeg-devel
-Requires:       libpng-devel
-Requires:       pkgconfig(libtiff-4)
-Requires:       pkgconfig(libwebp)
-Requires:       pkgconfig(libwebpdecoder)
-Requires:       pkgconfig(libwebpdemux)
-Requires:       pkgconfig(libwebpmux)
-Requires:       pkgconfig(vpx)
-Requires:       pkgconfig(zlib)
 
 %description devel
 gd allows code to quickly draw images complete with lines, arcs, text,
@@ -94,6 +83,7 @@ the formats accepted for inline images by most browsers.
 %patch2
 %patch3
 %patch4 -p1
+%patch5 -p1
 chmod 644 COPYING
 
 %build

libgd-config.patch

@@ -0,0 +1,22 @@
+Index: libgd-2.2.5/config/gdlib-config.in
+===================================================================
+--- libgd-2.2.5.orig/config/gdlib-config.in
++++ libgd-2.2.5/config/gdlib-config.in
+@@ -74,7 +74,7 @@ while test $# -gt 0; do
+ 	echo @LDFLAGS@
+ 	;;
+     --libs)
+-	echo -lgd @LIBS@ @LIBICONV@
++	echo -lgd
+ 	;;
+     --cflags|--includes)
+ 	echo -I@includedir@
+@@ -87,7 +87,7 @@ while test $# -gt 0; do
+ 	echo "includedir: $includedir"
+ 	echo "cflags:     -I@includedir@"
+ 	echo "ldflags:    @LDFLAGS@"
+-	echo "libs:       @LIBS@ @LIBICONV@"
++	echo "libs:       -lgd"
+ 	echo "libdir:     $libdir"
+ 	echo "features:   @FEATURES@"
+ 	;;