added patch for ice 3.7

This commit is contained in:
2017-08-03 21:06:07 +02:00
parent 54f9f89214
commit d8e97f254a
3 changed files with 53 additions and 2 deletions

View File

@@ -22,10 +22,12 @@ pkgbase = murmur-snapshot-ice
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 = murmur.tmpfilesd
source = murmur-ice3.7.patch
validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0
sha256sums = e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917
sha256sums = SKIP
sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e
sha256sums = 4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327
pkgname = murmur-snapshot-ice

View File

@@ -20,12 +20,19 @@ provides=('murmur')
backup=("etc/murmur.ini")
install=murmur.install
source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig}
murmur.tmpfilesd)
murmur.tmpfilesd
murmur-ice3.7.patch)
sha256sums=('e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917'
'SKIP'
'25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e')
'25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e'
'4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327')
validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0')
prepare() {
cd $srcdir/mumble-${pkgver//_/\~}~snapshot
patch -p1 -i "${srcdir}/murmur-ice3.7.patch"
}
build() {
cd $srcdir/mumble-${pkgver//_/\~}~snapshot

42
murmur-ice3.7.patch Normal file
View File

@@ -0,0 +1,42 @@
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