From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 1 Aug 2020 12:00:32 +0000 (+0200)
Subject: - updated patches
X-Git-Tag: auto/th/scribus-1.5.5-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=ba3e4cbb34c121f17a812e7d6970dc7f08a6fe67;p=packages%2Fscribus.git

- updated patches
---

diff --git a/scribus-docs.patch b/scribus-docs.patch
index a85b233..2635059 100644
--- a/scribus-docs.patch
+++ b/scribus-docs.patch
@@ -1,18 +1,17 @@
---- scribus-1.3.8/CMakeLists.txt~	2010-07-20 00:51:20.000000000 +0200
-+++ scribus-1.3.8/CMakeLists.txt	2010-08-16 08:32:12.760862255 +0200
-@@ -283,12 +283,12 @@
-   SET(DOCDIR "share/doc/")
- ELSE (WIN32 OR OS2)
-   IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
--    SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+    SET(DOCDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/doc/")
-   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
-         IF(NOT WANT_VERSIONING)
--            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
-+            SET(DOCDIR "share/${MAIN_DIR_NAME}/doc/")
-         ELSE(NOT WANT_VERSIONING)
--            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+            SET(DOCDIR "share/${MAIN_DIR_NAME}/doc/")
-         ENDIF(NOT WANT_VERSIONING)
-   ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
- ENDIF (WIN32 OR OS2)
+--- 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)
diff --git a/scribus-standard-font-paths.patch b/scribus-standard-font-paths.patch
index 0a3e345..bc1742a 100644
--- a/scribus-standard-font-paths.patch
+++ b/scribus-standard-font-paths.patch
@@ -1,11 +1,11 @@
 --- scribus-0.8/scribus/scfonts.cpp.orig	Sun Sep 22 10:54:38 2002
 +++ scribus-0.8/scribus/scfonts.cpp	Thu Oct 24 11:53:26 2002
-@@ -463,6 +463,8 @@
+@@ -1048,6 +1048,8 @@
  	char **fontpath=XGetFontPath(display,&pathcount);
- 	for(i=0; i<pathcount; ++i)
- 		AddPath(fontpath[i]);
-+	AddPath("/usr/share/fonts/Type1");
-+	AddPath("/usr/share/fonts/TTF");
+ 	for (i=0; i<pathcount; ++i)
+ 		addPath(fontpath[i]);
++	addPath("/usr/share/fonts/Type1");
++	addPath("/usr/share/fonts/TTF");
  	XFreeFontPath(fontpath);
  }