| 1 |
commit: ac6f121dce90c63353c16afc77a73cb9ed10146e |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 16 08:51:45 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 16 08:52:15 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6f121d |
| 7 |
|
| 8 |
app-office/scribus-9999: updated docdir patch |
| 9 |
|
| 10 |
keeping files/scribus-1.5.5-docdir.patch for scribus-1.5.5 bump |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 13 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 14 |
|
| 15 |
.../scribus/files/scribus-1.5.6-docdir.patch | 29 ++++++++++++++++++++++ |
| 16 |
app-office/scribus/scribus-9999.ebuild | 2 +- |
| 17 |
2 files changed, 30 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..957991c2acc |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch |
| 24 |
@@ -0,0 +1,29 @@ |
| 25 |
+diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake |
| 26 |
+index db6133f..faf85ce 100644 |
| 27 |
+--- a/CMakeLists_Directories.cmake |
| 28 |
++++ b/CMakeLists_Directories.cmake |
| 29 |
+@@ -36,14 +36,16 @@ else() |
| 30 |
+ endif() |
| 31 |
+ |
| 32 |
+ #SHARE - use the default on Apple as TAG_VERSION is empty |
| 33 |
+-if(WIN32 OR OS2) |
| 34 |
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") |
| 35 |
+-elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) |
| 36 |
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
| 37 |
+-elseif(NOT WANT_VERSIONING) |
| 38 |
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
| 39 |
+-else() |
| 40 |
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
| 41 |
++if(NOT DOCDIR) |
| 42 |
++ if(WIN32 OR OS2) |
| 43 |
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") |
| 44 |
++ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) |
| 45 |
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
| 46 |
++ elseif(NOT WANT_VERSIONING) |
| 47 |
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
| 48 |
++ else() |
| 49 |
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
| 50 |
++ endif() |
| 51 |
+ endif() |
| 52 |
+ |
| 53 |
+ if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) |
| 54 |
|
| 55 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild |
| 56 |
index 98c9fa5d082..06ff411dee8 100644 |
| 57 |
--- a/app-office/scribus/scribus-9999.ebuild |
| 58 |
+++ b/app-office/scribus/scribus-9999.ebuild |
| 59 |
@@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND} |
| 60 |
" |
| 61 |
|
| 62 |
PATCHES=( |
| 63 |
- "${FILESDIR}"/${PN}-1.5.5-docdir.patch |
| 64 |
+ "${FILESDIR}"/${PN}-1.5.6-docdir.patch |
| 65 |
"${FILESDIR}"/${PN}-1.5.3-fpic.patch |
| 66 |
) |
Archives