Commit c552624a authored by Chris Knadle's avatar Chris Knadle
Browse files

debian/patches: remove 50-zeroc-ice-lib-move.diff, incorporated upstream

parent 0d39e5d4
Description: Add slice2cpp include location for library move in zeroc-ice 3.7,
IceUtil library was removed
Author: Jose Gutierrez de la Concha <jose@zeroc.com>
Last-Updated: 2018-04-11
--- a/src/murmur/murmur.pro
+++ b/src/murmur/murmur.pro
@@ -74,7 +74,7 @@
win32 {
slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
} else {
- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
+ slice.commands = slice2cpp --checksum -I/usr/share/ice/slice -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
}
slice.input = SLICEFILES
slice.CONFIG *= no_link explicit_dependencies
@@ -91,9 +91,9 @@
SOURCES *= MurmurIce.cpp
HEADERS *= MurmurIce.h
win32:CONFIG(debug, debug|release) {
- LIBS *= -lIceD -lIceUtilD
+ LIBS *= -lIceD
} else {
- LIBS *= -lIce -lIceUtil
+ LIBS *= -lIce
}
DEFINES *= USE_ICE
......@@ -5,6 +5,5 @@
35-add-dpkg-buildflags.diff
44-add-speechd-header.diff
46-var-run-to-run.diff
50-zeroc-ice-lib-move.diff
52-use-update-rc.d-for-disable.diff
54-fix-boost-ftbfs.diff
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment