diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
| commit | 88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch) | |
| tree | d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /app-office/scribus/files | |
| parent | 4645b6f17f0da81e9fe84081fb126a37102ba153 (diff) | |
gentoo resync : 11.05.2018
Diffstat (limited to 'app-office/scribus/files')
| -rw-r--r-- | app-office/scribus/files/scribus-9999-docdir.patch | 42 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-9999-fpic.patch | 16 |
2 files changed, 0 insertions, 58 deletions
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch deleted file mode 100644 index d866922fa18a..000000000000 --- a/app-office/scribus/files/scribus-9999-docdir.patch +++ /dev/null @@ -1,42 +0,0 @@ - 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-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch deleted file mode 100644 index ba0721955ef8..000000000000 --- a/app-office/scribus/files/scribus-9999-fpic.patch +++ /dev/null @@ -1,16 +0,0 @@ - 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 |