d/ice: Updated for Slackware-14.0.

slackware-14.2
Damien Goutte-Gattat 10 years ago
parent 9523ba0f6f
commit 693dcf3b6b
  1. 1334
      d/ice/Ice-3.4.2-gcc47.diff
  2. 25
      d/ice/Ice-3.4.2-java7.diff
  3. 12
      d/ice/ice.SlackBuild

File diff suppressed because it is too large Load Diff

@ -0,0 +1,25 @@
diff -Naur Ice-3.4.2.orig/java/src/IceInternal/OutgoingConnectionFactory.java Ice-3.4.2/java/src/IceInternal/OutgoingConnectionFactory.java
--- Ice-3.4.2.orig/java/src/IceInternal/OutgoingConnectionFactory.java 2011-06-15 21:44:00.000000000 +0200
+++ Ice-3.4.2/java/src/IceInternal/OutgoingConnectionFactory.java 2012-10-02 14:21:14.880391023 +0200
@@ -17,7 +17,7 @@
private static class MultiHashMap<K, V> extends java.util.HashMap<K, java.util.List<V>>
{
public void
- put(K key, V value)
+ putOne(K key, V value)
{
java.util.List<V> list = this.get(key);
if(list == null)
@@ -693,9 +693,9 @@
throw ex;
}
- _connections.put(ci.connector, connection);
- _connectionsByEndpoint.put(connection.endpoint(), connection);
- _connectionsByEndpoint.put(connection.endpoint().compress(true), connection);
+ _connections.putOne(ci.connector, connection);
+ _connectionsByEndpoint.putOne(connection.endpoint(), connection);
+ _connectionsByEndpoint.putOne(connection.endpoint().compress(true), connection);
return connection;
}

@ -24,7 +24,7 @@
#
# Latest ice sourcecode is available at: <http://www.zeroc.com/>
#
# Depends: d/mcpp, d/apache-ant, l/db46
# Depends: d/mcpp, d/apache-ant
# Source package infos
NAMESRC=${NAMESRC:-Ice}
@ -85,6 +85,9 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME/cpp
# Fix various problems with GCC 4.7; thanks to Michael Gmelin.
# <http://www.zeroc.com/forums/patches/5647-patch-compiling-ice-clang-gcc4-7-a.html>
patch -p 2 < $CWD/Ice-3.4.2-gcc47.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
make -j $JOBS \
@ -117,12 +120,15 @@ make install \
install_slicedir=$PKG/usr/share/slice \
install_pythondir=$PKG/usr/lib$LIBDIRSUFFIX/ice-python \
install_libdir=$PKG/usr/lib$LIBDIRSUFFIX/ice-python
mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/python2.6/site-packages
mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages
echo /usr/lib$LIBDIRSUFFIX/ice-python > \
$PKG/usr/lib$LIBDIRSUFFIX/python2.6/site-packages/ice.pth
$PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/ice.pth
# Install Java bindings
cd ../java
# Fix compile error with Java 7; thanks to David M. Lee.
# <http://git.asterisk.org/gitweb/?p=asterisk-scf/integration/ice.git;a=commitdiff;h=d791a3913bc966e2736a8f13172630bf4bc2b6a4#patch1>
patch -p 2 < $CWD/Ice-3.4.2-java7.diff
ant ice-jar
install -D -m 644 lib/Ice.jar $PKG/usr/share/java/ice-$VERSION.jar

Loading…
Cancel
Save