Update to 1.4.4

PR:		21573
Submitted by:	Ports Fury

6 files changed, 107 insertions, 7 deletions

diff --git a/cad/qcad/files/patch-aa b/cad/qcad/files/patch-aa
index 00324d454cee..0da0db8c2b33 100644
--- a/cad/qcad/files/patch-aa
+++ b/cad/qcad/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri May  5 12:57:18 2000
-+++ Makefile	Thu May 11 16:03:04 2000
-@@ -7,13 +7,12 @@
+--- Makefile.orig	Sat Aug 12 03:31:54 2000
++++ Makefile	Sat Sep 23 06:33:52 2000
+@@ -7,13 +7,15 @@
  
  ####### Compiler, tools and options
  
@@ -11,12 +11,36 @@
 -LFLAGS	=	-static
 -LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
 -MOC	=	moc
-+CFLAGS	+=	-Wall -W -fno-strength-reduce
-+INCPATH	=	-I$(X11BASE)/include/qt2 -I$(X11BASE)/include
++CC	?=	gcc
++CXX	?=	g++
++CFLAGS	?=	-Wall -W -O2 -fno-strength-reduce
++CXXFLAGS?=	-Wall -W -O2 -fno-strength-reduce
++INCPATH	=	-I$(QTDIR)/include/qt2
 +LINK	=	$(CXX)
 +LFLAGS	=	
-+LIBS	=	-L$(X11BASE)/lib -lqt2 -lX11
-+MOC	=	moc2
++LIBS	=	-L$(QTDIR)/lib -lqt2
++MOC	=	$(QTDIR)/bin/moc2
  
  ####### Files
  
+@@ -351,16 +353,16 @@
+ .SUFFIXES: .cpp .cxx .cc .C .c
+ 
+ .cpp.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .cxx.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .cc.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .C.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
diff --git a/cad/qcad/files/patch-ab b/cad/qcad/files/patch-ab
new file mode 100644
index 000000000000..ffb6900b8b8b
--- /dev/null
+++ b/cad/qcad/files/patch-ab
@@ -0,0 +1,11 @@
+--- rappwin.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rappwin.cpp	Sat Sep 23 14:37:46 2000
+@@ -3292,7 +3292,7 @@
+     case 0:
+       if(true) {
+         if(!QFileInfo(manualStr).exists()) {
+-          manualStr = "	/usr/share/doc/qcad/html/index.html";
++          manualStr = "	%%PREFIX%%/share/doc/qcad/html/index.html";
+         }
+ 
+         RLOG("\nEXEC:");
diff --git a/cad/qcad/files/patch-ac b/cad/qcad/files/patch-ac
new file mode 100644
index 000000000000..0add977c2877
--- /dev/null
+++ b/cad/qcad/files/patch-ac
@@ -0,0 +1,20 @@
+--- rconfig.cpp.orig	Sat Sep 23 14:33:24 2000
++++ rconfig.cpp	Sat Sep 23 14:36:05 2000
+@@ -178,7 +178,7 @@
+   addSetting( "Print:PrintAdjustmentFactor", "1.0");
+ 
+   addSetting( "Paths:BrowserPath", (RUNNING_WINDOWS ? "C:\\Progra~1\\Intern~1\\Iexplore.exe" : "netscape"));
+-  addSetting( "Paths:LibraryPath1", "/usr/share/qcad/libraries" );
++  addSetting( "Paths:LibraryPath1", "%%PREFIX%%/share/qcad/libraries" );
+ 
+   verbose=false;
+ }
+@@ -579,7 +579,7 @@
+ 
+   // Search in /usr/share/qcad/... dir:
+   if(!QFileInfo(path).exists()) {
+-    path = QString("/usr/share/")+DEF_APPNAME_L+"/"+_relPath;
++    path = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_relPath;
+   }
+ #endif
+ 
diff --git a/cad/qcad/files/patch-ad b/cad/qcad/files/patch-ad
new file mode 100644
index 000000000000..65f540115e0b
--- /dev/null
+++ b/cad/qcad/files/patch-ad
@@ -0,0 +1,11 @@
+--- relement.cpp.orig	Sat Aug 12 03:31:54 2000
++++ relement.cpp	Sat Sep 23 14:37:06 2000
+@@ -3681,7 +3681,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("%%PREFIX%%/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
+   }
+ #endif
+   */
diff --git a/cad/qcad/files/patch-ae b/cad/qcad/files/patch-ae
new file mode 100644
index 000000000000..3a98da5fee03
--- /dev/null
+++ b/cad/qcad/files/patch-ae
@@ -0,0 +1,20 @@
+--- rfile.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rfile.cpp	Sat Sep 23 14:38:35 2000
+@@ -295,7 +295,7 @@
+ 
+ #ifndef DEF_WINDOWS
+   // Test /usr/share/<proj>/...:
+-  ret = QString("/usr/share/")+DEF_APPNAME_L+subdir+"/"+_name;
++  ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+subdir+"/"+_name;
+   RLOG("\nret2: "); RLOG(ret);
+   if(QFileInfo(ret).exists()) return ret;
+ 
+@@ -327,7 +327,7 @@
+ #ifndef DEF_WINDOWS
+   if(_prior==0 || _prior==2) {
+     // Test /usr/share/<proj>/...:
+-    ret = QString("/usr/share/")+DEF_APPNAME_L+"/"+_subdir;
++    ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_subdir;
+     if(QFileInfo(ret).exists()) return ret;
+   }
+ 
diff --git a/cad/qcad/files/patch-af b/cad/qcad/files/patch-af
new file mode 100644
index 000000000000..cdb56ae5b136
--- /dev/null
+++ b/cad/qcad/files/patch-af
@@ -0,0 +1,14 @@
+--- rfonts.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rfonts.cpp	Sat Sep 23 14:39:57 2000
+@@ -68,10 +68,7 @@
+ 
+ #ifndef DEF_WINDOWS
+   // Lookup from /usr/share/<proj>/fonts:
+-  lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" );
+-
+-  // Lookup from /usr/local/<proj>/fonts:
+-  lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" );
++  lookupFonts( QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/fonts" );
+ 
+   // Lookup from ~/.<proj>/fonts:
+   lookupFonts( RCONFIG->getConfigDir().path()+"/fonts" );