From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-840722-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1971113888F for <garchives@archives.gentoo.org>; Fri, 16 Oct 2015 13:04:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40B4421C007; Fri, 16 Oct 2015 13:04:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2A0421C007 for <gentoo-commits@lists.gentoo.org>; Fri, 16 Oct 2015 13:04:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F92E340924 for <gentoo-commits@lists.gentoo.org>; Fri, 16 Oct 2015 13:04:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E4BB10B1 for <gentoo-commits@lists.gentoo.org>; Fri, 16 Oct 2015 13:04:46 +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: <1445000683.4a0809523c24b7d4baa4a9a7a1d565cf7c65b2af.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-9999-fpic.patch app-office/scribus/scribus-9999.ebuild X-VCS-Directories: app-office/scribus/ app-office/scribus/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4a0809523c24b7d4baa4a9a7a1d565cf7c65b2af X-VCS-Branch: master Date: Fri, 16 Oct 2015 13:04:46 +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: 0350a7f5-18cf-428f-be7b-fa3052e61ab9 X-Archives-Hash: 89f4057215c9d7f07a410ac3230a0331 commit: 4a0809523c24b7d4baa4a9a7a1d565cf7c65b2af Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Fri Oct 16 13:04:36 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Fri Oct 16 13:04:43 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a080952 app-office/scribus: Extend fPIC patch Scribus-Bug: http://bugs.scribus.net/view.php?id=13427 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563228 Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> app-office/scribus/files/scribus-9999-fpic.patch | 192 +++++++++++++++++++++++ app-office/scribus/scribus-9999.ebuild | 2 +- 2 files changed, 193 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch new file mode 100644 index 0000000..dbc640b --- /dev/null +++ b/app-office/scribus/files/scribus-9999-fpic.patch @@ -0,0 +1,192 @@ + Scribus/CMakeLists.txt | 15 +++++++++++++++ + Scribus/scribus/colormgmt/CMakeLists.txt | 2 ++ + Scribus/scribus/desaxe/CMakeLists.txt | 1 + + Scribus/scribus/fonts/CMakeLists.txt | 1 + + Scribus/scribus/styles/CMakeLists.txt | 2 ++ + Scribus/scribus/text/CMakeLists.txt | 1 + + Scribus/scribus/third_party/lib2geom/CMakeLists.txt | 8 +------- + Scribus/scribus/third_party/pgf/CMakeLists.txt | 2 ++ + Scribus/scribus/third_party/prc/CMakeLists.txt | 2 ++ + Scribus/scribus/third_party/rtf-qt/CMakeLists.txt | 2 ++ + Scribus/scribus/third_party/wpg/CMakeLists.txt | 7 ++++--- + Scribus/scribus/third_party/zip/CMakeLists.txt | 2 ++ + 12 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt +index 8ab9525..f2ebf64 100644 +--- a/Scribus/CMakeLists.txt ++++ b/Scribus/CMakeLists.txt +@@ -131,6 +131,21 @@ IF (_machine_sparc64) + SET(ARCH64BIT 1) + ENDIF (_machine_sparc64) + ++STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}") ++IF (_machine_hppa) ++ MESSAGE(STATUS "Found target Hppa") ++ SET(ARCH_HPPA 1) ++ENDIF (_machine_hppa) ++ ++ ++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See: ++# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and ++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133 ++ ++IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) ++ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC") ++ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) ++ + ## Do our Apple OSX version setup + IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1)) + STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}") +diff --git a/Scribus/scribus/colormgmt/CMakeLists.txt b/Scribus/scribus/colormgmt/CMakeLists.txt +index 7298a28..87c4f5e 100644 +--- a/Scribus/scribus/colormgmt/CMakeLists.txt ++++ b/Scribus/scribus/colormgmt/CMakeLists.txt +@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/scribus + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} ) + SET(SCRIBUS_LCMS_IMPL_SOURCES + sclcms2colormgmtengineimpl.cpp +diff --git a/Scribus/scribus/desaxe/CMakeLists.txt b/Scribus/scribus/desaxe/CMakeLists.txt +index 0098028..85e76b6 100644 +--- a/Scribus/scribus/desaxe/CMakeLists.txt ++++ b/Scribus/scribus/desaxe/CMakeLists.txt +@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + SET(SCRIBUS_DESAXE_LIB_SOURCES + saxXML.cpp +diff --git a/Scribus/scribus/fonts/CMakeLists.txt b/Scribus/scribus/fonts/CMakeLists.txt +index a8f0e8d..beade2e 100644 +--- a/Scribus/scribus/fonts/CMakeLists.txt ++++ b/Scribus/scribus/fonts/CMakeLists.txt +@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + SET(SCRIBUS_FONTS_LIB_SOURCES + scface.cpp +diff --git a/Scribus/scribus/styles/CMakeLists.txt b/Scribus/scribus/styles/CMakeLists.txt +index 6e0cf0a..2839689 100644 +--- a/Scribus/scribus/styles/CMakeLists.txt ++++ b/Scribus/scribus/styles/CMakeLists.txt +@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES( + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_STYLES_MOC_CLASSES + ) + +diff --git a/Scribus/scribus/text/CMakeLists.txt b/Scribus/scribus/text/CMakeLists.txt +index 1cd112f..4f658e3 100644 +--- a/Scribus/scribus/text/CMakeLists.txt ++++ b/Scribus/scribus/text/CMakeLists.txt +@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES( + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + SET(SCRIBUS_TEXT_MOC_CLASSES + storytext.h +diff --git a/Scribus/scribus/third_party/lib2geom/CMakeLists.txt b/Scribus/scribus/third_party/lib2geom/CMakeLists.txt +index 6187d96..3106f6e 100755 +--- a/Scribus/scribus/third_party/lib2geom/CMakeLists.txt ++++ b/Scribus/scribus/third_party/lib2geom/CMakeLists.txt +@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus + + SET(2GEOM_VERSION 0.1.0) + +-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See: +-# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and +-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133 +- +-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + OPTION(2GEOM_BUILD_SHARED + "Build lib2geom and libtoy as shared libraries." +diff --git a/Scribus/scribus/third_party/pgf/CMakeLists.txt b/Scribus/scribus/third_party/pgf/CMakeLists.txt +index f84b3d4..d3b1db6 100644 +--- a/Scribus/scribus/third_party/pgf/CMakeLists.txt ++++ b/Scribus/scribus/third_party/pgf/CMakeLists.txt +@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/scribus + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_PGF_LIB_SOURCES + Decoder.cpp + Encoder.cpp +diff --git a/Scribus/scribus/third_party/prc/CMakeLists.txt b/Scribus/scribus/third_party/prc/CMakeLists.txt +index 5f7c2c6..1da7177 100644 +--- a/Scribus/scribus/third_party/prc/CMakeLists.txt ++++ b/Scribus/scribus/third_party/prc/CMakeLists.txt +@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_PRC_LIB_SOURCES + oPRCFile.cc + PRCbitStream.cc +diff --git a/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt b/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt +index 4124cef..0ef7560 100644 +--- a/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt ++++ b/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt +@@ -45,6 +45,8 @@ SET(SCRIBUS_RTF_LIB_MOC_CLASSES + + QT5_WRAP_CPP(SCRIBUS_RTF_LIB_MOC_SOURCES ${SCRIBUS_RTF_LIB_MOC_CLASSES}) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_RTF_LIB "scribus_rtf_lib") + ADD_LIBRARY(${SCRIBUS_RTF_LIB} STATIC ${SCRIBUS_RTF_LIB_SOURCES} ${SCRIBUS_RTF_LIB_MOC_SOURCES}) + SET_TARGET_PROPERTIES(${SCRIBUS_ZIB_LIB} +diff --git a/Scribus/scribus/third_party/wpg/CMakeLists.txt b/Scribus/scribus/third_party/wpg/CMakeLists.txt +index ff31e9f..fbc5cd4 100644 +--- a/Scribus/scribus/third_party/wpg/CMakeLists.txt ++++ b/Scribus/scribus/third_party/wpg/CMakeLists.txt +@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/scribus + ) ++ + SET(LIB_TYPE STATIC) +-IF (ARCH_X86_64 EQUAL 1) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +-ENDIF (ARCH_X86_64 EQUAL 1) ++ ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(WPG_SOURCES + WPG1Parser.cpp + WPG2Parser.cpp +diff --git a/Scribus/scribus/third_party/zip/CMakeLists.txt b/Scribus/scribus/third_party/zip/CMakeLists.txt +index edf9683..f7676ab 100644 +--- a/Scribus/scribus/third_party/zip/CMakeLists.txt ++++ b/Scribus/scribus/third_party/zip/CMakeLists.txt +@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus + ${ZLIB_INCLUDE_DIR} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_ZIP_LIB_SOURCES + unzip.cpp + zip.cpp diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 6cdd970..2e0c36c 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -76,7 +76,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docdir.patch - "${FILESDIR}"/${PN}-1.5.0-fpic.patch + "${FILESDIR}"/${PN}-9999-fpic.patch ) src_prepare() {