summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Franke2019-01-07 12:05:46 +0100
committerBjoern Franke2019-01-07 12:07:37 +0100
commita884252d7d61b8da94d39c5d5c2c8e6578e8c523 (patch)
tree752bf7d5f21b893b4b17960689cacf1482d66a10
parent610fad79b547f62aee2b889f2782e56be20d2c48 (diff)
downloadaur-a884252d7d61b8da94d39c5d5c2c8e6578e8c523.tar.gz
remove log4cxx-patch completely
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--log4cxx-fix.patch22
3 files changed, 2 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 613eac8fd0d6..2d377a862f43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -41,10 +41,8 @@ pkgbase = spectrum2
optdepends = libev: LibPurple backend support - libev eventloop
source = https://github.com/hanzz/spectrum2/archive/2.0.9.tar.gz
source = spectrum2.service
- source = log4cxx-fix.patch
sha256sums = e536a65ef86aafdc6d87f3c6b5bce919a67054dd01f757a2dbc82acbbdd0fa87
sha256sums = 8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1
- sha256sums = 1c1c867ef69a8d333197ffb2b2ddcf64527f34d92ee10597d85fd1d95c54e8f6
pkgname = spectrum2
diff --git a/PKGBUILD b/PKGBUILD
index 706684ba954e..15b6e5161b08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,11 +32,9 @@ options=()
install=
changelog=
source=("https://github.com/hanzz/$pkgname/archive/$pkgver.tar.gz"
- 'spectrum2.service'
- 'log4cxx-fix.patch')
+ 'spectrum2.service')
sha256sums=('e536a65ef86aafdc6d87f3c6b5bce919a67054dd01f757a2dbc82acbbdd0fa87'
- '8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1'
- '1c1c867ef69a8d333197ffb2b2ddcf64527f34d92ee10597d85fd1d95c54e8f6')
+ '8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1')
noextract=()
validpgpkeys=()
diff --git a/log4cxx-fix.patch b/log4cxx-fix.patch
deleted file mode 100644
index 666f6740a8dd..000000000000
--- a/log4cxx-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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());
- }
- }
- }