On 05/23/2012 06:11 AM, Laurentiu Palcu wrote:
Other changes:
- licence checksums because the licence headers changed slightly
- rebased the fix-pkgconfig.patch to apply on 2.9.0
- removed all sed instructions in do_configure_append() that were
changing fc-arch/Makefile. In the new version the fc-arch/ directory
has been removed in order to make the package cross-compiling safe
Seems you missed updating the SRC_URI Checksums for this one.
Thanks
Sau!
Signed-off-by: Laurentiu Palcu<[email protected]>
---
.../97_fontconfig | 0
.../fix-pkgconfig.patch | 4 ++--
...-native_2.8.0.bb => fontconfig-native_2.9.0.bb} | 0
.../{fontconfig_2.8.0.bb => fontconfig_2.9.0.bb} | 12 ++++--------
4 files changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =>
fontconfig-2.9.0}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =>
fontconfig-2.9.0}/fix-pkgconfig.patch (84%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.8.0.bb =>
fontconfig-native_2.9.0.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.8.0.bb =>
fontconfig_2.9.0.bb} (84%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
diff --git
a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
similarity index 84%
rename from
meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
index 30415fc..6be04a1 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
@@ -4,8 +4,8 @@ Upstream-Status: Inappropriate [configuration]
fontconfig.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- fontconfig-2.8.0.orig/fontconfig.pc.in
-+++ fontconfig-2.8.0/fontconfig.pc.in
+--- fontconfig-2.9.0.orig/fontconfig.pc.in
++++ fontconfig-2.9.0/fontconfig.pc.in
@@ -7,5 +7,5 @@
Description: Font configuration and customization library
Version: @VERSION@
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
similarity index 84%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
index 55c04cc..b3d5bab 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
@@ -12,15 +12,15 @@ HOMEPAGE = "http://www.fontconfig.org";
BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig";
LICENSE = "MIT-style& MIT& PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
-
file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
-
file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
+
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
+
file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
SECTION = "libs"
DEPENDS = "expat freetype zlib"
-PR = "r4"
+PR = "r0"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
@@ -66,22 +66,18 @@ do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|'
fc-glyphname/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
- sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
}
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
