From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com ([143.182.124.37]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SXJ3Z-0000uw-8W for openembedded-core@lists.openembedded.org; Wed, 23 May 2012 23:25:22 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 23 May 2012 14:15:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="146949385" Received: from unknown (HELO [10.255.12.24]) ([10.255.12.24]) by azsmga001.ch.intel.com with ESMTP; 23 May 2012 14:15:07 -0700 Message-ID: <4FBD535B.40209@linux.intel.com> Date: Wed, 23 May 2012 14:15:07 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: In-Reply-To: Subject: Re: [PATCH 13/19] fontconfig: upgrade to 2.9.0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2012 21:25:22 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 > --- > .../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 > > } >