From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8
Date: Mon, 19 Jun 2017 14:12:03 +0200 [thread overview]
Message-ID: <20170619121203.kem3ws5hieui6gtm@pengutronix.de> (raw)
In-Reply-To: <20170606143643.23028-6-clemens.gruber@pqgruber.com>
On Tue, Jun 06, 2017 at 04:36:30PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
patchin: quilt: apply 'ptxdist-git/patches/freetype-2.8/series'
Applying patch 0001-generate-freetype-config-and-freetype2.pc-correctly.patch
patching file builds/unix/configure.ac
Hunk #1 succeeded at 1012 (offset 6 lines).
patching file builds/unix/freetype-config.in
Hunk #1 FAILED at 12.
Hunk #2 FAILED at 74.
Hunk #3 FAILED at 141.
3 out of 3 hunks FAILED -- rejects in file builds/unix/freetype-config.in
Michael
> ---
> ...erate-freetype-config-and-freetype2.pc-correctly.patch | 0
> patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh | 0
> patches/{freetype-2.6.3 => freetype-2.8}/series | 0
> rules/freetype.make | 15 ++++++++++++---
> 4 files changed, 12 insertions(+), 3 deletions(-)
> rename patches/{freetype-2.6.3 => freetype-2.8}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (100%)
> rename patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh (100%)
> rename patches/{freetype-2.6.3 => freetype-2.8}/series (100%)
>
> diff --git a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> similarity index 100%
> rename from patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> rename to patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> diff --git a/patches/freetype-2.6.3/autogen.sh b/patches/freetype-2.8/autogen.sh
> similarity index 100%
> rename from patches/freetype-2.6.3/autogen.sh
> rename to patches/freetype-2.8/autogen.sh
> diff --git a/patches/freetype-2.6.3/series b/patches/freetype-2.8/series
> similarity index 100%
> rename from patches/freetype-2.6.3/series
> rename to patches/freetype-2.8/series
> diff --git a/rules/freetype.make b/rules/freetype.make
> index 2ee85ef15..c306f9466 100644
> --- a/rules/freetype.make
> +++ b/rules/freetype.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
> #
> # Paths and names
> #
> -FREETYPE_VERSION := 2.6.3
> -FREETYPE_MD5 := 0037b25a8c090bc8a1218e867b32beb1
> +FREETYPE_VERSION := 2.8
> +FREETYPE_MD5 := 2413ac3eaf508ada019c63959ea81a92
> FREETYPE := freetype-$(FREETYPE_VERSION)
> FREETYPE_SUFFIX := tar.bz2
> FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
> @@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL := autoconf
> FREETYPE_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --disable-static \
> + --disable-biarch-config \
> + $(GLOBAL_LARGE_FILE_OPTION) \
> + --enable-mmap \
> --with-zlib \
> --without-bzip2 \
> --without-png \
> - --without-harfbuzz
> + --without-harfbuzz \
> + --without-old-mac-fonts \
> + --without-fsspec \
> + --without-fsref \
> + --without-quickdraw-toolbox \
> + --without-quickdraw-carbon \
> + --without-ats
>
>
> # ----------------------------------------------------------------------------
> --
> 2.13.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-06-19 12:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 14:36 [ptxdist] [PATCH] alsa-lib: version bump 1.0.29 -> 1.1.4.1 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] cairo: version bump 1.12.18 -> 1.14.8 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] collectd: add exec plugin Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] coreutils: version bump 8.25 -> 8.27 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] fontconfig: version bump 2.11.1 -> 2.12.3 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8 Clemens Gruber
2017-06-07 9:21 ` Roland Hieber
2017-06-07 10:35 ` Michael Olbrich
2017-06-07 12:46 ` Clemens Gruber
2017-06-08 16:29 ` Michael Olbrich
2017-06-19 12:12 ` Michael Olbrich [this message]
2017-06-19 12:26 ` Michael Olbrich
2017-06-06 14:36 ` [ptxdist] [PATCH] latrace: improve configure options Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] libelf: version bump 0.168 -> 0.169 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] libevent: version bump 2.0.21 -> 2.1.8 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] libgcrypt: version bump 1.7.6 -> 1.7.7 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] libpng: version bump 1.2.54 -> 1.6.29 Clemens Gruber
2017-06-19 12:11 ` Michael Olbrich
2017-06-06 14:36 ` [ptxdist] [PATCH] mpg123: version bump 1.23.8 -> 1.25.0 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] nano: version bump 2.3.1 -> 2.8.4 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] nginx: add -Wno-error to fix build with GCC 7.1 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] pango: version bump 1.29.4 -> 1.40.6 Clemens Gruber
2017-06-26 10:18 ` Michael Olbrich
2017-06-26 19:29 ` Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] rrdtool: version bump 1.6.0 -> 1.7.0 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] systemd: backport fix for nss-resolve fallback Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] tmux: version bump 2.3 -> 2.5 Clemens Gruber
2017-06-06 14:36 ` [ptxdist] [PATCH] u-boot-tools: version bump 2016.11 -> 2017.05 Clemens Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170619121203.kem3ws5hieui6gtm@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox