app-office/scribus-9999: updated docdir patch
authorMiroslav Šulc <fordfrog@gentoo.org>
Fri, 16 Aug 2019 08:51:45 +0000 (10:51 +0200)
committerMiroslav Šulc <fordfrog@gentoo.org>
Fri, 16 Aug 2019 08:52:15 +0000 (10:52 +0200)
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>
app-office/scribus/files/scribus-1.5.6-docdir.patch [new file with mode: 0644]
app-office/scribus/scribus-9999.ebuild

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 (file)
index 0000000..957991c
--- /dev/null
@@ -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)
index 98c9fa5d082e0bd49d256322021db766013e7293..06ff411dee8c363f0bb32f394df74e6c4dd85c84 100644 (file)
@@ -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
 )