Attachment #138328 for bug #184248

View | Details | Raw Unified | Return to bug 184248
Collapse All | Expand All




# $FreeBSD: head/finance/qhacc/Makefile 334499 2013-11-21 16:09:47Z makc $

PORTNAME=	qhacc
PORTVERSION=	4.2.1
CATEGORIES=	finance
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX=	.tgz

USES=		qmake:norecursive
USE_QT4=	corelib gui sql moc_build rcc_build uic_build
USE_GCC=	yes
USE_CXXSTD=	c++0x
USE_LDCONFIG=	yes

CXXFLAGS+=	-fpermissive

DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAME}" "" ""

.include <bsd.port.options.mk>

		'/^INSTALLDIR/s|=.*|=${DATADIR}| ; \
		 /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \
		 /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \
		 /^QMAKE_/s|=.*|=| ; \
		 /+= debug/s|^|#|' ${WRKSRC}/user.pri
	@${REINPLACE_CMD} -e \
		's|/usr/include|${LOCALBASE}/include| ; \

Lines 1-2 Link Here

(-)finance/qhacc/distinfo (-2 / +2 lines)
1	SHA256 (qhacc-4.2.tgz) = e432006ba24a930ebc2cf8ced29a27de7ace9fdefe780d6bccb17aeb0419dc53	1	SHA256 (qhacc-4.2.1.tgz) = 2e491f0c6c47d81f2ed32f8bad49bb18c6c19a43a05679d2e445c7e081bbe08d
2	SIZE (qhacc-4.2.tgz) = 135066	2	SIZE (qhacc-4.2.1.tgz) = 145190




--- gui/graphing/BudgetingWindow.cpp.orig
+++ gui/graphing/BudgetingWindow.cpp
@@ -120,7 +120,11 @@
     }
   }
 
+#if defined(QWT_VERSION) && QWT_VERSION>=0x060100
+  const QwtScaleDiv * div = &widget.qwtPlot->axisScaleDiv( QwtPlot::xBottom );
+#else
   QwtScaleDiv * div = widget.qwtPlot->axisScaleDiv( QwtPlot::xBottom );
+#endif
   div->setInterval( 0, drawer->count() );
   widget.qwtPlot->setAxisMaxMajor( QwtPlot::xBottom, drawer->count() );


Return to bug 184248

Lines 2-8 Link Here

(-)finance/qhacc/Makefile (-3 / +3 lines)
2	# $FreeBSD: head/finance/qhacc/Makefile 334499 2013-11-21 16:09:47Z makc $	2	# $FreeBSD: head/finance/qhacc/Makefile 334499 2013-11-21 16:09:47Z makc $
3		3
4	PORTNAME= qhacc	4	PORTNAME= qhacc
5	PORTVERSION= 4.2	5	PORTVERSION= 4.2.1
6	CATEGORIES= finance	6	CATEGORIES= finance
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8	EXTRACT_SUFX= .tgz	8	EXTRACT_SUFX= .tgz
Lines 19-28 Link Here
19	USES= qmake:norecursive	19	USES= qmake:norecursive
20	USE_QT4= corelib gui sql moc_build rcc_build uic_build	20	USE_QT4= corelib gui sql moc_build rcc_build uic_build
21	USE_GCC= yes	21	USE_GCC= yes
		22	USE_CXXSTD= c++0x
22	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
23		24
24	CXXFLAGS+= -fpermissive
25
26	DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAME}" "" ""	25	DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAME}" "" ""
27		26
28	.include <bsd.port.options.mk>	27	.include <bsd.port.options.mk>
Lines 32-37 Link Here
32	'/^INSTALLDIR/s\|=.*\|=${DATADIR}\| ; \	31	'/^INSTALLDIR/s\|=.*\|=${DATADIR}\| ; \
33	/^QWTINCS/s\|=.*\|=${LOCALBASE}/include/qwt6\| ; \	32	/^QWTINCS/s\|=.*\|=${LOCALBASE}/include/qwt6\| ; \
34	/^QWTLIBS/s\|=.*\|=${LOCALBASE}/lib -lqwt6\| ; \	33	/^QWTLIBS/s\|=.*\|=${LOCALBASE}/lib -lqwt6\| ; \
		34	/^QMAKE_/s\|=.*\|=\| ; \
35	/+= debug/s\|^\|#\|' ${WRKSRC}/user.pri	35	/+= debug/s\|^\|#\|' ${WRKSRC}/user.pri
36	@${REINPLACE_CMD} -e \	36	@${REINPLACE_CMD} -e \
37	's\|/usr/include\|${LOCALBASE}/include\| ; \	37	's\|/usr/include\|${LOCALBASE}/include\| ; \

Lines 1-14 Link Here

(-)finance/qhacc/files/patch-gui__graphing__BudgetingWindow.cpp (-14 lines)
1	--- gui/graphing/BudgetingWindow.cpp.orig
2	+++ gui/graphing/BudgetingWindow.cpp
3	@@ -120,7 +120,11 @@
4	}
5	}
6
7	+#if defined(QWT_VERSION) && QWT_VERSION>=0x060100
8	+ const QwtScaleDiv * div = &widget.qwtPlot->axisScaleDiv( QwtPlot::xBottom );
9	+#else
10	QwtScaleDiv * div = widget.qwtPlot->axisScaleDiv( QwtPlot::xBottom );
11	+#endif
12	div->setInterval( 0, drawer->count() );
13	widget.qwtPlot->setAxisMaxMajor( QwtPlot::xBottom, drawer->count() );
14