From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 24/28] freetype: clean up patches
Date: Sun, 30 Oct 2011 23:00:55 +0100 [thread overview]
Message-ID: <1320012059-24971-24-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-make-freetype-config-SYSROOT-aware.patch | 83 ++++++++++++++++++++
.../builds_unix_freetype-config_in_sysroot.diff | 80 -------------------
patches/freetype-2.3.11/series | 1 -
3 files changed, 83 insertions(+), 81 deletions(-)
create mode 100644 patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch
delete mode 100644 patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff
delete mode 100644 patches/freetype-2.3.11/series
diff --git a/patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch b/patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch
new file mode 100644
index 0000000..7fb25b8
--- /dev/null
+++ b/patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch
@@ -0,0 +1,83 @@
+From 50860d6517b7b9f12501e1eebdabf1a1971337a6 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:27:04 +0100
+Subject: [PATCH] make freetype-config $SYSROOT aware
+
+Currently, freetype-config is not $SYSROOT aware, which is fixed by this
+patch.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ builds/unix/freetype-config.in | 22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+index 9606d31..0a7a767 100644
+--- a/builds/unix/freetype-config.in
++++ b/builds/unix/freetype-config.in
+@@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then
+ fi
+
+ if test "$echo_prefix" = "yes" ; then
+- echo $prefix
++ echo ${SYSROOT}$prefix
+ fi
+
+ if test "$echo_exec_prefix" = "yes" ; then
+- echo $exec_prefix
++ echo ${SYSROOT}$exec_prefix
+ fi
+
+ if test "$exec_prefix_set" = "yes" ; then
+@@ -118,22 +118,22 @@ else
+ fi
+
+ if test "$echo_ft_version" = "yes" ; then
+- major=`grep define $includedir/freetype2/freetype/freetype.h \
++ major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_MAJOR \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+- minor=`grep define $includedir/freetype2/freetype/freetype.h \
++ minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_MINOR \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+- patch=`grep define $includedir/freetype2/freetype/freetype.h \
++ patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_PATCH \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+ echo $major.$minor.$patch
+ fi
+
+ if test "$echo_cflags" = "yes" ; then
+- cflags="-I$includedir/freetype2"
+- if test "$includedir" != "/usr/include" ; then
+- echo $cflags -I$includedir
++ cflags="-I${SYSROOT}$includedir/freetype2"
++ if test "${SYSROOT}$includedir" != "/usr/include" ; then
++ echo $cflags -I${SYSROOT}$includedir
+ else
+ echo $cflags
+ fi
+@@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then
+ eval "rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
+- if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
+- echo -L$libdir $rpath $libs
++ if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
++ echo -L${SYSROOT}$libdir $libs
+ else
+ echo $libs
+ fi
+@@ -154,7 +154,7 @@ fi
+
+ if test "$echo_libtool" = "yes" ; then
+ convlib="libfreetype.la"
+- echo $libdir/$convlib
++ echo ${SYSROOT}$libdir/$convlib
+ fi
+
+ # EOF
+--
+1.7.7
+
diff --git a/patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff b/patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff
deleted file mode 100644
index 78fa52f..0000000
--- a/patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: [patch] make freetype-config $SYSROOT aware
-
-Currently, freetype-config is not $SYSROOT aware, which is fixed by this
-patch.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
-# 20091221 rsc: submitted as https://savannah.nongnu.org/patch/index.php?7040
-
- builds/unix/freetype-config.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-Index: freetype-2.3.9/builds/unix/freetype-config.in
-===================================================================
---- freetype-2.3.9.orig/builds/unix/freetype-config.in
-+++ freetype-2.3.9/builds/unix/freetype-config.in
-@@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then
- fi
-
- if test "$echo_prefix" = "yes" ; then
-- echo $prefix
-+ echo ${SYSROOT}$prefix
- fi
-
- if test "$echo_exec_prefix" = "yes" ; then
-- echo $exec_prefix
-+ echo ${SYSROOT}$exec_prefix
- fi
-
- if test "$exec_prefix_set" = "yes" ; then
-@@ -118,22 +118,22 @@ else
- fi
-
- if test "$echo_ft_version" = "yes" ; then
-- major=`grep define $includedir/freetype2/freetype/freetype.h \
-+ major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
- | grep FREETYPE_MAJOR \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
-- minor=`grep define $includedir/freetype2/freetype/freetype.h \
-+ minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
- | grep FREETYPE_MINOR \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
-- patch=`grep define $includedir/freetype2/freetype/freetype.h \
-+ patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
- | grep FREETYPE_PATCH \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
- echo $major.$minor.$patch
- fi
-
- if test "$echo_cflags" = "yes" ; then
-- cflags="-I$includedir/freetype2"
-- if test "$includedir" != "/usr/include" ; then
-- echo $cflags -I$includedir
-+ cflags="-I${SYSROOT}$includedir/freetype2"
-+ if test "${SYSROOT}$includedir" != "/usr/include" ; then
-+ echo $cflags -I${SYSROOT}$includedir
- else
- echo $cflags
- fi
-@@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then
- eval "rpath=\"$hardcode_libdir_flag_spec\""
- fi
- libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
-- if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
-- echo -L$libdir $rpath $libs
-+ if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
-+ echo -L${SYSROOT}$libdir $libs
- else
- echo $libs
- fi
-@@ -154,7 +154,7 @@ fi
-
- if test "$echo_libtool" = "yes" ; then
- convlib="libfreetype.la"
-- echo $libdir/$convlib
-+ echo ${SYSROOT}$libdir/$convlib
- fi
-
- # EOF
diff --git a/patches/freetype-2.3.11/series b/patches/freetype-2.3.11/series
deleted file mode 100644
index 5d703e3..0000000
--- a/patches/freetype-2.3.11/series
+++ /dev/null
@@ -1 +0,0 @@
-builds_unix_freetype-config_in_sysroot.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
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=1320012059-24971-24-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@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