mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-27 05:10:36 +00:00
Require a more recent compiler to avoid bugs with base GCC.
Instead of augmenting the existing patch in files/ to work around a bug with base GCC that required a working copy constructor in an expression that actually uses operator=(), just switch to a more modern compiler that does not have this problem. This fixes the build on 8.4 and 9.3.
This commit is contained in:
parent
6a99c4d335
commit
66686f4d26
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=377011
@ -18,7 +18,7 @@ RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-l
|
||||
USE_KDE4= kdeprefix automoc4
|
||||
USE_QT4= corelib webkit xml \
|
||||
moc_build qmake_build rcc_build uic_build
|
||||
USES= cmake gettext tar:bzip2
|
||||
USES= cmake compiler:c++11-lang gettext tar:bzip2
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,22 +0,0 @@
|
||||
--- ./lib/adium-theme-view.cpp.orig 2013-04-16 19:00:42.000000000 +0200
|
||||
+++ ./lib/adium-theme-view.cpp 2013-05-02 01:58:37.569417377 +0200
|
||||
@@ -165,7 +165,8 @@
|
||||
QString footerHtml = replaceHeaderKeywords(m_chatStyle->getFooterHtml(), chatInfo);
|
||||
QString extraStyleHtml = m_chatStyle->messageViewVersion() < 3 ? QLatin1String("")
|
||||
: QLatin1String("@import url( \"main.css\" );");
|
||||
- m_lastContent = AdiumThemeContentInfo();
|
||||
+ AdiumThemeContentInfo message;
|
||||
+ m_lastContent = message;
|
||||
|
||||
if (templateHtml.isEmpty()) {
|
||||
// if templateHtml is empty, we failed to load the fallback template file
|
||||
@@ -427,7 +428,8 @@
|
||||
message.appendMessageClass(QLatin1String("consecutive"));
|
||||
}
|
||||
|
||||
- m_lastContent = AdiumThemeContentInfo(statusMessage.type());
|
||||
+ AdiumThemeContentInfo message2(statusMessage.type());
|
||||
+ m_lastContent = message2;
|
||||
|
||||
switch (message.type()) {
|
||||
case AdiumThemeMessageInfo::Status:
|
Loading…
Reference in New Issue
Block a user