/src/plugins/messagearchiver/messagearchiver.cpp build fix.

3 files changed, 25 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8701cbf99c0..f8e734712686 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vacuum-im
 	pkgdesc = Crossplatform Jabber/XMPP client
 	pkgver = 1.2.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.vacuum-im.org/
 	arch = i686
 	arch = x86_64
@@ -17,8 +17,11 @@ pkgbase = vacuum-im
 	conflicts = vacuum-im-git
 	conflicts = vacuum-svn
 	source = https://github.com/Vacuum-IM/vacuum-im/archive/1.2.5.tar.gz
+	source = messagearchiver_build_fix.patch
 	md5sums = 2004a882c95207b3244aadf77e822b9a
+	md5sums = 5815ef9480dd6ad94b78907d79642b5f
 	sha256sums = 3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da
+	sha256sums = 294e6639913e1d7495fb4729045683a3d61a20395d2de2de4204434c9a5050e7
 
 pkgname = vacuum-im
 
diff --git a/PKGBUILD b/PKGBUILD
index 4417796add31..9c32d1f6e033 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=vacuum-im
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Crossplatform Jabber/XMPP client'
 arch=('i686' 'x86_64')
 url="http://www.vacuum-im.org/"
@@ -11,12 +11,16 @@ depends=('qt4' 'openssl' 'libidn' 'libxss' 'minizip')
 makedepends=('cmake')
 provides=('vacuum-im' 'vacuum')
 conflicts=('vacuum-im-git' 'vacuum-svn')
-source=("https://github.com/Vacuum-IM/$pkgname/archive/$pkgver.tar.gz")
-md5sums=('2004a882c95207b3244aadf77e822b9a')
-sha256sums=('3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da')
+source=("https://github.com/Vacuum-IM/$pkgname/archive/$pkgver.tar.gz"
+        "messagearchiver_build_fix.patch")
+md5sums=('2004a882c95207b3244aadf77e822b9a'
+         '5815ef9480dd6ad94b78907d79642b5f')
+sha256sums=('3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da'
+            '294e6639913e1d7495fb4729045683a3d61a20395d2de2de4204434c9a5050e7')
 
 build() {
 	cd $pkgname-$pkgver
+	patch -p0 --binary < ${srcdir}/messagearchiver_build_fix.patch
 	mkdir build
 	cd build
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/messagearchiver_build_fix.patch b/messagearchiver_build_fix.patch
new file mode 100644
index 000000000000..baa031cf5858
--- /dev/null
+++ b/messagearchiver_build_fix.patch
@@ -0,0 +1,13 @@
+--- src/plugins/messagearchiver/messagearchiver.cpp	2015-06-08 21:32:43.000000000 +0300

++++ src/plugins/messagearchiver/messagearchiver.cpp	2018-10-21 23:40:42.885683899 +0300

+@@ -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