Remove obsolete patches left over from previous commit
This commit is contained in:
Tilman Keskinoz
parent
9fbeb99b3e
commit
d169e68a8d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70504
@ -1,29 +0,0 @@
|
||||
--- Makefile.orig Mon May 27 00:08:53 2002
|
||||
+++ Makefile Thu May 30 02:58:38 2002
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
####### Compiler, tools and options
|
||||
|
||||
-CC = gcc
|
||||
-CXX = g++
|
||||
-CFLAGS = -pipe -Wall -W -O2 -DNO_DEBUG
|
||||
-CXXFLAGS= -pipe -Wall -W -O2 -DNO_DEBUG
|
||||
-INCPATH = -I$(QTDIR)/include
|
||||
-LINK = g++
|
||||
-LFLAGS = -static
|
||||
-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
|
||||
-MOC = $(QTDIR)/bin/moc
|
||||
-UIC = $(QTDIR)/bin/uic
|
||||
+CC ?= gcc
|
||||
+CXX ?= g++
|
||||
+CFLAGS += -DNO_DEBUG
|
||||
+CXXFLAGS+= -DNO_DEBUG
|
||||
+INCPATH = ${QTCPPFLAGS}
|
||||
+LINK = ${CXX}
|
||||
+LFLAGS =
|
||||
+LIBS = ${QTCFGLIBS} ${LIBQT}
|
||||
+MOC ?= ${X11BASE}/bin/moc2
|
||||
+UIC ?= ${X11BASE}/bin/uic
|
||||
|
||||
TAR = tar -cf
|
||||
GZIP = gzip -9f
|
||||
@ -1,11 +0,0 @@
|
||||
--- 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:");
|
||||
@ -1,20 +0,0 @@
|
||||
--- 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
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- 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
|
||||
*/
|
||||
@ -1,20 +0,0 @@
|
||||
--- 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;
|
||||
}
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- 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" );
|
||||
@ -1,29 +0,0 @@
|
||||
--- Makefile.orig Mon May 27 00:08:53 2002
|
||||
+++ Makefile Thu May 30 02:58:38 2002
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
####### Compiler, tools and options
|
||||
|
||||
-CC = gcc
|
||||
-CXX = g++
|
||||
-CFLAGS = -pipe -Wall -W -O2 -DNO_DEBUG
|
||||
-CXXFLAGS= -pipe -Wall -W -O2 -DNO_DEBUG
|
||||
-INCPATH = -I$(QTDIR)/include
|
||||
-LINK = g++
|
||||
-LFLAGS = -static
|
||||
-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
|
||||
-MOC = $(QTDIR)/bin/moc
|
||||
-UIC = $(QTDIR)/bin/uic
|
||||
+CC ?= gcc
|
||||
+CXX ?= g++
|
||||
+CFLAGS += -DNO_DEBUG
|
||||
+CXXFLAGS+= -DNO_DEBUG
|
||||
+INCPATH = ${QTCPPFLAGS}
|
||||
+LINK = ${CXX}
|
||||
+LFLAGS =
|
||||
+LIBS = ${QTCFGLIBS} ${LIBQT}
|
||||
+MOC ?= ${X11BASE}/bin/moc2
|
||||
+UIC ?= ${X11BASE}/bin/uic
|
||||
|
||||
TAR = tar -cf
|
||||
GZIP = gzip -9f
|
||||
@ -1,11 +0,0 @@
|
||||
--- 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:");
|
||||
@ -1,20 +0,0 @@
|
||||
--- 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
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- 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
|
||||
*/
|
||||
@ -1,20 +0,0 @@
|
||||
--- 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;
|
||||
}
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- 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" );
|
||||
Loading…
Reference in New Issue
Block a user