summaryrefslogtreecommitdiff
path: root/cad/qcad/patches
diff options
context:
space:
mode:
Diffstat (limited to 'cad/qcad/patches')
-rw-r--r--cad/qcad/patches/patch-aa76
-rw-r--r--cad/qcad/patches/patch-ab26
-rw-r--r--cad/qcad/patches/patch-ac85
-rw-r--r--cad/qcad/patches/patch-ad13
-rw-r--r--cad/qcad/patches/patch-af17
5 files changed, 47 insertions, 170 deletions
diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 8a893905555..060796b1d84 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,55 +1,23 @@
-$NetBSD: patch-aa,v 1.9 2006/01/05 16:24:37 joerg Exp $
+$NetBSD: patch-aa,v 1.10 2006/06/15 08:26:58 chap Exp $
---- Makefile.orig 2002-09-20 19:26:57.000000000 +0200
-+++ Makefile
-@@ -8,20 +8,20 @@
-
- ####### Compiler, tools and options
-
--CC = gcc
--CXX = g++
--LEX = flex
--YACC = yacc
--CFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG
--CXXFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG
-+CC ?= gcc
-+CXX ?= g++
-+LEX ?= flex
-+YACC ?= yacc
-+CFLAGS += -Wall -W -DQT_NO_DEBUG
-+CXXFLAGS += -Wall -W -DQT_NO_DEBUG
- LEXFLAGS =
- YACCFLAGS= -d
--INCPATH = -I$(QTDIR)/include -I$(QTDIR)/mkspecs/linux-g++
-+INCPATH = -I$(QTDIR)/include -I$(X11BASE)/include
- LINK = g++
- LFLAGS =
--LIBS = $(SUBLIBS) -Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
--AR = ar cqs
--RANLIB =
-+LIBS = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-+AR ?= ar cqs
-+RANLIB ?=
- MOC = $(QTDIR)/bin/moc
- UIC = $(QTDIR)/bin/uic
- QMAKE = qmake
-@@ -1766,6 +1766,9 @@ moc_ractzoom.o: moc_ractzoom.cpp ractzoo
-
- moc_rappwin.o: moc_rappwin.cpp rappwin.h ractiondef.h \
- rprgdef.h
-+.if (${MACHINE_ARCH} == "alpha")
-+ $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rappwin.cpp
-+.endif
-
- moc_rattribdialog.o: moc_rattribdialog.cpp rattribdialog.h rcombobox.h \
- rgraphdef.h \
-@@ -1836,6 +1839,9 @@ moc_rgraphic.o: moc_rgraphic.cpp rgraphi
- rtypes.h \
- rprgdef.h \
- rmathdef.h
-+.if (${MACHINE_ARCH} == "alpha")
-+ $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rgraphic.cpp
-+.endif
-
- moc_rgroupbox.o: moc_rgroupbox.cpp rgroupbox.h
-
+--- qcad/src/qc_applicationwindow.cpp.orig 2005-11-22 06:49:33.000000000 -0500
++++ qcad/src/qc_applicationwindow.cpp
+@@ -2917,6 +2917,9 @@ void QC_ApplicationWindow::slotHelpAbout
+ "<br>" +
+ tr("Modules: %1").arg(modulesString) + "<br>" +
+ QString("http://www.ribbonsoft.com")
++ + QString("<hr>")
++ + QString("<br>Installed with pkgsrc: www.pkgsrc.org")
++ + QString("<br>use pkg_info for build details")
+ #ifdef QC_ABOUT_ADD_COMPANY
+ + QString("<br>") + QC_ABOUT_ADD_COMPANY
+ + QString("</center>")
+@@ -2943,7 +2946,7 @@ void QC_ApplicationWindow::slotHelpManua
+ RS_SYSTEM->getAppDir().latin1());
+ RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
+ RS_SYSTEM->getAppDir().latin1());
+- assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
++ assistant = new QAssistantClient("@QTDIR@/bin", this);
+ connect(assistant, SIGNAL(error(const QString&)),
+ this, SLOT(slotError(const QString&)));
+ QStringList args;
diff --git a/cad/qcad/patches/patch-ab b/cad/qcad/patches/patch-ab
index 864b9e5576b..a1743d9f296 100644
--- a/cad/qcad/patches/patch-ab
+++ b/cad/qcad/patches/patch-ab
@@ -1,13 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/15 08:26:58 chap Exp $
---- rappwin.cpp.orig Tue Feb 20 21:27:18 2001
-+++ rappwin.cpp
-@@ -3292,7 +3292,7 @@
- case 0:
- if(true) {
- if(!QFileInfo(manualStr).exists()) {
-- manualStr = " /usr/share/doc/qcad/html/index.html";
-+ manualStr = " @PREFIX@/share/qcad/doc/en/index.html";
+--- qcadlib/src/engine/rs_system.cpp.orig 2005-11-22 06:52:36.000000000 -0500
++++ qcadlib/src/engine/rs_system.cpp
+@@ -333,13 +333,7 @@ RS_StringList RS_System::getDirectoryLis
+ dirList.append(appDir + "/" + subDirectory);
}
- RLOG("\nEXEC:");
+- // Redhat style:
+- dirList.append("/usr/share/" + appDirName + "/" + subDirectory);
+-
+- // SuSE style:
+- dirList.append("/usr/X11R6/" + appDirName + "/" + subDirectory);
+-
+- dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
++ dirList.append("@PREFIX@/share/" + appDirName + "/" + subDirectory);
+ dirList.append(getHomeDir() + "/." + appDirName + "/" + subDirectory);
+
+ #ifdef __APPLE__
diff --git a/cad/qcad/patches/patch-ac b/cad/qcad/patches/patch-ac
index db3f2728ff4..6682e728570 100644
--- a/cad/qcad/patches/patch-ac
+++ b/cad/qcad/patches/patch-ac
@@ -1,77 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2006/01/05 16:24:37 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2006/06/15 08:26:59 chap Exp $
---- rprgdef.h.orig 2002-09-20 17:26:57.000000000 +0000
-+++ rprgdef.h
-@@ -22,16 +22,27 @@
- //#define DEF_LESS_DIALOGS // Don't show the startup dialog
-
-
-+// Define one of
-+// DEF_LINUX
-+// DEF_SOLARIS
-+// DEF_WINDOWS
-+// DEF_BSD
-+// DEF_IRIX
-+
-+#define DEF_@OPSYS@
-+
- // Uncomment for Linux
--#define DEF_LINUX // Are we running Linux?
-+#ifdef 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"
-+#endif
-
-+#define DATADIR "@PREFIX@/share"
-
--#ifdef __FreeBSD__
-+
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define DEF_FREEBSD
- #undef DEF_LINUX
- #define RUNNING_LINUX true // close enough
-@@ -42,35 +53,30 @@
-
-
- // Uncomment for Solaris
--/*
--#define DEF_SOLARIS // Are we running Solaris?
-+#ifdef DEF_SOLARIS // Are we running Solaris?
- #define RUNNING_SOLARIS true
- #define RUNNING_WINDOWS false
- #define RUNNING_LINUX false
- #define RUNNING_IRIX false
--*/
-+#endif
-
-
- // Uncomment for Windoze
--/*
--#define DEF_WINDOWS // Iiiik - we're running windoze!!!
-+#ifdef DEF_WINDOWS // Iiiik - we're running windoze!!!
- #define RUNNING_WINDOWS true
- #define RUNNING_LINUX false
- #define RUNNING_SOLARIS false
- #define RUNNING_IRIX false
--*/
--
-+#endif
-
-
- // Uncomment for IRIX
--/*
--#define DEF_SGI // Are we running IRIX?
-+#ifdef DEF_SGI // Are we running IRIX?
- #define RUNNING_SOLARIS false
- #define RUNNING_WINDOWS false
- #define RUNNING_LINUX false
- #define RUNNING_IRIX true
--*/
--
-+#endif
-
- #ifdef DEF_SOLARIS
- #define true 1
+--- mkspecs/defs.pro.orig 2006-02-27 15:34:20.000000000 -0500
++++ mkspecs/defs.pro 2006-02-27 15:36:41.000000000 -0500
+@@ -2,5 +2,3 @@
+-QMAKE_CXXFLAGS_DEBUG += -pedantic
+-QMAKE_CXXFLAGS += -pedantic
+
+ win32 {
+ QMAKE_CFLAGS_THREAD -= -mthreads
diff --git a/cad/qcad/patches/patch-ad b/cad/qcad/patches/patch-ad
deleted file mode 100644
index 570562e495f..00000000000
--- a/cad/qcad/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/04/29 21:51:54 jtb Exp $
-
---- relement.cpp.orig
-+++ relement.cpp
-@@ -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("@PREFIX@/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
- }
- #endif
- */
diff --git a/cad/qcad/patches/patch-af b/cad/qcad/patches/patch-af
deleted file mode 100644
index ef9147ee2ac..00000000000
--- a/cad/qcad/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/04/29 21:51:54 jtb Exp $
-
---- rfonts.cpp.orig
-+++ rfonts.cpp
-@@ -69,10 +69,10 @@
-
- #ifndef DEF_WINDOWS
- // Lookup from /usr/share/<proj>/fonts:
-- lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" );
-+ lookupFonts( QString("@PREFIX@/share/")+DEF_APPNAME_L+"/fonts" );
-
- // Lookup from /usr/X11R6/<proj>/fonts:
-- lookupFonts( QString("/usr/X11R6/")+DEF_APPNAME_L+"/fonts" );
-+ lookupFonts( QString("@X11BASE@/")+DEF_APPNAME_L+"/fonts" );
-
- // Lookup from /usr/local/<proj>/fonts:
- lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" );
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 06:51:46 +0000