Patch spectrum so that newer versions of log4cxx work

3 files changed, 39 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f7b9feefede..47016337bb88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spectrum2
 	pkgdesc = Create C++ transports easily
 	pkgver = 2.0.7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://spectrum.im
 	arch = any
 	license = GPL
@@ -17,7 +17,7 @@ pkgbase = spectrum2
 	makedepends = libcommuni
 	makedepends = libidn
 	makedepends = sqlite
-	makedepends = log4cxx=0.10.0
+	makedepends = log4cxx
 	makedepends = libevent
 	makedepends = libmariadbclient
 	makedepends = popt
@@ -27,7 +27,7 @@ pkgbase = spectrum2
 	makedepends = qt4
 	makedepends = gconf
 	depends = curl
-	depends = log4cxx=0.10.0
+	depends = log4cxx
 	depends = popt
 	depends = sqlite
 	optdepends = swiften: XMPP backend support
@@ -41,8 +41,10 @@ pkgbase = spectrum2
 	optdepends = libev: LibPurple backend support - libev eventloop
 	source = https://github.com/hanzz/spectrum2/archive/2.0.7.tar.gz
 	source = spectrum2.service
+	source = log4cxx-fix.patch
 	sha256sums = 7d2513a13d29fb2762dac2c87dac1483d1c65302bcf15614e4975b0b9d364872
 	sha256sums = 8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1
+	sha256sums = 1c1c867ef69a8d333197ffb2b2ddcf64527f34d92ee10597d85fd1d95c54e8f6
 
 pkgname = spectrum2
 
diff --git a/PKGBUILD b/PKGBUILD
index b432f562d924..f91aaadd9d4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,17 +5,16 @@
 
 pkgname=spectrum2
 pkgver=2.0.7
-pkgrel=2
+pkgrel=3
 #epoch=
 pkgdesc="Create C++ transports easily"
 arch=('any')
 url="http://spectrum.im"
 license=('GPL')
 groups=()
-# TODO remove logc4cxx version pin on next spectrum release
-depends=(curl 'log4cxx=0.10.0' popt sqlite)
+depends=(curl 'log4cxx' popt sqlite)
 makedepends=('protobuf' 'swiften>=3' 'libpqxx' 'libpurple' 'avahi' 'boost'
-'cmake' 'cppunit' 'expat' 'libcommuni' 'libidn' 'sqlite' 'log4cxx=0.10.0' 'libevent'
+'cmake' 'cppunit' 'expat' 'libcommuni' 'libidn' 'sqlite' 'log4cxx' 'libevent'
 'libmariadbclient' 'popt' 'libev' 'dbus-glib' 'curl' 'qt4' 'gconf')
 checkdepends=()
 optdepends=('swiften: XMPP backend support'
@@ -35,12 +34,19 @@ options=()
 install=
 changelog=
 source=("https://github.com/hanzz/$pkgname/archive/$pkgver.tar.gz"
-        'spectrum2.service')
+        'spectrum2.service'
+        'log4cxx-fix.patch')
 sha256sums=('7d2513a13d29fb2762dac2c87dac1483d1c65302bcf15614e4975b0b9d364872'
-            '8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1')
+            '8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1'
+            '1c1c867ef69a8d333197ffb2b2ddcf64527f34d92ee10597d85fd1d95c54e8f6')
 noextract=()
 validpgpkeys=()
 
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 < ../log4cxx-fix.patch
+}
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	cmake . -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=14 -DCMAKE_INSTALL_PREFIX=/usr -DSPECTRUM_VERSION=${pkgver} -DIRC_INCLUDE_DIR=/usr/include/qt/Communi
diff --git a/log4cxx-fix.patch b/log4cxx-fix.patch
new file mode 100644
index 000000000000..666f6740a8dd
--- /dev/null
+++ b/log4cxx-fix.patch
@@ -0,0 +1,22 @@
+From 6d220b0a083b3adf7fd4ae65ca011b29488493b7 Mon Sep 17 00:00:00 2001
+From: jdoe0 <jdoe@mailinator.com>
+Date: Wed, 18 Jul 2018 02:29:58 -0700
+Subject: [PATCH] libtransport: add missing semicolon
+
+---
+ libtransport/NetworkPluginServer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
+index bff05a6a..c4e19f70 100644
+--- a/libtransport/NetworkPluginServer.cpp
++++ b/libtransport/NetworkPluginServer.cpp
+@@ -1815,7 +1815,7 @@ void NetworkPluginServer::wrapIncomingImage(Swift::Message* msg, const pbnetwork
+             msg->addPayload(oob_payload);
+             msg->setBody(image_url);
+         } else {
+-            LOG4CXX_WARN(logger, "xhtml seems to contain an image, but doesn't match: " + payload.xhtml())
++            LOG4CXX_WARN(logger, "xhtml seems to contain an image, but doesn't match: " + payload.xhtml());
+         }
+     }
+ }