2.0.10, remove boost.patch

3 files changed, 14 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a32a8084331a..d4c47f788122 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = spectrum2
 	pkgdesc = an open source instant messaging transport
-	pkgver = 2.0.9
-	pkgrel = 3
+	pkgver = 2.0.10
+	pkgrel = 1
 	url = http://spectrum.im
 	arch = any
 	license = GPL
 	makedepends = protobuf
-	makedepends = swiften>=3
+	makedepends = swiften>=4
 	makedepends = libpqxx
 	makedepends = libpurple
 	makedepends = avahi
@@ -24,7 +24,6 @@ pkgbase = spectrum2
 	makedepends = libev
 	makedepends = dbus-glib
 	makedepends = curl
-	makedepends = qt4
 	makedepends = gconf
 	depends = curl
 	depends = log4cxx
@@ -34,17 +33,14 @@ pkgbase = spectrum2
 	optdepends = libpqxx: PostgreSQL support
 	optdepends = libmariadbclient: MariaDB support
 	optdepends = libcommuni: IRC backend support
-	optdepends = qt4: IRC backend support
 	optdepends = protobuf: IRC backend support
 	optdepends = libpurple: LibPurple backend support
 	optdepends = gconf: LibPurple backend support
 	optdepends = libev: LibPurple backend support - libev eventloop
-	source = https://github.com/hanzz/spectrum2/archive/2.0.9.tar.gz
+	source = https://github.com/SpectrumIM//spectrum2/archive/2.0.10.tar.gz
 	source = spectrum2.service
-	source = boost.patch
-	sha256sums = e536a65ef86aafdc6d87f3c6b5bce919a67054dd01f757a2dbc82acbbdd0fa87
+	sha256sums = 92cf8754b03e9b085190c76ab2f5a4d938319c80ef25f064981598a240e77ea8
 	sha256sums = 8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1
-	sha256sums = e73973fdc07b448170c1ce7d252af900fd8c68defe67f0876693d2ea8b4ba97c
 
 pkgname = spectrum2
 
diff --git a/PKGBUILD b/PKGBUILD
index 30cd69902deb..1724f4a0a239 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 
 pkgname=spectrum2
-pkgver=2.0.9
-pkgrel=3
+pkgver=2.0.10
+pkgrel=1
 #epoch=
 pkgdesc="an open source instant messaging transport"
 arch=('any')
@@ -11,15 +11,14 @@ url="http://spectrum.im"
 license=('GPL')
 groups=()
 depends=(curl 'log4cxx' popt sqlite)
-makedepends=('protobuf' 'swiften>=3' 'libpqxx' 'libpurple' 'avahi' 'boost'
+makedepends=('protobuf' 'swiften>=4' 'libpqxx' 'libpurple' 'avahi' 'boost'
 'cmake' 'cppunit' 'expat' 'libcommuni' 'libidn' 'sqlite' 'log4cxx' 'libevent'
-'libmariadbclient' 'popt' 'libev' 'dbus-glib' 'curl' 'qt4' 'gconf')
+'libmariadbclient' 'popt' 'libev' 'dbus-glib' 'curl' 'gconf')
 checkdepends=()
 optdepends=('swiften: XMPP backend support'
             'libpqxx: PostgreSQL support'
             'libmariadbclient: MariaDB support'
             'libcommuni: IRC backend support'
-	    'qt4: IRC backend support'
             'protobuf: IRC backend support'
             'libpurple: LibPurple backend support'
 	    'gconf: LibPurple backend support'
@@ -31,25 +30,18 @@ backup=()
 options=()
 install=
 changelog=
-source=("https://github.com/hanzz/$pkgname/archive/$pkgver.tar.gz"
-        'spectrum2.service'
-	'boost.patch')
-sha256sums=('e536a65ef86aafdc6d87f3c6b5bce919a67054dd01f757a2dbc82acbbdd0fa87'
-            '8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1'
-            'e73973fdc07b448170c1ce7d252af900fd8c68defe67f0876693d2ea8b4ba97c')
+source=("https://github.com/SpectrumIM//$pkgname/archive/$pkgver.tar.gz"
+        'spectrum2.service')
+sha256sums=('92cf8754b03e9b085190c76ab2f5a4d938319c80ef25f064981598a240e77ea8'
+            '8b95ddcf90449dcd0dec111276c69d04a92d09a0f9e1815009b2179a8050c9d1')
 
 noextract=()
 validpgpkeys=()
 
 
-prepare() {
-	cd "$srcdir"
-	patch -p1 -d "$pkgname-$pkgver" < boost.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
+	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_QT4=OFF -DCMAKE_CXX_STANDARD=14 -DCMAKE_INSTALL_PREFIX=/usr -DSPECTRUM_VERSION=${pkgver} -DIRC_INCLUDE_DIR=/usr/include/qt/Communi
 	make
 }
 
diff --git a/boost.patch b/boost.patch
deleted file mode 100644
index 380c9a4ce531..000000000000
--- a/boost.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From dca109b1f3a688f1d0ce2d2be54d5598c59bf6fb Mon Sep 17 00:00:00 2001
-From: Vitaly Takmazov <vitalyster@gmail.com>
-Date: Wed, 23 Jan 2019 15:10:00 +0300
-Subject: [PATCH] CMake: no need to find boost signals
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9411d274..5680fc0a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,7 +88,7 @@ if (WIN32)
- 	add_definitions(-DBOOST_ALL_NO_LIB)
- endif(WIN32)
- 	set(Boost_FIND_QUIETLY ON)
--	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals locale REQUIRED)
-+	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread locale REQUIRED)
- 
- message( STATUS "Found Boost: ${Boost_VERSION}, ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
-