diff options
| author | Giovanni Harting | 2017-08-11 11:05:58 +0200 |
|---|---|---|
| committer | Giovanni Harting | 2017-08-11 11:07:17 +0200 |
| commit | f63458aaaee1073b958d60b18443861788b05adb (patch) | |
| tree | a1867186bd8b0c0dc459dceed3182150285da462 /murmur-ice3.7.patch | |
| parent | d8e97f254a2aa34a9fc7a7d86f217e9cfd6bc8a2 (diff) | |
| download | aur-f63458aaaee1073b958d60b18443861788b05adb.tar.gz | |
v1.3.0~2569~gd196a4b; removed upstreamed patch
Diffstat (limited to 'murmur-ice3.7.patch')
| -rw-r--r-- | murmur-ice3.7.patch | 42 |
1 files changed, 0 insertions, 42 deletions
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 |