- updated patches

[packages/scribus.git] / scribus-docs.patch

diff --git a/scribus-docs.patch b/scribus-docs.patch
index f1ce27a04023d4ee828665ba8062646fc7798874..2635059d0819db3eab8367c101dd1196572145e5 100644 (file)
--- a/scribus-docs.patch
+++ b/scribus-docs.patch
@@ -1,19 +1,17 @@
-diff -ur scribus-1.3.3.10/CMakeLists.txt SCRIBUS-1.3.3.10-DOCS/CMakeLists.txt
---- scribus-1.3.3.10/CMakeLists.txt    2008-01-08 00:41:31.000000000 +0100
-+++ SCRIBUS-1.3.3.10-DOCS/CMakeLists.txt       2008-01-10 12:41:57.000000000 +0100
-@@ -96,12 +96,11 @@
- ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
- #SHARE
- IF(TAG_VERSION)
--  SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+  SET(DOCDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/doc/")
- ELSE(TAG_VERSION)
--  SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+  SET(DOCDIR "share/${MAIN_DIR_NAME}/doc/")
- ENDIF (TAG_VERSION)
- ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
--SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
- ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
- SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/")
- ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"")
-
+--- scribus-1.5.5/CMakeLists.txt~      2019-07-31 00:34:43.000000000 +0200
++++ scribus-1.5.5/CMakeLists.txt       2020-08-01 11:43:01.688045033 +0200
+@@ -316,11 +316,11 @@
+ 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}/")
++      set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/doc/")
+ elseif(NOT WANT_VERSIONING)
+-      set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++      set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}/doc/")
+ else()
+-      set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++      set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}-${VERSION}/doc/")
+ endif()
+ 
+ if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE)