diff -u freetype-2.8.1/debian/changelog freetype-2.8.1/debian/changelog --- freetype-2.8.1/debian/changelog +++ freetype-2.8.1/debian/changelog @@ -1,3 +1,22 @@ +freetype (2.8.1-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: + - Add pkg-config to the Build-Depends list (Closes: #885324). + - Mark libfreetype6-dev Multi-Arch: same (Closes: #666761). + - Remove the deprecated Priority: extra field from libfreetype6-udeb. + * debian/patches/patches-*: Refresh existing patches. + * debian/patches/patches-freetype/freetype-config-multi-arch.patch: + - Remove the arch-dependent output of `freetype-config --libs`. + - Exit with an error if freetype-config is called with --libtool. + * debian/rules: + - Include /usr/share/dpkg/architecture.mk. + - Dynamically generate the shlibs dependency version (Closes: #883698). + - Replace the autoconf definition of SIZEOF_LONG with the compile-time + constant __SIZEOF_LONG__ to make libfreetype6-dev multi-arch compatible. + + -- Hugh McMaster Tue, 26 Dec 2017 22:07:55 +1100 + freetype (2.8.1-0.1) unstable; urgency=medium * Non-maintainer upload. diff -u freetype-2.8.1/debian/control freetype-2.8.1/debian/control --- freetype-2.8.1/debian/control +++ freetype-2.8.1/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Steve Langasek Uploaders: Anthony Fok , Keith Packard -Build-Depends: bzip2, debhelper (>= 9.20141010), gettext (>= 0.10.36-2), libx11-dev , x11proto-core-dev , libz-dev, quilt, libpng-dev, autoconf, automake, libtool +Build-Depends: bzip2, debhelper (>= 9.20141010), gettext (>= 0.10.36-2), libx11-dev , x11proto-core-dev , libz-dev, pkg-config, quilt, libpng-dev, autoconf, automake, libtool Standards-Version: 4.0.0 Homepage: http://www.freetype.org @@ -49,6 +49,7 @@ Architecture: any Section: libdevel Depends: libfreetype6 (= ${binary:Version}), libc6-dev | libc-dev, zlib1g-dev | libz-dev, libpng-dev, ${misc:Depends} +Multi-Arch: same Description: FreeType 2 font engine, development files The FreeType project is a team of volunteers who develop free, portable and high-quality software solutions for digital typography. @@ -71,7 +72,6 @@ Package: libfreetype6-udeb XC-Package-Type: udeb -Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Section: debian-installer diff -u freetype-2.8.1/debian/patches-freetype/enable-subpixel-rendering.patch freetype-2.8.1/debian/patches-freetype/enable-subpixel-rendering.patch --- freetype-2.8.1/debian/patches-freetype/enable-subpixel-rendering.patch +++ freetype-2.8.1/debian/patches-freetype/enable-subpixel-rendering.patch @@ -1,10 +1,10 @@ -Index: freetype-2.7.1/include/freetype/config/ftoption.h +Index: freetype-2.8.1/include/freetype/config/ftoption.h =================================================================== ---- freetype-2.7.1.orig/include/freetype/config/ftoption.h 2017-03-08 18:37:52.813239175 +0100 -+++ freetype-2.7.1/include/freetype/config/ftoption.h 2017-03-08 18:37:52.813239175 +0100 -@@ -122,7 +122,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ +--- freetype-2.8.1.orig/include/freetype/config/ftoption.h ++++ freetype-2.8.1/include/freetype/config/ftoption.h +@@ -119,7 +119,7 @@ FT_BEGIN_HEADER + /* rendering technology that produces excellent output without LCD */ + /* filtering. */ /* */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING diff -u freetype-2.8.1/debian/patches-freetype/series freetype-2.8.1/debian/patches-freetype/series --- freetype-2.8.1/debian/patches-freetype/series +++ freetype-2.8.1/debian/patches-freetype/series @@ -2,5 +2,4 @@ -#freetype-2.1.7-backwards.compat.patch -p0 enable-subpixel-rendering.patch enable-gxvalid-otvalid.patch verbose-libtool.patch -#Revert-builds-unix-unix-cc.in-LINK_LIBRARY-Use-expor.patch +freetype-config-multi-arch.patch diff -u freetype-2.8.1/debian/patches-ft2demos/compiler_hardening_fixes.patch freetype-2.8.1/debian/patches-ft2demos/compiler_hardening_fixes.patch --- freetype-2.8.1/debian/patches-ft2demos/compiler_hardening_fixes.patch +++ freetype-2.8.1/debian/patches-ft2demos/compiler_hardening_fixes.patch @@ -1,8 +1,8 @@ Index: ft2demos-2.7.1/src/ftcommon.c =================================================================== ---- ft2demos-2.7.1.orig/src/ftcommon.c 2017-03-08 18:40:51.094083299 +0100 -+++ ft2demos-2.7.1/src/ftcommon.c 2017-03-08 18:40:51.090083281 +0100 -@@ -444,6 +444,7 @@ +--- ft2demos-2.8.1.orig/src/ftcommon.c ++++ ft2demos-2.8.1/src/ftcommon.c +@@ -453,6 +453,7 @@ if ( file == NULL ) /* shouldn't happen */ { diff -u freetype-2.8.1/debian/rules freetype-2.8.1/debian/rules --- freetype-2.8.1/debian/rules +++ freetype-2.8.1/debian/rules @@ -3,9 +3,7 @@ # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +include /usr/share/dpkg/architecture.mk ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) export LIBPNG_CFLAGS = -I/usr/include/libpng12 @@ -24,11 +22,12 @@ VERSION = $(shell dpkg-parsechangelog | sed -n -e's/^Version: //p') ver := $(shell dpkg-parsechangelog | sed -n -e's/^Version: \(.*\)-[^-]\+/\1/p') +dep_ver:= $(shell echo "$(ver)" | sed 's|\([0-9]\.[0-9]\).*|\1|') freetype_ver := $(ver) ftdocs_ver := $(ver) ft2demos_ver := $(ver) -dependency = $(libpkg) (>= 2.6) +dependency = $(libpkg) (>= $(dep_ver)) freetype_u := freetype-$(freetype_ver) ftdocs_u := freetype-doc-$(ftdocs_ver) @@ -83,6 +82,7 @@ dh_auto_build -D $(ft2demos_u) -- TOP_DIR=../$(freetype_u) \ OBJ_DIR=../$(freetype_u)/objs endif + sed -i '/SIZEOF_LONG/s/[0-9]/__SIZEOF_LONG__/' $(freetype_u)/builds/unix/ftconfig.h override_dh_auto_clean: rm -f unpack-stamp patch-stamp only in patch2: unchanged: --- freetype-2.8.1.orig/debian/patches-freetype/freetype-config-multi-arch.patch +++ freetype-2.8.1/debian/patches-freetype/freetype-config-multi-arch.patch @@ -0,0 +1,79 @@ +Description: Patch freetype-config to enable multi-arch installation + (1) Remove the arch-dependent output of `freetype-config --libs`. + (2) Exit with an error if freetype-config is called with --libtool. + This option is deprecated in Debian. +Author: Hugh McMaster + +Index: freetype-2.8.1/builds/unix/freetype-config.in +=================================================================== +--- freetype-2.8.1.orig/builds/unix/freetype-config.in ++++ freetype-2.8.1/builds/unix/freetype-config.in +@@ -39,27 +39,20 @@ else + exec_prefix="%exec_prefix%" + + includedir="%includedir%" +- libdir="%libdir%" + + version=%ft_version% + + cflags="-I${SYSROOT}$includedir/freetype2" + dynamic_libs="-lfreetype" + static_libs="%LIBSSTATIC_CONFIG%" +- if test "${SYSROOT}$libdir" != "/usr/lib" && +- test "${SYSROOT}$libdir" != "/usr/lib64" ; then +- libs_L="-L${SYSROOT}$libdir" +- fi + fi + + orig_prefix=$prefix + orig_exec_prefix=$exec_prefix + + orig_includedir=$includedir +-orig_libdir=$libdir + + include_suffix=`echo $includedir | sed "s|$prefix||"` +-lib_suffix=`echo $libdir | sed "s|$exec_prefix||"` + + + usage() +@@ -134,7 +127,8 @@ while test $# -gt 0 ; do + echo_libs=yes + ;; + --libtool) +- echo_libtool=yes ++ echo 2>&1 "The use of libfreetype6.la is deprecated in Debian." ++ exit 1 + ;; + --static) + show_static=yes +@@ -158,11 +152,6 @@ fi + + if test "$local_prefix" = "yes" ; then + includedir=${prefix}${include_suffix} +- if test "$exec_prefix_set" = "yes" ; then +- libdir=${exec_prefix}${lib_suffix} +- else +- libdir=${prefix}${lib_suffix} +- fi + fi + + +@@ -197,15 +186,11 @@ fi + + if test "$echo_libs" = "yes" ; then + if test "$show_static" = "yes" ; then +- libs="$libs_L $static_libs" ++ libs="$static_libs" + else +- libs="$libs_L $dynamic_libs" ++ libs="$dynamic_libs" + fi +- echo $libs | sed "s|$orig_libdir|$libdir|" +-fi +- +-if test "$echo_libtool" = "yes" ; then +- echo ${SYSROOT}$libdir/libfreetype.la ++ echo $libs + fi + + # EOF