FreeBSD Bugzilla – Attachment 116038 Details for
Bug 157947
[PATCH] devel/Ice: update to 3.4.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Ice-3.4.2.patch
Ice-3.4.2.patch (text/plain), 5.74 KB, created by
Michael Gmelin
on 2011-06-17 15:00:24 UTC
(
hide
)
Description:
Ice-3.4.2.patch
Filename:
MIME Type:
Creator:
Michael Gmelin
Created:
2011-06-17 15:00:24 UTC
Size:
5.74 KB
patch
obsolete
>diff -ruN --exclude=CVS /usr/ports/devel/ice.orig/Makefile /usr/ports/devel/ice/Makefile >--- /usr/ports/devel/ice.orig/Makefile 2011-06-17 15:23:26.000000000 +0200 >+++ /usr/ports/devel/ice/Makefile 2011-06-17 13:00:01.000000000 +0200 >@@ -6,10 +6,9 @@ > # > > PORTNAME= Ice >-PORTVERSION= 3.4.1 >-PORTREVISION= 1 >+PORTVERSION= 3.4.2 > CATEGORIES= devel >-MASTER_SITES= http://www.zeroc.com/download/Ice/3.4/ >+MASTER_SITES= http://download.zeroc.com/Ice/3.4/ > > MAINTAINER= shoesoft@gmx.net > COMMENT= A modern alternative to object middleware such as CORBA/COM/DCOM/COM+ >diff -ruN --exclude=CVS /usr/ports/devel/ice.orig/distinfo /usr/ports/devel/ice/distinfo >--- /usr/ports/devel/ice.orig/distinfo 2011-06-17 15:23:26.000000000 +0200 >+++ /usr/ports/devel/ice/distinfo 2011-06-17 13:00:43.000000000 +0200 >@@ -1,3 +1,3 @@ >-MD5 (Ice-3.4.1.tar.gz) = 3aae42aa47dec74bb258c1a1b2847a1a >-SHA256 (Ice-3.4.1.tar.gz) = 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6 >-SIZE (Ice-3.4.1.tar.gz) = 5263510 >+MD5 (Ice-3.4.2.tar.gz) = e97672eb4a63c6b8dd202d0773e19dc7 >+SHA256 (Ice-3.4.2.tar.gz) = dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979 >+SIZE (Ice-3.4.2.tar.gz) = 5485106 >diff -ruN --exclude=CVS /usr/ports/devel/ice.orig/files/patch-Exception.cpp /usr/ports/devel/ice/files/patch-Exception.cpp >--- /usr/ports/devel/ice.orig/files/patch-Exception.cpp 2011-06-17 15:23:26.000000000 +0200 >+++ /usr/ports/devel/ice/files/patch-Exception.cpp 1970-01-01 01:00:00.000000000 +0100 >@@ -1,38 +0,0 @@ >---- cpp/src/IceUtil/Exception.cpp.orig 2010-02-25 16:55:42.000000000 +0100 >-+++ cpp/src/IceUtil/Exception.cpp 2010-05-16 14:32:45.000000000 +0200 >-@@ -14,7 +14,7 @@ >- #include <ostream> >- #include <cstdlib> >- >--#if defined(__GNUC__) && !defined(__sun) >-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) >- # include <execinfo.h> >- # include <cxxabi.h> >- #endif >-@@ -52,7 +52,7 @@ >- >- Init init; >- >--#if defined(__GNUC__) && !defined(__sun) >-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) >- string >- getStackTrace() >- { >-@@ -183,7 +183,7 @@ >- IceUtil::Exception::Exception() : >- _file(0), >- _line(0) >--#if defined(__GNUC__) && !defined(__sun) >-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) >- , _stackTrace(getStackTrace()) >- #endif >- { >-@@ -192,7 +192,7 @@ >- IceUtil::Exception::Exception(const char* file, int line) : >- _file(file), >- _line(line) >--#if defined(__GNUC__) && !defined(__sun) >-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) >- , _stackTrace(getStackTrace()) >- #endif >- { >diff -ruN --exclude=CVS /usr/ports/devel/ice.orig/files/patch-IconvStringConverter.h /usr/ports/devel/ice/files/patch-IconvStringConverter.h >--- /usr/ports/devel/ice.orig/files/patch-IconvStringConverter.h 2011-06-17 15:23:26.000000000 +0200 >+++ /usr/ports/devel/ice/files/patch-IconvStringConverter.h 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- cpp/include/Ice/IconvStringConverter.h.orig 2008-05-22 19:27:55.000000000 +0200 >-+++ cpp/include/Ice/IconvStringConverter.h 2008-05-22 19:28:22.000000000 +0200 >-@@ -19,7 +19,7 @@ >- #include <langinfo.h> >- #endif >- >--#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) >-+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) || defined(__FreeBSD__) >- // >- // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 >- // >diff -ruN --exclude=CVS /usr/ports/devel/ice.orig/files/patch-Network.h /usr/ports/devel/ice/files/patch-Network.h >--- /usr/ports/devel/ice.orig/files/patch-Network.h 2011-06-17 15:23:26.000000000 +0200 >+++ /usr/ports/devel/ice/files/patch-Network.h 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- cpp/src/Ice/Network.h.orig 2011-06-03 21:25:21.000000000 +0200 >-+++ cpp/src/Ice/Network.h 2011-06-03 21:25:21.000000000 +0200 >-@@ -36,7 +36,7 @@ >- >- #if defined(__linux) && !defined(ICE_NO_EPOLL) >- # define ICE_USE_EPOLL 1 >--#elif defined(__APPLE__) && !defined(ICE_NO_KQUEUE) >-+#elif (defined(__APPLE__) || defined(__FreeBSD__)) && !defined(ICE_NO_KQUEUE) >- # define ICE_USE_KQUEUE 1 >- #elif defined(_WIN32) >- # if !defined(ICE_NO_IOCP) >diff -ruN --exclude=CVS /usr/ports/devel/ice.orig/files/patch-PlatformInfo.cpp /usr/ports/devel/ice/files/patch-PlatformInfo.cpp >--- /usr/ports/devel/ice.orig/files/patch-PlatformInfo.cpp 2011-06-17 15:23:26.000000000 +0200 >+++ /usr/ports/devel/ice/files/patch-PlatformInfo.cpp 1970-01-01 01:00:00.000000000 +0100 >@@ -1,29 +0,0 @@ >---- cpp/src/IceGrid/PlatformInfo.cpp.orig 2011-06-03 21:07:43.000000000 +0200 >-+++ cpp/src/IceGrid/PlatformInfo.cpp 2011-06-03 21:07:43.000000000 +0200 >-@@ -24,7 +24,7 @@ >- # include <pdhmsg.h> // For PDH_MORE_DATA >- #else >- # include <sys/utsname.h> >--# if defined(__APPLE__) >-+# if defined(__APPLE__) || defined(__FreeBSD__) >- # include <sys/sysctl.h> >- # elif defined(__sun) >- # include <sys/loadavg.h> >-@@ -222,7 +222,7 @@ >- SYSTEM_INFO sysInfo; >- GetSystemInfo(&sysInfo); >- _nProcessors = sysInfo.dwNumberOfProcessors; >--#elif defined(__APPLE__) >-+#elif defined(__APPLE__) || defined(__FreeBSD__) >- static int ncpu[2] = { CTL_HW, HW_NCPU }; >- size_t sz = sizeof(_nProcessors); >- if(sysctl(ncpu, 2, &_nProcessors, &sz, 0, 0) == -1) >-@@ -446,7 +446,7 @@ >- info.avg1 = static_cast<float>(_last1Total) / _usages1.size() / 100.0f; >- info.avg5 = static_cast<float>(_last5Total) / _usages5.size() / 100.0f; >- info.avg15 = static_cast<float>(_last15Total) / _usages15.size() / 100.0f; >--#elif defined(__sun) || defined(__linux) || defined(__APPLE__) >-+#elif defined(__sun) || defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__) >- // >- // We use the load average divided by the number of >- // processors to figure out if the machine is busy or
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 157947
: 116038 |
116039
|
116040