diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2017-06-04 12:54:00 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2017-06-04 12:54:42 +0100 |
| commit | 9f25508e22d9fcb7bbdc2114fbc9057ced285686 (patch) | |
| tree | 617af4b2d2c1b30c8060f0c4ccc1c8a568d3ef09 /app-office/scribus/files | |
| parent | dev-libs/check: ia64 stable, bug #595364 (diff) | |
| download | gentoo-9f25508e22d9fcb7bbdc2114fbc9057ced285686.tar.gz gentoo-9f25508e22d9fcb7bbdc2114fbc9057ced285686.tar.bz2 gentoo-9f25508e22d9fcb7bbdc2114fbc9057ced285686.zip | |
app-office/scribus: Import latest changes into live ebuild
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-office/scribus/files')
| -rw-r--r-- | app-office/scribus/files/scribus-9999-docdir.patch | 31 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-9999-fpic.patch | 16 |
2 files changed, 37 insertions, 10 deletions
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch index 442829d3bda9..d866922fa18a 100644 --- a/app-office/scribus/files/scribus-9999-docdir.patch +++ b/app-office/scribus/files/scribus-9999-docdir.patch @@ -1,8 +1,11 @@ + CMakeLists.txt | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79b1feb..259d474 100644 +index 29d66f3..1c08cdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -284,16 +284,18 @@ else() +@@ -244,19 +244,21 @@ else() endif() #SHARE - use the default on Apple as TAG_VERSION is empty @@ -11,21 +14,29 @@ index 79b1feb..259d474 100644 -else() - if(TAG_VERSION OR BUILD_OSX_BUNDLE) - set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +- else() +- if(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +- else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") +- endif() +- endif() +-endif() +if(NOT DOCDIR) + if(WIN32 OR OS2) + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") - else() -- if(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") ++ else() + if(TAG_VERSION OR BUILD_OSX_BUNDLE) + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") - else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ else() + if(NOT WANT_VERSIONING) + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") + else() + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") + endif() - endif() - endif() - endif() ++ endif() ++ endif() ++endif() + if(NOT IS_ABSOLUTE ${DOCDIR}) + add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + else() 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 000000000000..ba0721955ef8 --- /dev/null +++ b/app-office/scribus/files/scribus-9999-fpic.patch @@ -0,0 +1,16 @@ + scribus/third_party/prc/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt +index 5f7c2c6..1da7177 100644 +--- a/scribus/third_party/prc/CMakeLists.txt ++++ b/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 |