From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id BB5CA6C109 for ; Mon, 29 Jul 2019 14:26:22 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id x6TEQNrN013900 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Mon, 29 Jul 2019 07:26:23 -0700 (PDT) Received: from fidler.wrs.com (128.224.56.217) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.468.0; Mon, 29 Jul 2019 07:26:23 -0700 From: Randy MacLeod To: Date: Mon, 29 Jul 2019 10:26:22 -0400 Message-ID: <20190729142622.10981-1-Randy.MacLeod@windriver.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190728093947.GC15666@localhost> References: <20190728093947.GC15666@localhost> MIME-Version: 1.0 Subject: [meta-oe][PATCH v2] poppler: update from 0.75.0 to 0.79.0 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: , X-List-Received-Date: Mon, 29 Jul 2019 14:26:22 -0000 Content-Type: text/plain Adjust the basename-include patch to deal with upstream change of introducing goo/gbasename.cc. Drop 0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch since that was done upstream in: 9481c473 glib: pass poppler to gir libs. Signed-off-by: Randy MacLeod --- ...txt-Add-libpoppler-to-link-along-wit.patch | 32 ------------------- .../poppler/poppler/basename-include.patch | 31 ++++++++++++------ .../{poppler_0.75.0.bb => poppler_0.79.0.bb} | 5 ++- 3 files changed, 23 insertions(+), 45 deletions(-) delete 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.75.0.bb => poppler_0.79.0.bb} (91%) 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 deleted file mode 100644 index c364d7372..000000000 --- a/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 6f91669..ca5021f 100644 ---- a/glib/CMakeLists.txt -+++ b/glib/CMakeLists.txt -@@ -135,7 +135,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} -L${CMAKE_CURRENT_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 --- -2.20.1 - diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch index ab6bdb080..c18a5f5c0 100644 --- a/meta-oe/recipes-support/poppler/poppler/basename-include.patch +++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch @@ -1,20 +1,31 @@ -Minic GNU basename() API for non-glibc library e.g. musl +From 2ac679158062b14729f82f513fc7cafbb6f4f7a6 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod +Date: Fri, 26 Jul 2019 14:26:54 -0400 +Subject: [PATCH 3/3] Minic GNU basename() API for non-glibc library e.g. musl Upstream-Status: Pending + Signed-off-by: Khem Raj +Signed-off-by: Randy MacLeod +--- + goo/gbasename.cc | 4 ++++ + 1 file changed, 4 insertions(+) -Index: poppler-0.64.0/utils/pdfsig.cc -=================================================================== ---- poppler-0.64.0.orig/utils/pdfsig.cc -+++ poppler-0.64.0/utils/pdfsig.cc -@@ -35,6 +35,10 @@ - #include "numberofcharacters.h" - #include +diff --git a/goo/gbasename.cc b/goo/gbasename.cc +index 830c1c80..e93eb368 100644 +--- a/goo/gbasename.cc ++++ b/goo/gbasename.cc +@@ -46,6 +46,10 @@ + #include + #include +#if !defined(__GLIBC__) +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + - static const char * getReadableSigState(SignatureValidationStatus sig_vs) + std::string gbasename(const char* filename) { - switch(sig_vs) { + #ifdef _MSC_VER +-- +2.17.0 + diff --git a/meta-oe/recipes-support/poppler/poppler_0.75.0.bb b/meta-oe/recipes-support/poppler/poppler_0.79.0.bb similarity index 91% rename from meta-oe/recipes-support/poppler/poppler_0.75.0.bb rename to meta-oe/recipes-support/poppler/poppler_0.79.0.bb index 0704f1a2a..068433475 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.75.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.79.0.bb @@ -5,11 +5,10 @@ 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 \ - file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ file://basename-include.patch \ " -SRC_URI[md5sum] = "3fb4ca803d989742695ca586c5cc489e" -SRC_URI[sha256sum] = "3bbaedb0fa2797cac933a0659d144303e4d09eec6892c65600da987d8707199a" +SRC_URI[md5sum] = "0aac1fcb6466f8b7bdf51871264c7e83" +SRC_URI[sha256sum] = "f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" -- 2.17.0