[3Depict/f18] Update to 0.0.13

mycae mycae at fedoraproject.org
Fri Apr 12 21:35:11 UTC 2013


commit 577ba084e8a011ce7a2aa779f48d02b65c2df06a
Author: D Haley <mycae gmx com>
Date:   Fri Apr 12 22:35:02 2013 +0100

    Update to 0.0.13

 3Depict-0.0.13-font-path.patch      |   27 +++++++++++++++++++++++++++
 3Depict-0.0.13-manual-pdf-loc.patch |   16 ++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/3Depict-0.0.13-font-path.patch b/3Depict-0.0.13-font-path.patch
new file mode 100644
index 0000000..9bd6c31
--- /dev/null
+++ b/3Depict-0.0.13-font-path.patch
@@ -0,0 +1,27 @@
+diff -r 1b997a96b779 src/wxcomponents.cpp
+--- src/wxcomponents.cpp	Sat Mar 23 17:50:44 2013 +0000
++++ src/wxcomponents.cpp	Sat Mar 23 17:56:14 2013 +0000
+@@ -857,16 +857,17 @@
+ 	//(Oh look Ma, I'm autoconf!)
+ 
+ 	const char *dirs[] = {	".",
+-				"/usr/share/fonts/truetype", //Old debian 
++				"/usr/local/share/fonts/truetype", // User fonts
+ 				"/usr/share/fonts/truetype/freefont", // New debian
+ 				"/usr/share/fonts/truetype/ttf-dejavu", //New debian
+-				"/usr/local/share/fonts/truetype", // User fonts
++				"/usr/share/fonts/truetype", //Old debian 
++				"/usr/share/fonts/dejavu", //Fedora
+ 				"/usr/X11R6/lib/X11/fonts/truetype",
+ 				"/usr/X11R6/lib64/X11/fonts/truetype",
+-				"/usr/lib/X11/fonts/truetype",// Fedora 32
+-				"/usr/lib64/X11/fonts/truetype", //Fedora 64
+-				"/usr/local/lib/X11/fonts/truetype", // Fedora 32 new
+-				"/usr/local/lib64/X11/fonts/truetype",// Fedora 64 new
++				"/usr/lib/X11/fonts/truetype",
++				"/usr/lib64/X11/fonts/truetype", 
++				"/usr/local/lib/X11/fonts/truetype", 
++				"/usr/local/lib64/X11/fonts/truetype",
+ 				"",
+ 				}; //MUST end with "".
+ 
diff --git a/3Depict-0.0.13-manual-pdf-loc.patch b/3Depict-0.0.13-manual-pdf-loc.patch
new file mode 100644
index 0000000..8eb261f
--- /dev/null
+++ b/3Depict-0.0.13-manual-pdf-loc.patch
@@ -0,0 +1,16 @@
+diff -r 1b997a96b779 src/gui/mainFrame.cpp
+--- src/gui/mainFrame.cpp	Sat Mar 23 17:50:44 2013 +0000
++++ src/gui/mainFrame.cpp	Sat Mar 23 17:56:36 2013 +0000
+@@ -2546,9 +2546,9 @@
+ 	string s;
+ 	s=locateDataFile("3Depict-manual.pdf");
+ 
+-	//Also Debian makes us use the lowercase "D", so check there too.
+-	if(!s.size())
+-		s=locateDataFile("3depict-manual.pdf");
++	//Also Fedora has diff dir
++	if(!wxFileExists(wxStr(s)))
++		s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf";
+ 
+ 
+ 	//If we found it, use the default program associated with that data file


More information about the scm-commits mailing list