diff options
| -rw-r--r-- | devel/qtcreator/Makefile | 4 | ||||
| -rw-r--r-- | devel/qtcreator/distinfo | 4 | ||||
| -rw-r--r-- | devel/qtcreator/files/patch-git-4ee78bf | 25 | ||||
| -rw-r--r-- | devel/qtcreator/files/patch-git-6556edf | 32 | ||||
| -rw-r--r-- | devel/qtcreator/pkg-plist | 4 |
5 files changed, 6 insertions, 63 deletions
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 858a695c4415..d8393c7ec908 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qtcreator -DISTVERSION= 3.3.0 +DISTVERSION= 3.3.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} MASTER_SITE_SUBDIR=official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}/ @@ -24,7 +24,7 @@ QMAKE_ARGS+= QTC_PREFIX=${PREFIX} DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true -# There seems to be only one file needing a sheebangfix (all the others +# There seems to be only one file needing a shebangfix (all the others # do not get installed). SHEBANG_FILES= share/qtcreator/templates/wizards/scriptgeneratedproject/generate.pl diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo index 9a3917bbefa3..80a1e6c5da4d 100644 --- a/devel/qtcreator/distinfo +++ b/devel/qtcreator/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/qt-creator-opensource-src-3.3.0.tar.gz) = 27a5c8815fab95f959134047f8315686de4de6f99b0bedfd46b5dedae390525a -SIZE (KDE/qt-creator-opensource-src-3.3.0.tar.gz) = 22950004 +SHA256 (KDE/qt-creator-opensource-src-3.3.1.tar.gz) = afefb73a05cdc36cdfb8a760c2b39eb6c366a22ef47c7d365d446092dd1d5331 +SIZE (KDE/qt-creator-opensource-src-3.3.1.tar.gz) = 22938882 diff --git a/devel/qtcreator/files/patch-git-4ee78bf b/devel/qtcreator/files/patch-git-4ee78bf deleted file mode 100644 index 3ac95e1dda10..000000000000 --- a/devel/qtcreator/files/patch-git-4ee78bf +++ /dev/null @@ -1,25 +0,0 @@ -From 4ee78bfb8a526f250184958fda717032b47a5e96 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Tue, 30 Dec 2014 16:33:15 +0200 -Subject: [PATCH] buildoutputparser: Respect $QTC_PREFIX. - -Do what all other targets already do and take $$QTC_PREFIX into -consideration when setting the target's installation path. - -Change-Id: I6ca87d36b345ec256518fe2d349e58d213f5c6d5 -Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> -Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> - - ---- src/tools/buildoutputparser/buildoutputparser.pro -+++ src/tools/buildoutputparser/buildoutputparser.pro -@@ -13,7 +13,7 @@ include(../../rpath.pri) - win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER - - DESTDIR = $$IDE_BIN_PATH --target.path = /bin -+target.path = $$QTC_PREFIX/bin - INSTALLS += target - - SOURCES = \ - diff --git a/devel/qtcreator/files/patch-git-6556edf b/devel/qtcreator/files/patch-git-6556edf deleted file mode 100644 index 5eaeb72da940..000000000000 --- a/devel/qtcreator/files/patch-git-6556edf +++ /dev/null @@ -1,32 +0,0 @@ -From 6ff6edf8d7a59b852a7e6084f658a1d3e1ee7500 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Tue, 30 Dec 2014 14:23:49 +0200 -Subject: [PATCH] Abi: Correctly set ABI information for the BSDs in hostAbi(). - -Add another #ifdef block for BSD operating systems so that qtcreator -stops complaining that it does not have enough information about the -host's ABI. - -Change-Id: I5841e162eda7f34fa4a962ab1c035d1727613f6f -Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> - ---- src/plugins/projectexplorer/abi.cpp -+++ src/plugins/projectexplorer/abi.cpp -@@ -744,6 +744,16 @@ Abi Abi::hostAbi() - os = MacOS; - subos = GenericMacFlavor; - format = MachOFormat; -+#elif defined (Q_OS_BSD4) -+ os = BsdOS; -+# if defined (Q_OS_FREEBSD) -+ subos = FreeBsdFlavor; -+# elif defined (Q_OS_NETBSD) -+ subos = NetBsdFlavor; -+# elif defined (Q_OS_OPENBSD) -+ subos = OpenBsdFlavor; -+# endif -+ format = ElfFormat; - #endif - - const Abi result(arch, os, subos, format, QSysInfo::WordSize); - diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist index 6007f2c80443..de7f5e3eba37 100644 --- a/devel/qtcreator/pkg-plist +++ b/devel/qtcreator/pkg-plist @@ -55,11 +55,11 @@ lib/qtcreator/libUtils.so.1.0.0 lib/qtcreator/libqbscore.so lib/qtcreator/libqbscore.so.1 lib/qtcreator/libqbscore.so.1.3 -lib/qtcreator/libqbscore.so.1.3.3 +lib/qtcreator/libqbscore.so.1.3.4 lib/qtcreator/libqbsqtprofilesetup.so lib/qtcreator/libqbsqtprofilesetup.so.1 lib/qtcreator/libqbsqtprofilesetup.so.1.3 -lib/qtcreator/libqbsqtprofilesetup.so.1.3.3 +lib/qtcreator/libqbsqtprofilesetup.so.1.3.4 lib/qtcreator/plugins/libAnalyzerBase.so lib/qtcreator/plugins/libAndroid.so lib/qtcreator/plugins/libAutotoolsProjectManager.so |