From a2e19d6253885c3d3fe475c5202fc5c0a1ee1865 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 9 Dec 2014 15:45:48 +0100 Subject: [PATCH] Update to 2.5.4 Resolves: #1171504 --- .gitignore | 3 + freetype-2.4.12-pkgconfig.patch | 14 ---- freetype-2.5.3-freetype-config-libs.patch | 96 ----------------------- freetype.spec | 18 ++--- sources | 6 +- 5 files changed, 12 insertions(+), 125 deletions(-) delete mode 100644 freetype-2.4.12-pkgconfig.patch delete mode 100644 freetype-2.5.3-freetype-config-libs.patch diff --git a/.gitignore b/.gitignore index 1a84215..aef8e80 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.5.3.tar.bz2 /freetype-doc-2.5.3.tar.bz2 /ft2demos-2.5.3.tar.bz2 +/freetype-2.5.4.tar.bz2 +/freetype-doc-2.5.4.tar.bz2 +/ft2demos-2.5.4.tar.bz2 diff --git a/freetype-2.4.12-pkgconfig.patch b/freetype-2.4.12-pkgconfig.patch deleted file mode 100644 index bd4e811..0000000 --- a/freetype-2.4.12-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- freetype-2.5.2/builds/unix/freetype2.in -+++ freetype-2.5.2/builds/unix/freetype2.in -@@ -1,7 +1,7 @@ --prefix="%prefix%" --exec_prefix="%exec_prefix%" --libdir="%libdir%" --includedir="%includedir%/freetype2" -+prefix=%prefix% -+exec_prefix=%exec_prefix% -+libdir=%libdir% -+includedir=%includedir%/freetype2 - - Name: FreeType 2 - URL: http://freetype.org diff --git a/freetype-2.5.3-freetype-config-libs.patch b/freetype-2.5.3-freetype-config-libs.patch deleted file mode 100644 index 7f56f4b..0000000 --- a/freetype-2.5.3-freetype-config-libs.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- a/builds/unix/configure.raw -+++ b/builds/unix/configure.raw -@@ -937,21 +937,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ - -e 's/ *$//' \ - -e 's/ */ /g'` - --LIBS_CONFIG="-lfreetype \ -- $ZLIB_LIBS \ -- $BZIP2_LIBS \ -- $LIBPNG_LIBS \ -- $HARFBUZZ_LIBS \ -- $ft2_extra_libs" --# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later --# on if necessary; also beautify --LIBS_CONFIG=`echo "$LIBS_CONFIG" \ -- | sed -e 's|-L */usr/lib64/* | |g' \ -- -e 's|-L */usr/lib/* | |g' \ -- -e 's/^ *//' \ -- -e 's/ *$//' \ -- -e 's/ */ /g'` -- - LIBSSTATIC_CONFIG="-lfreetype \ - $zlib_libstaticconf \ - $bzip2_libstaticconf \ -@@ -971,7 +956,6 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ - AC_SUBST([ftmac_c]) - AC_SUBST([REQUIRES_PRIVATE]) - AC_SUBST([LIBS_PRIVATE]) --AC_SUBST([LIBS_CONFIG]) - AC_SUBST([LIBSSTATIC_CONFIG]) - - AC_SUBST([hardcode_libdir_flag_spec]) ---- a/builds/unix/freetype-config.in -+++ b/builds/unix/freetype-config.in -@@ -142,7 +142,7 @@ if test "$echo_cflags" = "yes" ; then - fi - - if test "$echo_libs" = "yes" ; then -- libs="%LIBS_CONFIG%" -+ libs="-lfreetype" - staticlibs="%LIBSSTATIC_CONFIG%" - if test "$show_static" = "yes" ; then - libs="$staticlibs" ---- a/builds/unix/unix-def.in -+++ b/builds/unix/unix-def.in -@@ -64,7 +64,6 @@ version_info := @version_info@ - # - REQUIRES_PRIVATE := @REQUIRES_PRIVATE@ - LIBS_PRIVATE := @LIBS_PRIVATE@ --LIBS_CONFIG := @LIBS_CONFIG@ - LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@ - build_libtool_libs := @build_libtool_libs@ - ft_version := @ft_version@ -@@ -102,8 +101,7 @@ NO_OUTPUT := 2> /dev/null - - $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in - rm -f $@ $@.tmp -- sed -e 's|%LIBS_CONFIG%|$(LIBS_CONFIG)|' \ -- -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \ -+ sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \ - -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ - -e 's|%exec_prefix%|$(exec_prefix)|' \ - -e 's|%ft_version%|$(ft_version)|' \ ---- a/builds/unix/configure -+++ b/builds/unix/configure -@@ -639,7 +639,6 @@ build_libtool_libs - wl - hardcode_libdir_flag_spec - LIBSSTATIC_CONFIG --LIBS_CONFIG - LIBS_PRIVATE - REQUIRES_PRIVATE - ftmac_c -@@ -13715,21 +13714,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ - -e 's/ *$//' \ - -e 's/ */ /g'` - --LIBS_CONFIG="-lfreetype \ -- $ZLIB_LIBS \ -- $BZIP2_LIBS \ -- $LIBPNG_LIBS \ -- $HARFBUZZ_LIBS \ -- $ft2_extra_libs" --# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later --# on if necessary; also beautify --LIBS_CONFIG=`echo "$LIBS_CONFIG" \ -- | sed -e 's|-L */usr/lib64/* | |g' \ -- -e 's|-L */usr/lib/* | |g' \ -- -e 's/^ *//' \ -- -e 's/ *$//' \ -- -e 's/ */ /g'` -- - LIBSSTATIC_CONFIG="-lfreetype \ - $zlib_libstaticconf \ - $bzip2_libstaticconf \ - diff --git a/freetype.spec b/freetype.spec index ea1cbaa..2fb753e 100644 --- a/freetype.spec +++ b/freetype.spec @@ -6,8 +6,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.5.3 -Release: 11%{?dist} +Version: 2.5.4 +Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement Group: System Environment/Libraries URL: http://www.freetype.org @@ -26,12 +26,6 @@ Patch47: freetype-2.5.2-more-demos.patch # Fix multilib conflicts Patch88: freetype-multilib.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=961855 -Patch90: freetype-2.4.12-pkgconfig.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1079302 -Patch91: freetype-2.5.3-freetype-config-libs.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1161963 Patch92: freetype-2.5.3-freetype-config-prefix.patch @@ -96,10 +90,6 @@ popd %patch88 -p1 -b .multilib -%patch90 -p1 -b .pkgconfig - -%patch91 -p1 -b .freetype-config-libs - %patch92 -p1 -b .freetype-config-prefix %build @@ -222,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Tue Dec 9 2014 Marek Kasik - 2.5.4-1 +- Update to 2.5.4 +- Resolves: #1171504 + * Tue Nov 11 2014 Marek Kasik - 2.5.3-11 - Fix directories returned by freetype-config with modified prefix - Resolves: #1161963 diff --git a/sources b/sources index feb59fa..f448333 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d6b60f06bfc046e43ab2a6cbfd171d65 freetype-2.5.3.tar.bz2 -e192ef88e84ddf10665f34cf418652fb freetype-doc-2.5.3.tar.bz2 -3d2cd9f572a1a80b9744b9d6b75975ba ft2demos-2.5.3.tar.bz2 +438585445a2f1f71c77590155fd96616 freetype-2.5.4.tar.bz2 +98ce8930882a4017dc2e591ed75a5896 freetype-doc-2.5.4.tar.bz2 +1d457751c9223422ff4f33ce2606a2b3 ft2demos-2.5.4.tar.bz2