summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter-Levine <plevine457@gmail.com>2017-03-27 22:57:43 -0400
committerDavid Seifert <soap@gentoo.org>2017-04-16 20:57:25 +0200
commitd760f1ee4069d1773c62d8aca2ce71e1abb0b668 (patch)
treecd81a820332d2180dec5aa3bf0fd282d4be3e5fb
parentmedia-tv/me-tv: Fix building with GCC6 and -Werror=terminate (bug #613426) (diff)
downloadgentoo-d760f1ee4069d1773c62d8aca2ce71e1abb0b668.tar.gz
gentoo-d760f1ee4069d1773c62d8aca2ce71e1abb0b668.tar.bz2
gentoo-d760f1ee4069d1773c62d8aca2ce71e1abb0b668.zip
net-im/vacuum: Fix building with GCC-6 (bug #614084)
Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4309
-rw-r--r--net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch51
-rw-r--r--net-im/vacuum/vacuum-1.2.4.ebuild4
2 files changed, 54 insertions, 1 deletions
diff --git a/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch b/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch
new file mode 100644
index 000000000000..d936c76e61eb
--- /dev/null
+++ b/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch
@@ -0,0 +1,51 @@
+diff -Naur vacuum-1.2.4.old/src/plugins/messagearchiver/messagearchiver.cpp vacuum-1.2.4/src/plugins/messagearchiver/messagearchiver.cpp
+--- vacuum-1.2.4.old/src/plugins/messagearchiver/messagearchiver.cpp 2017-03-27 22:36:48.177650414 -0400
++++ vacuum-1.2.4/src/plugins/messagearchiver/messagearchiver.cpp 2017-03-27 22:37:22.198212428 -0400
+@@ -9,8 +9,8 @@
+ #define SESSIONS_FILE_NAME "sessions.xml"
+
+ #define SHC_MESSAGE_BODY "/message/body"
+-#define SHC_PREFS "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE"]"
+-#define SHC_PREFS_OLD "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE_OLD"]"
++#define SHC_PREFS "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE "]"
++#define SHC_PREFS_OLD "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE_OLD "]"
+
+ #define ADR_STREAM_JID Action::DR_StreamJid
+ #define ADR_CONTACT_JID Action::DR_Parametr1
+diff -Naur vacuum-1.2.4.old/src/plugins/privacylists/privacylists.cpp vacuum-1.2.4/src/plugins/privacylists/privacylists.cpp
+--- vacuum-1.2.4.old/src/plugins/privacylists/privacylists.cpp 2017-03-27 22:36:48.175650440 -0400
++++ vacuum-1.2.4/src/plugins/privacylists/privacylists.cpp 2017-03-27 22:37:48.508882851 -0400
+@@ -1,7 +1,7 @@
+ #include "privacylists.h"
+
+-#define SHC_PRIVACY "/iq[@type='set']/query[@xmlns='"NS_JABBER_PRIVACY"']"
+-#define SHC_ROSTER "/iq/query[@xmlns='"NS_JABBER_ROSTER"']"
++#define SHC_PRIVACY "/iq[@type='set']/query[@xmlns='" NS_JABBER_PRIVACY "']"
++#define SHC_ROSTER "/iq/query[@xmlns='" NS_JABBER_ROSTER "']"
+
+ #define PRIVACY_TIMEOUT 60000
+ #define AUTO_LISTS_TIMEOUT 2000
+diff -Naur vacuum-1.2.4.old/src/plugins/sessionnegotiation/sessionnegotiation.cpp vacuum-1.2.4/src/plugins/sessionnegotiation/sessionnegotiation.cpp
+--- vacuum-1.2.4.old/src/plugins/sessionnegotiation/sessionnegotiation.cpp 2017-03-27 22:36:48.174650453 -0400
++++ vacuum-1.2.4/src/plugins/sessionnegotiation/sessionnegotiation.cpp 2017-03-27 22:38:07.340651610 -0400
+@@ -4,7 +4,7 @@
+ #include <QTextDocument>
+ #include <QCryptographicHash>
+
+-#define SHC_STANZA_SESSION "/message/feature[@xmlns='"NS_FEATURENEG"']"
++#define SHC_STANZA_SESSION "/message/feature[@xmlns='" NS_FEATURENEG "']"
+
+ #define SFP_DISCLOSURE "disclosure"
+ #define SFP_MULTISESSION "multisession"
+diff -Naur vacuum-1.2.4.old/src/plugins/simplemessagestyle/simplemessagestyle.cpp vacuum-1.2.4/src/plugins/simplemessagestyle/simplemessagestyle.cpp
+--- vacuum-1.2.4.old/src/plugins/simplemessagestyle/simplemessagestyle.cpp 2017-03-27 22:36:48.173650466 -0400
++++ vacuum-1.2.4/src/plugins/simplemessagestyle/simplemessagestyle.cpp 2017-03-27 22:38:33.557335864 -0400
+@@ -15,7 +15,7 @@
+ #include <utils/options.h>
+
+ #define SCROLL_TIMEOUT 100
+-#define SHARED_STYLE_PATH RESOURCES_DIR"/"RSR_STORAGE_SIMPLEMESSAGESTYLES"/"STORAGE_SHARED_DIR
++#define SHARED_STYLE_PATH RESOURCES_DIR "/" RSR_STORAGE_SIMPLEMESSAGESTYLES "/" STORAGE_SHARED_DIR
+
+ static const char *SenderColors[] = {
+ "blue", "blueviolet", "brown", "cadetblue", "chocolate", "coral", "cornflowerblue", "crimson",
diff --git a/net-im/vacuum/vacuum-1.2.4.ebuild b/net-im/vacuum/vacuum-1.2.4.ebuild
index 83b92ebdfad5..1c63b62b85e3 100644
--- a/net-im/vacuum/vacuum-1.2.4.ebuild
+++ b/net-im/vacuum/vacuum-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -52,6 +52,8 @@ DEPEND="${RDEPEND}"
DOCS="AUTHORS CHANGELOG README TRANSLATORS"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc6-not-string-literals.patch
+
# Force usage of system libraries
rm -rf src/thirdparty/{idn,minizip,zlib}
}