commit: ac6f121dce90c63353c16afc77a73cb9ed10146e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 08:51:45 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 08:52:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6f121d
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 <AT> gentoo.org>
.../scribus/files/scribus-1.5.6-docdir.patch | 29 ++++++++++++++++++++++
app-office/scribus/scribus-9999.ebuild | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
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 00000000000..957991c2acc
--- /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 98c9fa5d082..06ff411dee8 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
)
