Skip to content

Commit

Permalink
app-office/scribus-9999: updated docdir patch
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Miroslav Šulc <[email protected]>
  • Loading branch information
fordfrog committed Jun 23, 2019
1 parent 3abdfa9 commit b8163a1
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
29 changes: 29 additions & 0 deletions app-office/scribus/files/scribus-1.5.5-docdir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5b3e77..4c5fd3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,14 +313,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)
2 changes: 1 addition & 1 deletion app-office/scribus/scribus-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND}
"

PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-docdir.patch
"${FILESDIR}"/${PN}-1.5.5-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
)

Expand Down

0 comments on commit b8163a1

Please sign in to comment.