From fa3824fc601e36958e76872797c6dd5c4b450ddc Mon Sep 17 00:00:00 2001
From: arved <arved@FreeBSD.org>
Date: Tue, 19 Nov 2002 16:41:28 +0000
Subject: Update to 1.5.4

PR:		43694
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
---
 cad/qcad/files/patch-relement.cpp | 11 +++++++++++
 cad/qcad/files/patch-rprgdef.h    | 25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 cad/qcad/files/patch-relement.cpp
 create mode 100644 cad/qcad/files/patch-rprgdef.h

(limited to 'cad/qcad/files')

diff --git a/cad/qcad/files/patch-relement.cpp b/cad/qcad/files/patch-relement.cpp
new file mode 100644
index 000000000000..579788c75330
--- /dev/null
+++ b/cad/qcad/files/patch-relement.cpp
@@ -0,0 +1,11 @@
+--- relement.cpp.orig	Fri Nov  8 16:01:15 2002
++++ relement.cpp	Fri Nov  8 16:03:44 2002
+@@ -3683,7 +3683,7 @@
+ 
+   // Search pattern in /usr/share/<proj>/hatches dir:
+   if(!QFileInfo(patternPath).exists()) {
+-    patternPath = QString("/usr/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
++    patternPath = QString("DATADIR")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
+   }
+ #endif
+   */
diff --git a/cad/qcad/files/patch-rprgdef.h b/cad/qcad/files/patch-rprgdef.h
new file mode 100644
index 000000000000..349fc5cc5ff9
--- /dev/null
+++ b/cad/qcad/files/patch-rprgdef.h
@@ -0,0 +1,25 @@
+--- rprgdef.h.orig	Fri Sep 20 19:26:57 2002
++++ rprgdef.h	Tue Nov 19 16:48:27 2002
+@@ -23,12 +23,14 @@
+ 
+ 
+ // Uncomment for Linux
++/*
+ #define DEF_LINUX           // Are we running Linux?
+ #define RUNNING_LINUX   true
+ #define RUNNING_WINDOWS false
+ #define RUNNING_SOLARIS false
+ #define RUNNING_IRIX    false
+ #define DATADIR         "/usr/share"
++*/
+ 
+ 
+ #ifdef __FreeBSD__
+@@ -38,6 +40,7 @@
+ #define RUNNING_WINDOWS false
+ #define RUNNING_SOLARIS false
+ #define RUNNING_IRIX    false
++#define DATADIR		"/usr/local/share"
+ #endif
+ 
+ 
-- 
cgit