From 992da42db7284a06adf5ecdce50478715b0d4af0783e908dc0357cce94034af2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 18 Dec 2013 06:31:12 +0000 Subject: [PATCH] Accepting request 211310 from openSUSE:Factory:Staging:freetype2 - Added patches: * don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's private in pkgconfig file, and causes issues in downstream packages - As per patch, remove libpng-devel Requires from devel package OBS-URL: https://build.opensuse.org/request/show/211310 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=85 --- ...g-as-required-library-in-freetype-co.patch | 39 +++++++++++++++++++ freetype2.changes | 9 +++++ freetype2.spec | 4 +- ft2demos.changes | 15 +++++++ ft2demos.spec | 3 ++ 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 don-t-mark-libpng-as-required-library-in-freetype-co.patch diff --git a/don-t-mark-libpng-as-required-library-in-freetype-co.patch b/don-t-mark-libpng-as-required-library-in-freetype-co.patch new file mode 100644 index 0000000..e643bc2 --- /dev/null +++ b/don-t-mark-libpng-as-required-library-in-freetype-co.patch @@ -0,0 +1,39 @@ +From 752bf00d315bee455eab3b31009894141ca8efca Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Thu, 12 Dec 2013 17:41:19 +0100 +Subject: [PATCH 1/1] Don't mark libpng as required library in freetype-config + +It is private in .pc anyway +--- + builds/unix/freetype-config.in | 2 +- + builds/unix/unix-def.in | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in +index e4c504d..2fdf39f 100644 +--- a/builds/unix/freetype-config.in ++++ b/builds/unix/freetype-config.in +@@ -137,7 +137,7 @@ if test "$echo_cflags" = "yes" ; then + fi + + if test "$echo_libs" = "yes" ; then +- libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%" ++ libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%" + if test "${SYSROOT}$libdir" != "/usr/lib" && + test "${SYSROOT}$libdir" != "/usr/lib64"; then + echo -L${SYSROOT}$libdir $libs +diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in +index 491e974..ae2e3c5 100644 +--- a/builds/unix/unix-def.in ++++ b/builds/unix/unix-def.in +@@ -103,7 +103,6 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in + sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \ + -e 's|%LIBBZ2%|$(LIBBZ2)|' \ + -e 's|%LIBZ%|$(LIBZ)|' \ +- -e 's|%LIBPNG%|$(LIBPNG)|' \ + -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ + -e 's|%exec_prefix%|$(exec_prefix)|' \ + -e 's|%ft_version%|$(ft_version)|' \ +-- +1.8.5 + diff --git a/freetype2.changes b/freetype2.changes index 5ec34de..06061c0 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 12 16:45:13 UTC 2013 - hrvoje.senjan@gmail.com + +- Added patches: + * don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's + private in pkgconfig file, and causes issues in downstream + packages +- As per patch, remove libpng-devel Requires from devel package + ------------------------------------------------------------------- Wed Dec 11 07:13:14 UTC 2013 - arvidjaar@gmail.com diff --git a/freetype2.spec b/freetype2.spec index 6e8b868..03b9e19 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -41,6 +41,8 @@ Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer Patch201: overflow.patch +# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library-in-freetype-co.patch -- it is private in .pc +Patch202: don-t-mark-libpng-as-required-library-in-freetype-co.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,7 +63,6 @@ version also contains an autohinter for producing improved output. Summary: Development environment for the freetype2 TrueType font library Group: Development/Libraries/C and C++ Requires: libfreetype6 = %{version} -Requires: libpng-devel Requires: zlib-devel # bug437293 %ifarch ppc64 @@ -87,6 +88,7 @@ It also contains a small tutorial for using that library. %if %{enable_subpixel_rendering} %patch200 -p1 %endif +%patch202 -p1 %build export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" diff --git a/ft2demos.changes b/ft2demos.changes index 22d2b24..9b59994 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Dec 12 16:45:13 UTC 2013 - hrvoje.senjan@gmail.com + +- Added patches: + * don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's + private in pkgconfig file, and causes issues in downstream + packages +- As per patch, remove libpng-devel Requires from devel package + +------------------------------------------------------------------- +Wed Dec 11 07:13:14 UTC 2013 - arvidjaar@gmail.com + +- freetype2 pkgconfig now includes -lpng16; make sure freetype2-devel + Requires libpng-devel + ------------------------------------------------------------------- Tue Dec 10 03:04:59 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/ft2demos.spec b/ft2demos.spec index c9f6de9..a7bc7ef 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -30,6 +30,8 @@ Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer Patch201: overflow.patch +# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library-in-freetype-co.patch -- it is private in .pc +Patch202: don-t-mark-libpng-as-required-library-in-freetype-co.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel Conflicts: dtc @@ -54,6 +56,7 @@ Freetype2 utilities and demo programs. pushd ../ft2demos-%{version} %patch201 -p1 popd +%patch202 -p1 %build export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"