Date: Thu, 05 Jul 2012 15:51:02 -0700 From: Hiroshi Nishida <nishidafmly@aol.com> To: ports@FreeBSD.org Subject: Fix for broken net-im/libjingle Message-ID: <4FF61A56.3090804@aol.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------070709010606070505020008
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Hi,
net-im/libjingle is now marked as BROKEN for non i386 systems.
The attached file is a patch for fixing it.
The compilation error with the original source code is caused by "size_t
!= unsigned int" (on non i386).
So, just casting a parameter works.
Bye
--
Hiroshi Nishida, PhD
nishida@asusa.net
--------------070709010606070505020008
Content-Type: text/plain; name="patch-talk__session__fileshare__fileshare.cc"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="patch-talk__session__fileshare__fileshare.cc"
--- talk/session/fileshare/fileshare.cc.orig 2012-07-05 15:29:12.000000000 -0700
+++ talk/session/fileshare/fileshare.cc 2012-07-05 15:45:43.000000000 -0700
@@ -670,8 +670,8 @@
&& !query.empty()
&& (sscanf(query.c_str(), "width=%u&height=%u",
&width, &height) == 2)) {
- width = talk_base::_max<unsigned int>(1, talk_base::_min(width, kMaxPreviewSize));
- height = talk_base::_max<unsigned int>(1, talk_base::_min(height, kMaxPreviewSize));
+ width = talk_base::_max<unsigned int>(1, talk_base::_min((size_t)width, kMaxPreviewSize));
+ height = talk_base::_max<unsigned int>(1, talk_base::_min((size_t)height, kMaxPreviewSize));
std::string pathname;
if (is_sender_) {
talk_base::Pathname local_path;
--------------070709010606070505020008--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FF61A56.3090804>