On Sun, Jun 06, 2010 at 02:21:04AM +0300, Antti Harri wrote:
Fix build with gcc4.
Hello,
I would like to propose these things to be patched as well:
- Better license marker
- Use of SUBST*
- @bin for the PLIST
- Fix the order of recent files menu
Looks fine, thanks. Merged diff (with an additional WANTLIB change)
below.
If anyone is using qcad and does not like the reversed `recent
files' menu, please speak up NOW.
I must warn though, looks like those changes have
been in my mystuff/ for two years, so they could use
some double-checking to make sure they are up-to-date.
It compiles and it works (at least on my amd64), I don't see any
problem with it.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/cad/qcad/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile10 Aug 2009 06:30:30 - 1.17
+++ Makefile6 Jun 2010 12:57:49 -
@@ -4,17 +4,17 @@ COMMENT= Qt-based 2D CAD system
V= 2.0.5.0
DISTNAME= qcad-${V}-1-community.src
-PKGNAME= qcad-${V}p0
+PKGNAME= qcad-${V}p1
CATEGORIES=cad graphics
HOMEPAGE= http://www.ribbonsoft.com/qcad.html
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext c m pthread pthread-stubs stdc++ xcb
+WANTLIB= X11 Xext c m pthread stdc++
MASTER_SITES= http://www.ribbonsoft.com/archives/qcad/
@@ -30,13 +30,12 @@ PORTHOME= ${WRKDIR}
MAKE_ENV+= QTDIR=${MODQT_LIBDIR} \
MAKE=${MAKE_PROGRAM}
+SUBST_VARS=CXXFLAGS LOCALBASE MODQT_LIBDIR
+
pre-configure:
- @perl -pi -e 's,!!CXXFLAGS!!,${CXXFLAGS},' ${WRKSRC}/mkspecs/defs.pro
- @perl -pi -e 's,!!DOCDIR!!,${PREFIX}/share/doc/qcad,' \
- ${WRKSRC}/qcadlib/src/engine/rs_system.h
- @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' \
- ${WRKSRC}/qcadlib/src/engine/rs_system.cpp
- @perl -pi -e 's,!!QTDIR!!,${MODQT_LIBDIR},' \
+ ${SUBST_CMD} ${WRKSRC}/mkspecs/defs.pro \
+ ${WRKSRC}/qcadlib/src/engine/rs_system.h \
+ ${WRKSRC}/qcadlib/src/engine/rs_system.cpp \
${WRKSRC}/qcad/src/qc_applicationwindow.cpp
do-build:
Index: patches/patch-mkspecs_defs_pro
===
RCS file: /cvs/ports/cad/qcad/patches/patch-mkspecs_defs_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-mkspecs_defs_pro
--- patches/patch-mkspecs_defs_pro 9 Jan 2007 16:30:37 - 1.1
+++ patches/patch-mkspecs_defs_pro 6 Jun 2010 12:57:49 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-mkspecs_defs_pro,v 1.1 2007/01/09 16:30:37 steven Exp $
--- mkspecs/defs.pro.orig Tue Nov 22 12:47:28 2005
-+++ mkspecs/defs.pro Tue Jan 9 16:38:47 2007
mkspecs/defs.pro Sun Jun 6 14:39:58 2010
@@ -1,6 +1,7 @@
# $Id: patch-mkspecs_defs_pro,v 1.1 2007/01/09 16:30:37 steven Exp $
-QMAKE_CXXFLAGS_DEBUG += -pedantic
-QMAKE_CXXFLAGS += -pedantic
-+QMAKE_CXXFLAGS_DEBUG += !!CXXFLAGS!!
-+QMAKE_CXXFLAGS += !!CXXFLAGS!!
++QMAKE_CXXFLAGS_DEBUG += ${CXXFLAGS}
++QMAKE_CXXFLAGS += ${CXXFLAGS}
+QMAKE_CXXFLAGS_RELEASE =
win32 {
Index: patches/patch-qcad_src_qc_applicationwindow_cpp
===
RCS file: /cvs/ports/cad/qcad/patches/patch-qcad_src_qc_applicationwindow_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qcad_src_qc_applicationwindow_cpp
--- patches/patch-qcad_src_qc_applicationwindow_cpp 9 Jan 2007 16:30:37
- 1.1
+++ patches/patch-qcad_src_qc_applicationwindow_cpp 6 Jun 2010 12:57:49
-
@@ -1,12 +1,24 @@
$OpenBSD: patch-qcad_src_qc_applicationwindow_cpp,v 1.1 2007/01/09 16:30:37
steven Exp $
qcad/src/qc_applicationwindow.cpp.orig Sat Jan 6 16:31:24 2007
-+++ qcad/src/qc_applicationwindow.cpp Sat Jan 6 16:54:10 2007
-@@ -2943,7 +2943,7 @@ void QC_ApplicationWindow::slotHelpManua
+--- qcad/src/qc_applicationwindow.cpp.orig Tue Nov 22 12:49:33 2005
qcad/src/qc_applicationwindow.cpp Sun Jun 6 14:14:48 2010
+@@ -1581,9 +1581,9 @@ void QC_ApplicationWindow::updateRecentFilesMenu() {
+ RS_DEBUG-print(QC_ApplicationWindow::updateRecentFilesMenu());
+
+ RS_DEBUG-print(Updating recent file menu...);
+-for (int i=0; irecentFiles-getNumber(); ++i) {
++for (int i=recentFiles-getNumber(); i=0; --i) {
+ QString label = QString( %1 %2 ).
+-arg(i+1).arg(recentFiles-get(i));
++
arg(recentFiles-getNumber()-i).arg(recentFiles-get(i));
+
+ if (fileMenu-findItem(i)) {
+ RS_DEBUG-print(Changeing item %d, i);
+@@ -2943,7 +2943,7 @@ void QC_ApplicationWindow::slotHelpManual() {
RS_SYSTEM-getAppDir().latin1());
RS_DEBUG-print(QC_ApplicationWindow::slotHelpManual():
