ports/75183: [PATCH] chinese/qterm: fix build on 4.x

[Gavin Mu]

>Number:         75183
>Category:       ports
>Synopsis:       [PATCH] chinese/qterm: fix build on 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 17 12:00:48 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Gavin Mu
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Tianjin University, China
>Environment:
System: FreeBSD mscenter.tju.edu.cn 5.3-STABLE FreeBSD 5.3-STABLE #2: Sun Nov 21 11:47:44 CST 2004 root at mscenter.tju.edu.cn:/usr/obj/usr/src/sys/gavin-CNPROJ i386


	
>Description:
	fix build on FreeBSD 4.x
	I have test this on FreeBSD 4.10-RELEASE
	and maybe this can also make build correctly on FreeBSD4/ALPHA
>How-To-Repeat:
	N/A
>Fix:

	

--- qterm.diff begins here ---
diff -ruN qterm.orig/files/patch-qterm_qtermcanvas.cpp qterm/files/patch-qterm_qtermcanvas.cpp
--- qterm.orig/files/patch-qterm_qtermcanvas.cpp	Thu Jan  1 08:00:00 1970
+++ qterm/files/patch-qterm_qtermcanvas.cpp	Fri Dec 17 19:41:34 2004
@@ -0,0 +1,11 @@
+--- qterm/qtermcanvas.cpp.orig	Fri Dec 17 19:26:35 2004
++++ qterm/qtermcanvas.cpp	Fri Dec 17 19:26:39 2004
+@@ -238,7 +238,7 @@
+ 	if(strSave.isEmpty())
+ 		return;
+ 	QString fmt = fi.extension(false).upper();
+-	if(!pxm.save(strSave, fmt=="JPG"?"JPEG":fmt))
++	if(!pxm.save(strSave, fmt=="JPG"?QString("JPEG"):fmt))
+ 		QMessageBox::warning(this, "Failed to save file", "Cant save file, maybe format not supported");
+ }
+ 
diff -ruN qterm.orig/files/patch-qterm_qtermiplocation.cpp qterm/files/patch-qterm_qtermiplocation.cpp
--- qterm.orig/files/patch-qterm_qtermiplocation.cpp	Wed Dec 15 13:46:24 2004
+++ qterm/files/patch-qterm_qtermiplocation.cpp	Fri Dec 17 19:41:34 2004
@@ -1,5 +1,15 @@
---- qterm/qtermiplocation.cpp.orig	Tue Dec 14 18:45:37 2004
-+++ qterm/qtermiplocation.cpp	Tue Dec 14 18:46:21 2004
+--- qterm/qtermiplocation.cpp.orig	Tue Dec  7 03:23:24 2004
++++ qterm/qtermiplocation.cpp	Fri Dec 17 19:24:22 2004
+@@ -9,8 +9,8 @@
+ #ifdef Q_OS_WIN32
+ #include <winsock2.h>
+ #else
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #endif
+ 
+ #include <qstring.h>
 @@ -79,13 +79,13 @@
  	if( fseek( fp, (long)offset, SEEK_SET ) ==-1 )
  	{
--- qterm.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: