- Update to version 4.3 New file: files/patch-engine__DefaultQHaccLoader.cpp files/patch-engine__GpgQHaccLoader.cpp files/patch-engine__IDableEntity.cpp files/patch-engine__calculators__PayeeCalculator.cpp files/patch-engine__calculators__PieCalculator.cpp files/patch-tools__EncryptingLoader.cpp
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Fri Feb 7 12:59:02 2014 New Revision: 343223 URL: http://svnweb.freebsd.org/changeset/ports/343223 QAT: https://qat.redports.org/buildarchive/r343223/ Log: - Update to 4.3 PR: 186418 Submitted by: ports fury Added: head/finance/qhacc/files/ head/finance/qhacc/files/patch-engine__DefaultQHaccLoader.cpp (contents, props changed) head/finance/qhacc/files/patch-engine__GpgQHaccLoader.cpp (contents, props changed) head/finance/qhacc/files/patch-engine__IDableEntity.cpp (contents, props changed) head/finance/qhacc/files/patch-engine__calculators__PayeeCalculator.cpp (contents, props changed) head/finance/qhacc/files/patch-engine__calculators__PieCalculator.cpp (contents, props changed) head/finance/qhacc/files/patch-tools__EncryptingLoader.cpp (contents, props changed) Modified: head/finance/qhacc/Makefile head/finance/qhacc/distinfo Modified: head/finance/qhacc/Makefile ============================================================================== --- head/finance/qhacc/Makefile Fri Feb 7 12:57:18 2014 (r343222) +++ head/finance/qhacc/Makefile Fri Feb 7 12:59:02 2014 (r343223) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qhacc -PORTVERSION= 4.2.1 +PORTVERSION= 4.3 CATEGORIES= finance MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -12,13 +12,13 @@ COMMENT= Simple Qt-based financial manag LICENSE= GPLv2 # (or later) -LIB_DEPENDS= libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 +LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \ + libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 OPTIONS_DEFINE= DOCS USES= qmake:norecursive USE_QT4= corelib gui sql moc_build rcc_build uic_build -USE_GCC= yes USE_CXXSTD= c++0x USE_LDCONFIG= yes @@ -26,23 +26,32 @@ DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAM .include <bsd.port.options.mk> +.if ${OSVERSION} < 1000054 +USE_GCC= yes +.endif + post-patch: @${REINPLACE_CMD} -e \ '/^INSTALLDIR/s|=.*|=${DATADIR}| ; \ /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \ /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \ - /^QMAKE_/s|=.*|=| ; \ - /+= debug/s|^|#|' ${WRKSRC}/user.pri + /+= debug/s|^|#| ; \ + /^QMAKE_CFLAGS/s|=.*|= $$$${GPGMEINCS}| ; \ + /^QMAKE_CXXFLAGS/s|=.*|= $$$${GPGMEINCS}| ; \ + /^INCLUDEPATH/s|=.*|=|' ${WRKSRC}/user.pri @${REINPLACE_CMD} -e \ 's|/usr/include|${LOCALBASE}/include| ; \ s|-lqwt||' ${WRKSRC}/gui/gui.pro @${REINPLACE_CMD} -e \ 's|/../qm/|/../share/qhacc/|' ${WRKSRC}/gui/main.cpp + @${FIND} ${WRKSRC} -name "*.cpp" -or -name "*.h" -or -name "*.ui" | \ + ${XARGS} ${REINPLACE_CMD} -e \ + 's|qwt/||' do-install: (cd ${WRKSRC}/gui/build/release && ${INSTALL_PROGRAM} \ qhacc ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/engine/build/release && ${INSTALL_DATA} \ + (cd ${WRKSRC}/engine/build/release && ${INSTALL_LIB} \ libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib) @${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so @${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so.1 Modified: head/finance/qhacc/distinfo ============================================================================== --- head/finance/qhacc/distinfo Fri Feb 7 12:57:18 2014 (r343222) +++ head/finance/qhacc/distinfo Fri Feb 7 12:59:02 2014 (r343223) @@ -1,2 +1,2 @@ -SHA256 (qhacc-4.2.1.tgz) = 2e491f0c6c47d81f2ed32f8bad49bb18c6c19a43a05679d2e445c7e081bbe08d -SIZE (qhacc-4.2.1.tgz) = 145190 +SHA256 (qhacc-4.3.tgz) = 007d0ccf0e9e239a215dabe4b305ca9c655673c123f570c0908567f97a32083f +SIZE (qhacc-4.3.tgz) = 150670 Added: head/finance/qhacc/files/patch-engine__DefaultQHaccLoader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/qhacc/files/patch-engine__DefaultQHaccLoader.cpp Fri Feb 7 12:59:02 2014 (r343223) @@ -0,0 +1,11 @@ +--- engine/DefaultQHaccLoader.cpp.orig ++++ engine/DefaultQHaccLoader.cpp +@@ -22,6 +22,8 @@ + #include "QHacc.h" + + #include <sys/stat.h> ++#include <cstdlib> ++ + #include <QSqlQuery> + #include <QSqlError> + #include <QStringList> Added: head/finance/qhacc/files/patch-engine__GpgQHaccLoader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/qhacc/files/patch-engine__GpgQHaccLoader.cpp Fri Feb 7 12:59:02 2014 (r343223) @@ -0,0 +1,10 @@ +--- engine/GpgQHaccLoader.cpp.orig ++++ engine/GpgQHaccLoader.cpp +@@ -26,6 +26,7 @@ + #include <unistd.h> + #include <iostream> + #include <cstdio> ++#include <cerrno> + + #include <QFile> + #include <QVariant> Added: head/finance/qhacc/files/patch-engine__IDableEntity.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/qhacc/files/patch-engine__IDableEntity.cpp Fri Feb 7 12:59:02 2014 (r343223) @@ -0,0 +1,11 @@ +--- engine/IDableEntity.cpp.orig ++++ engine/IDableEntity.cpp +@@ -21,7 +21,7 @@ + + const int IDableEntity::NOID = -1; + +-IDableEntity::IDableEntity( int _id = NOID ) { ++IDableEntity::IDableEntity( int _id ) { + setId( _id ); + } + Added: head/finance/qhacc/files/patch-engine__calculators__PayeeCalculator.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/qhacc/files/patch-engine__calculators__PayeeCalculator.cpp Fri Feb 7 12:59:02 2014 (r343223) @@ -0,0 +1,19 @@ +--- engine/calculators/PayeeCalculator.cpp.orig ++++ engine/calculators/PayeeCalculator.cpp +@@ -59,14 +59,12 @@ + } + + std::multimap<Money, QString> moneymap; +- std::map<QString, Money>::iterator it; +- for( it = payeemap.begin(); it!= payeemap.end(); ++it ){ ++ for( auto it = payeemap.begin(); it!= payeemap.end(); ++it ){ + moneymap.insert( std::make_pair( it->second, it->first ) ); + } + + int id = 0; +- std::map<Money, QString>::iterator mit; +- for( mit = moneymap.begin(); mit!= moneymap.end(); ++mit ){ ++ for( auto mit = moneymap.begin(); mit!= moneymap.end(); ++mit ){ + CalculatorSeries cs( ++id ); + cs.addValue( mit->first ); + Added: head/finance/qhacc/files/patch-engine__calculators__PieCalculator.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/qhacc/files/patch-engine__calculators__PieCalculator.cpp Fri Feb 7 12:59:02 2014 (r343223) @@ -0,0 +1,11 @@ +--- engine/calculators/PieCalculator.cpp.orig ++++ engine/calculators/PieCalculator.cpp +@@ -147,7 +147,7 @@ + + // erase the smallest accounts + Money other; +- std::map<Money,int>::iterator it = smap.begin(); ++ auto it = smap.begin(); + while( mergenum >= 0 ){ + other += it->first; + Added: head/finance/qhacc/files/patch-tools__EncryptingLoader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/qhacc/files/patch-tools__EncryptingLoader.cpp Fri Feb 7 12:59:02 2014 (r343223) @@ -0,0 +1,11 @@ +--- tools/EncryptingLoader.cpp.orig ++++ tools/EncryptingLoader.cpp +@@ -17,6 +17,8 @@ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + ************************** * * * * * * * * * * * * **************************/ + ++#include <cstdlib> ++ + #include <QSqlError> + + #include "EncryptingLoader.h" _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"