diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-office/scribus/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-office/scribus/files')
-rw-r--r-- | app-office/scribus/files/scribus-1.5.3-docdir.patch | 42 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.3-fpic.patch | 16 |
2 files changed, 58 insertions, 0 deletions
diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch new file mode 100644 index 000000000000..d866922fa18a --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.3-docdir.patch @@ -0,0 +1,42 @@ + CMakeLists.txt | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29d66f3..1c08cdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,19 +244,21 @@ else() + endif() + + #SHARE - use the default on Apple as TAG_VERSION is empty +-if(WIN32 OR OS2) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") +-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(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() ++endif() + if(NOT IS_ABSOLUTE ${DOCDIR}) + add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + else() diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch b/app-office/scribus/files/scribus-1.5.3-fpic.patch new file mode 100644 index 000000000000..ba0721955ef8 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.3-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 |