From patchwork Fri May 11 06:51:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 135506 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp498869lji; Thu, 10 May 2018 23:52:07 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrwgG8bURI+znwRKnDil/r5GLLeOvST+F7CYUGHyWM9OabiZwdsN6PFNlD3Uf9xoHLb05Le X-Received: by 2002:a62:e50d:: with SMTP id n13-v6mr4268921pff.125.1526021527133; Thu, 10 May 2018 23:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526021527; cv=none; d=google.com; s=arc-20160816; b=IgtbR3rM821ZhkU52Di2mzKTvIBNJhXgMRSyo6TCO7Z7pJVFijFKa73ho9pbqr0I9a Et0I1WKywBk4O96Y/Cj1umXoCQfT7kOpkpti31ib+G7zCsQLuJ6ksnyoSQ1hXT90IE72 wUlTz4HKooJtX7eVMvuZTarLm/H5Nm5ma29b2gYuvcHNfLmxK6I7UaysplFp/NZNfToW cSOwLo2aJ+VIVXsTuUTpXfaSO4yqqzYcK2nOeZRLCx9UMmZyfmWRZSTPQ8wJ+pJ9aZwW 2okuncwo05do4rfXJyPR7XpMA8eHO+c335WIcKxsS9KrtHLQkprX4TIgc1hd5PmoMjf4 /DBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=1Pn7phJJMhLbWpxdyVLQ5ReT6FQbBIFL3yOu0vwzxRQ=; b=x9ebYc6zGHsU4If6g9TL0cIIajXsj8dy+MhZ/ZY6mL0cH+3FhLjsEX973le4P/4t68 kkHQuKiO1VHGWdnjQssIJX1EuFqlAzAp5Ygs4A5+hIkzN5WZ8FHP00teAqDlknFLp/pU KUv33uVTDeev3hjWK/2n8oo06ChEsZbGSIxvim3/GTAVQDOGgHd82fuKnpDoMKhg5wNS JN0NMJRiSu+nfD0q0FqQVnrwKomq5ot3PBbSFY83hiv4+l9xkkb1/KNz1Ab6NpNru1i5 swjAku1VmCHxDa2trrqKp6Lbh+vJPE9mpzkKohhSGSBJVo9wnWjozaacB8X/EI046P48 6i7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IuGpAGuX; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v7-v6si2479813plp.304.2018.05.10.23.52.06; Thu, 10 May 2018 23:52:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IuGpAGuX; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 618E9753FD; Fri, 11 May 2018 06:52:01 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 4B047752AD for ; Fri, 11 May 2018 06:51:58 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id f189-v6so2266176pfa.7 for ; Thu, 10 May 2018 23:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4dRHdTosdstJ4WBCyI6ceZ8FAHud/cJA6CUsS3leVRM=; b=IuGpAGuXH9H/q6XJRnkFe+gTGkdao2X0lzI7gFIHdzd9Bn1vceoHgnxL9vZS26SBtp dQ2IrA2x8mpKqeRssQHFKVqJk0PaOS4sK36cVaxREmmOcYEpK1RIDWuQC7lp3NpKk+Ps Zlgzux4YuJkYuT4u9spDOHRZXbcu2gFV/BYyTEpp0Usrhu8TEgIS14o/cmlLs0bRpglk 5HyR4HDpd9UgHHOPK9rIMYU3XlI9Oz39YCCPqwX1Xmi9NyKCJIE0yzoIo3eR05iQ+siJ GnIJq9GVVXguKD413XVY/VmKFgS4H0YuZQProV+DqJ4N0G0PAnPD3zqOcE2sY96eP7Aa z88g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4dRHdTosdstJ4WBCyI6ceZ8FAHud/cJA6CUsS3leVRM=; b=a161ZdWUNK+h/5nRyFxHGqgjYffkSMkUkTrmtptb0Zhx8GT8uuMnpD93Mq/M+fFlA7 lRuirI/qyoHzDHl5z355NMWADlgccw5m5baH2nIvTDG25gl4utzOr1tP/HRsgKXHUtYz krnSeW/ZvkJtYhLXnEG2dNOs+gSn/uvreLtb2Wp3LdBKCy6MkAjLoMzjWcR8FpLGrKiO Q7/DXL38T5deQydvfx+zwBkIc//Lrfcx0Lw7l+BLYtTlgw81SAhl4pP7I7oiKd4MA9XY MB+5BcicUxznFHE5QcasR5Mlf2MvkaCypsV3eSmKo+Yzc6Jol+qdedb58IyKc+IEZUXo 82Rw== X-Gm-Message-State: ALKqPwe9wRHa4U+Zf1jTSfQA20cva3ULRMVFephtps/VPWBXZlWHXRRj 5VRg6TtuOJnu4097ghUeXflqhw== X-Received: by 2002:a63:6aca:: with SMTP id f193-v6mr3535056pgc.244.1526021519710; Thu, 10 May 2018 23:51:59 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id w12-v6sm6648503pfi.158.2018.05.10.23.51.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 May 2018 23:51:59 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 10 May 2018 23:51:53 -0700 Message-Id: <20180511065153.39324-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [oe] [meta-oe][PATCH] poppler: Update to 0.64 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...txt-Add-libpoppler-to-link-along-wit.patch | 29 +++++++++++++++++++ .../{poppler_0.63.0.bb => poppler_0.64.0.bb} | 20 +++++++------ 2 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch rename meta-oe/recipes-support/poppler/{poppler_0.63.0.bb => poppler_0.64.0.bb} (74%) -- 2.17.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch new file mode 100644 index 0000000000..7ed795ef7b --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch @@ -0,0 +1,29 @@ +From d488de23b75b2f3e235f1c184b2253d1402b4c0f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 10 May 2018 23:47:56 -0700 +Subject: [PATCH] glib/CMakeLists.txt: Add libpoppler to link along with + poppler-glib + +This is required since poppler-glib uses symbols from poppler and +we use --as-needed + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 33c6608..87e1b44 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -127,7 +127,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) + get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) + _list_prefix(_includes _tmp_includes "-I") + set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}) +- set(Poppler_0_18_gir_LIBS poppler-glib) ++ set(Poppler_0_18_gir_LIBS poppler-glib poppler) + _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") + list(APPEND _abs_introspection_files + ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c diff --git a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb similarity index 74% rename from meta-oe/recipes-support/poppler/poppler_0.63.0.bb rename to meta-oe/recipes-support/poppler/poppler_0.64.0.bb index 8acb356287..01f0df109d 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb @@ -2,15 +2,15 @@ SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = " \ - http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ -" -SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821" -SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111" +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ + file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ + " +SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044" +SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1" -DEPENDS = "fontconfig zlib cairo lcms" +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" inherit cmake pkgconfig gobject-introspection @@ -26,12 +26,14 @@ PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" # surprise - did not expect this to work :) inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" +#SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ -DENABLE_XPDF_HEADERS=ON \ -DBUILD_GTK_TESTS=OFF \ -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ " do_configure_append() {