From bb5316bfb0437dbaadf8d4f37118d5176c7480cf Mon Sep 17 00:00:00 2001 From: rakuco Date: Sat, 26 May 2012 23:18:07 +0000 Subject: Update KDevelop-related ports now that KDE 4.8.3 has been committed. Special thanks to Luca Pizzamiglio for working on the update to 4.3.0, which made going to 4.3.1 much easier. --- devel/kdevelop-kde4/Makefile | 5 +- devel/kdevelop-kde4/distinfo | 4 +- devel/kdevelop-kde4/files/patch-git_6b95b83 | 106 +++++++++++++++++++++ devel/kdevelop-kde4/pkg-plist | 138 +++++++++++++++++++++++++++- 4 files changed, 246 insertions(+), 7 deletions(-) create mode 100644 devel/kdevelop-kde4/files/patch-git_6b95b83 (limited to 'devel/kdevelop-kde4') diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index 1804b0ab4aea..9b1cb4279c37 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -6,7 +6,6 @@ PORTNAME= kdevelop DISTVERSION= ${KDEVELOP_VERSION} -PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src @@ -15,7 +14,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Opensource IDE based on KDevPlatform, KDE and Qt libraries -LIB_DEPENDS+= kdevplatforminterfaces.3:${PORTSDIR}/devel/kdevplatform +LIB_DEPENDS+= kdevplatforminterfaces.5:${PORTSDIR}/devel/kdevplatform USE_BZIP2= yes USE_CMAKE= yes @@ -33,7 +32,7 @@ LATEST_LINK= ${PORTNAME}-kde4 .include .ifndef(WITHOUT_OKTETA) -LIB_DEPENDS+= oktetacore.5:${PORTSDIR}/devel/kdesdk4 +LIB_DEPENDS+= okteta1core:${PORTSDIR}/devel/kdesdk4 PLIST_SUB+= OKTETA="" .else CMAKE_ARGS+= WITH_LibOkteta:BOOL=FALSE diff --git a/devel/kdevelop-kde4/distinfo b/devel/kdevelop-kde4/distinfo index 546143c0e070..43d1ada62cf3 100644 --- a/devel/kdevelop-kde4/distinfo +++ b/devel/kdevelop-kde4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdevelop-4.2.3.tar.bz2) = cab3863f7dc009949c4b9a2e881141064e83d2faced3d475db571052b468c32b -SIZE (KDE/kdevelop-4.2.3.tar.bz2) = 4991238 +SHA256 (KDE/kdevelop-4.3.1.tar.bz2) = ba77977718a898a67f695b2ba106bb85124d4fa7c5706978c01ee29cc6862500 +SIZE (KDE/kdevelop-4.3.1.tar.bz2) = 6189139 diff --git a/devel/kdevelop-kde4/files/patch-git_6b95b83 b/devel/kdevelop-kde4/files/patch-git_6b95b83 new file mode 100644 index 000000000000..7f763ceb62df --- /dev/null +++ b/devel/kdevelop-kde4/files/patch-git_6b95b83 @@ -0,0 +1,106 @@ +commit 6b95b832d72696df0278ac7b9d290c96b798ef07 +Author: Milian Wolff +Date: Tue Apr 17 11:14:02 2012 +0200 + + Fix gcc include-path and macro computation on machines with old GCC. + + Whe default to calling GCC with -std=c++0x and fallback to a call + without that argument when the former fails. + + BUG: 298252 + +diff --git a/languages/cpp/setuphelpers.cpp b/languages/cpp/setuphelpers.cpp +index d3ced10..59bb850 100644 +--- languages/cpp/setuphelpers.cpp ++++ languages/cpp/setuphelpers.cpp +@@ -31,12 +31,13 @@ + using namespace KDevelop; + + namespace CppTools { +-QStringList gccSetupStandardIncludePaths(); +-const QVector& gccStandardMacros(); + + #ifdef _MSC_VER + QStringList msvcSetupStandardIncludePaths(); + const QVector& msvcStandardMacros(); ++#else ++QStringList gccSetupStandardIncludePaths(); ++const QVector& gccStandardMacros(); + #endif + + QStringList setupStandardIncludePaths() +diff --git a/languages/cpp/setuphelpers_gcc.cpp b/languages/cpp/setuphelpers_gcc.cpp +index 5b8fdda..83c6052 100644 +--- languages/cpp/setuphelpers_gcc.cpp ++++ languages/cpp/setuphelpers_gcc.cpp +@@ -40,7 +40,7 @@ using namespace KDevelop; + + namespace CppTools { + +-QStringList gccSetupStandardIncludePaths() ++QStringList gccSetupStandardIncludePaths(bool withStdCpp0x) + { + QStringList includePaths; + +@@ -59,7 +59,12 @@ QStringList gccSetupStandardIncludePaths() + // /usr/lib/gcc/i486-linux-gnu/4.1.2/include + // /usr/include + // End of search list. +- proc <<"gcc" << "-std=c++0x" <<"-xc++" <<"-E" <<"-v" < computeGccStandardMacros() ++QStringList gccSetupStandardIncludePaths() ++{ ++ return gccSetupStandardIncludePaths(true); ++} ++ ++QVector computeGccStandardMacros(bool withStdCpp0x = true) + { + QVector ret; + //Get standard macros from gcc +@@ -117,7 +130,12 @@ QVector computeGccStandardMacros() + // The output of the following gcc commands is several line in the format: + // "#define MACRO [definition]", where definition may or may not be present. + // Parsing each line sequentially, we can easily build the macro set. +- proc <<"gcc" << "-std=c++0x" <<"-xc++" <<"-E" <<"-dM" < computeGccStandardMacros() + } + } + } ++ } else if (withStdCpp0x) { ++ // fallback to macro computation without -std=c++0x arg for old gcc versions ++ return computeGccStandardMacros(false); + } else { + kDebug(9007) <<"Unable to read standard c++ macro definitions from gcc:" <