v1.3.0~2569~gd196a4b; removed upstreamed patch

3 files changed, 8 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 252de9fc600a..6b72cae1cfbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = murmur-snapshot-ice
 	pkgdesc = The voice chat application server for Mumble (development snapshot)
-	pkgver = 1.3.0_2523_g5aaf1ed
+	pkgver = 1.3.0_2569_gd196a4b
 	pkgrel = 1
 	url = https://wiki.mumble.info/wiki/
 	install = murmur.install
@@ -19,15 +19,13 @@ pkgbase = murmur-snapshot-ice
 	conflicts = murmur-ice
 	conflicts = murmur-snapshot-noice
 	backup = etc/murmur.ini
-	source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz
-	source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz.sig
+	source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz
+	source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz.sig
 	source = murmur.tmpfilesd
-	source = murmur-ice3.7.patch
 	validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0
-	sha256sums = e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917
+	sha256sums = 7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503
 	sha256sums = SKIP
 	sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e
-	sha256sums = 4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327
 
 pkgname = murmur-snapshot-ice
 
diff --git a/PKGBUILD b/PKGBUILD
index 6eea2996eb42..29724d14e09e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Malte Rabenseifner <malte@zearan.de>
 
 pkgname=murmur-snapshot-ice
-pkgver=1.3.0_2523_g5aaf1ed
+pkgver=1.3.0_2569_gd196a4b
 pkgrel=1
 pkgdesc="The voice chat application server for Mumble (development snapshot)"
 arch=('i686' 'x86_64' 'armv7h')
@@ -20,20 +20,12 @@ provides=('murmur')
 backup=("etc/murmur.ini")
 install=murmur.install
 source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig}
-	murmur.tmpfilesd
-	murmur-ice3.7.patch)
-sha256sums=('e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917'
+	murmur.tmpfilesd)
+sha256sums=('7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503'
             'SKIP'
-            '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e'
-            '4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327')
+            '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e')
 validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0')
 
-prepare() {
-    cd $srcdir/mumble-${pkgver//_/\~}~snapshot
-
-    patch -p1 -i "${srcdir}/murmur-ice3.7.patch"
-}
-
 build() {
     cd $srcdir/mumble-${pkgver//_/\~}~snapshot
 
diff --git a/murmur-ice3.7.patch b/murmur-ice3.7.patch
deleted file mode 100644
index 30ef2bb80b7a..000000000000
--- a/murmur-ice3.7.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
-index bee4dc15..7ed20d6e 100644
---- a/src/murmur/murmur.pro
-+++ b/src/murmur/murmur.pro
-@@ -88,8 +88,23 @@ ice {
- 	win32:CONFIG(debug, debug|release) {
- 		LIBS *= -lIceD -lIceUtilD
- 	} else {
--		LIBS *= -lIce -lIceUtil
-+		# check Ice version, 3.7 merged IceUtil into Ice
-+		ICE_VERSION = $$system(slice2cpp --version 2>&1)
-+		ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0)
-+		ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1)
-+
-+		!equals(ICE_MAJOR_VERSION, 3) {
-+     			error("Unsupported Ice version")
-+		}
-+		lessThan(ICE_MINOR_VERSION, 7) {
-+    			# Ice < 3.7
-+    			LIBS *= -lIce -lIceUtil
-+		}  else {
-+    			# Ice 3.7+
-+    			LIBS *= -lIce
-+		}
- 	}
-+
- 	DEFINES *= USE_ICE
- 
- 	win32 {
-diff --git a/src/murmur/murmur_ice/murmur_ice.pro b/src/murmur/murmur_ice/murmur_ice.pro
-index cbbf5e9b..62cc7abd 100644
---- a/src/murmur/murmur_ice/murmur_ice.pro
-+++ b/src/murmur/murmur_ice/murmur_ice.pro
-@@ -16,7 +16,7 @@ win32 {
- 	!isEmpty(ICE_VERSION) {
- 		EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/
- 	}
--	slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME}
-+	slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME}
- }
- slice.input = SLICEFILES
- slice.CONFIG *= no_link explicit_dependencies