diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-08-16 10:51:45 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-08-16 10:52:15 +0200 |
| commit | ac6f121dce90c63353c16afc77a73cb9ed10146e (patch) | |
| tree | b60814ccb04ef996a0f0ebffa9961111d8272b2b | |
| parent | dev-db/firebird: Drop 3.0.2.32703.0-r2 (diff) | |
| download | gentoo-ac6f121d.tar.gz gentoo-ac6f121d.tar.bz2 gentoo-ac6f121d.zip | |
app-office/scribus-9999: updated docdir patch
keeping files/scribus-1.5.5-docdir.patch for scribus-1.5.5 bump
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | app-office/scribus/files/scribus-1.5.6-docdir.patch | 29 | ||||
| -rw-r--r-- | app-office/scribus/scribus-9999.ebuild | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch new file mode 100644 index 000000000000..957991c2acc4 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake +index db6133f..faf85ce 100644 +--- a/CMakeLists_Directories.cmake ++++ b/CMakeLists_Directories.cmake +@@ -36,14 +36,16 @@ else() + endif() + + #SHARE - use the default on Apple as TAG_VERSION is empty +-if(WIN32 OR OS2) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") +-elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +-elseif(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +-else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++if(NOT DOCDIR) ++ if(WIN32 OR OS2) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") ++ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") ++ elseif(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() + + if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 98c9fa5d082e..06ff411dee8c 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}"/${PN}-1.5.5-docdir.patch + "${FILESDIR}"/${PN}-1.5.6-docdir.patch "${FILESDIR}"/${PN}-1.5.3-fpic.patch ) |