public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
Date: Tue,  9 Jan 2018 13:46:31 +0000 (UTC)	[thread overview]
Message-ID: <1515505574.011a496c85cf6f36b24082a3ac55f6b63162f2e5.asturm@gentoo> (raw)

commit:     011a496c85cf6f36b24082a3ac55f6b63162f2e5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 13:32:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 13:46:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011a496c

app-office/scribus: Fix build w/ x86 on 17.0 profile

Closes: https://bugs.gentoo.org/642242
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/files/scribus-1.5.3-x86-fpic.patch | 16 ++++++++++++++++
 app-office/scribus/scribus-1.5.3-r1.ebuild            |  1 +
 app-office/scribus/scribus-9999.ebuild                |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
new file mode 100644
index 00000000000..03d4dc4daa3
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt	2017-05-28 11:10:27.000000000 +0200
++++ b/CMakeLists.txt	2018-01-09 14:26:14.494922353 +0100
+@@ -155,11 +155,11 @@
+ 	set(ARCH_HPPA 1)
+ endif()
+ 
+-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, hppa and x86. 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)
++if (ARCH_X86 EQUAL 1 OR 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()
+ 

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 0c8f8171b5e..e1ed169825a 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -96,6 +96,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fpic.patch
 	"${FILESDIR}"/${P}-cmake-openssl.patch
 	"${FILESDIR}"/${P}-poppler-0.58.patch
+	"${FILESDIR}"/${P}-x86-fpic.patch
 )
 
 src_prepare() {

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index b65e60a412b..f9c847c7aa6 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
-CMAKE_MIN_VERSION=3.2.0
 
 inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
 
@@ -97,6 +96,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.3-x86-fpic.patch
 )
 
 src_prepare() {


             reply	other threads:[~2018-01-09 13:46 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-09 13:46 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-05 18:59 [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/ Andreas Sturmlechner
2025-09-03 16:15 Andreas Sturmlechner
2025-07-08 16:03 Andreas Sturmlechner
2025-03-07 13:16 Andreas Sturmlechner
2024-11-03 20:36 Andreas Sturmlechner
2024-06-03 17:36 Miroslav Šulc
2024-05-22  7:39 Miroslav Šulc
2024-05-14 17:25 Andreas Sturmlechner
2024-03-04 22:18 Andreas Sturmlechner
2024-01-14 10:24 Miroslav Šulc
2024-01-14  9:38 Miroslav Šulc
2024-01-01  9:30 Miroslav Šulc
2023-03-17  6:52 Miroslav Šulc
2023-02-06 10:36 Andreas Sturmlechner
2022-03-27  6:05 Miroslav Šulc
2022-02-10 19:38 Miroslav Šulc
2021-10-09 19:38 Sam James
2021-05-30 10:45 Miroslav Šulc
2021-03-07  1:30 Andreas Sturmlechner
2020-07-18  8:41 Andreas Sturmlechner
2020-05-30  9:31 Andreas Sturmlechner
2020-04-07  7:49 Andreas Sturmlechner
2019-12-29 11:54 Andreas Sturmlechner
2019-11-08 20:13 Andreas Sturmlechner
2019-10-01 23:43 Andreas Sturmlechner
2019-08-16  8:52 Miroslav Šulc
2019-06-23 16:44 Miroslav Šulc
2018-06-20 16:31 Andreas Sturmlechner
2018-05-10 15:55 Andreas Sturmlechner
2018-03-13 22:50 Andreas Sturmlechner
2017-12-20 21:34 Justin Lecher
2016-11-06  8:25 Justin Lecher
2016-10-23 20:25 Justin Lecher
2016-09-27 18:50 Michael Weber
2015-10-19 12:06 Justin Lecher
2015-10-16 13:04 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1515505574.011a496c85cf6f36b24082a3ac55f6b63162f2e5.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox