From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-991818-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C7074139083
for <garchives@archives.gentoo.org>; Wed, 20 Dec 2017 21:34:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C2D6EE10B0;
Wed, 20 Dec 2017 21:34:32 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 99D6BE10B0
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Dec 2017 21:34:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 4359833BEF8
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Dec 2017 21:34:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 03589AE81
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Dec 2017 21:34:30 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1513805668.baa2b7d340e6636519d069ee235a429bd546d289.jlec@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch app-office/scribus/scribus-1.5.3.ebuild
X-VCS-Directories: app-office/scribus/ app-office/scribus/files/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: baa2b7d340e6636519d069ee235a429bd546d289
X-VCS-Branch: master
Date: Wed, 20 Dec 2017 21:34:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a6464e3d-28ec-4c38-bf27-590336b5ebd5
X-Archives-Hash: 13c1eb26d9cd65cfbc8e2a8bc613e215
commit: baa2b7d340e6636519d069ee235a429bd546d289
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 21:30:13 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 21:34:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa2b7d3
app-office/scribus: Patch openssl determination in cmake
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../scribus/files/scribus-1.5.3-cmake-openssl.patch | 15 +++++++++++++++
app-office/scribus/scribus-1.5.3.ebuild | 1 +
2 files changed, 16 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
new file mode 100644
index 00000000000..c2cb5e9dd58
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
@@ -0,0 +1,15 @@
+Description: Fix case of "OpenSSL" to match the case of the file shipped by cmake
+Author: Mattia Rizzolo <mattia@debian.org>
+Last-Update: 2017-06-05
+
+--- a/cmake/modules/FindLIBPODOFO.cmake
++++ b/cmake/modules/FindLIBPODOFO.cmake
+@@ -45,7 +45,7 @@
+ #message(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}")
+ set(LIBPODOFO_VERSION "${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING "PoDoFo version string")
+ if(LIBPODOFO_VERSION VERSION_GREATER "0.9.4")
+- find_package(OPENSSL)
++ find_package(OpenSSL)
+ if (OPENSSL_FOUND)
+ message("OpenSSL found OK for installed version of PoDoFo (>= 0.9.5) - Enabling support for PDF embedded in AI")
+ set(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo found")
diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index 9f7a0a8ca01..d28665aead7 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-docdir.patch
"${FILESDIR}"/${P}-fpic.patch
+ "${FILESDIR}"/${P}-cmake-openssl.patch
)
src_prepare() {