Attachment #189000 for bug #224475

Lines 3-9 Link Here

(-)gimmage/Makefile (-6 / +16 lines)
3		3
4	PORTNAME= gimmage	4	PORTNAME= gimmage
5	PORTVERSION= 0.2.3	5	PORTVERSION= 0.2.3
6	PORTREVISION= 12	6	PORTREVISION= 13
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= BERLIOS	8	MASTER_SITES= BERLIOS
9		9
Lines 13-25 Link Here
13	LICENSE= GPLv2+	13	LICENSE= GPLv2+
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	LIB_DEPENDS= libcurl.so:ftp/curl	16	LIB_DEPENDS+= libcurl.so:ftp/curl \
		17	libfontconfig.so:x11-fonts/fontconfig \
		18	libfreetype.so:print/freetype2
17		19
18	BROKEN= fails to compile: ustring.h: expected ';' at end of declaration list	20	USES= compiler:c++11-lang desktop-file-utils gettext pkgconfig
		21	USE_GNOME+= gtkmm24 gdkpixbuf2
		22	GNU_CONFIGURE= yes
		23	USE_CXXSTD= c++11
19		24
20	USES= desktop-file-utils gettext pkgconfig	25	OPTIONS_DEFINE= NLS
21	USE_GNOME= gtkmm24	26	NLS_USES= gettext
22	GNU_CONFIGURE= yes	27	NLS_CONFIGURE_ENABLE= gettext
		28
		29	# HooWee! we still have some work to do!
		30	CXXFLAGS+= -stdlib=libc++ -Wc++11-extensions -Wc++11-long-long \
		31	-Wunused-command-line-argument -Wreturn-type \
		32	-Wwritable-strings -Wlogical-op-parentheses
23	CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}	33	CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
24		34
25	.include <bsd.port.mk>	35	.include <bsd.port.mk>




--- src/FileManager.cpp.orig	2017-12-19 13:56:03.689269000 -0800
+++ src/FileManager.cpp	2017-12-19 13:58:29.142551000 -0800
@@ -23,12 +23,13 @@
 
 #include "FileManager.h"

+#include <unistd.h>
 #include <sys/stat.h>
 }
 
@@ -378,7 +379,7 @@
 	// OR
 	// we've hit the first picture going forwards and now want to go backwards
 	// we display the last picture
-	if( last_op_previous && file_iterator == begin || last_op_next && file_iterator == begin )
+	if( (last_op_previous && file_iterator == begin) || (last_op_next && file_iterator == begin) )
 		{
 		last_op_previous = true;
 		last_op_next = false;
@@ -466,7 +467,7 @@
 		result.find("PCX") != Glib::ustring::npos ||
 		result.find("PGM") != Glib::ustring::npos	||
 		result.find("PPM") != Glib::ustring::npos	||
-		result.find("TIFF") != Glib::ustring::npos && result.find("EPS") == Glib::ustring::npos	||
+		result.find("TIFF") != Glib::ustring::npos & result.find("EPS") == Glib::ustring::npos	||
 		result.find("X pixmap image text") != Glib::ustring::npos	||
 		result.find("Targa") != Glib::ustring::npos	||
 		result.find("PBM") != Glib::ustring::npos	||




--- src/ImageEventBox.cpp.orig	2007-06-26 06:51:16.000000000 -0700
+++ src/ImageEventBox.cpp	2017-12-19 19:52:07.625718000 -0800
@@ -149,7 +149,7 @@
 void ImageEventBox::ScaleImage( double scalefactor,
 								Gdk::InterpType interp_type)
 	{
-	if(ImagePixbuf_Original != 0 && loaded == true)
+	if(ImagePixbuf_Original && loaded == true)
 		{
 		int new_width   = (int)(scalefactor * (double)ImagePixbuf_Original->get_width());
 		int new_height  = (int)(scalefactor * (double)ImagePixbuf_Original->get_height());
@@ -176,7 +176,7 @@
 								double * scalefactor,
 								Gdk::InterpType interp_type)
 	{
-	if(ImagePixbuf_Original != 0 && loaded == true)
+	if(ImagePixbuf_Original && loaded == true)
 		{
 		double ratioh = (double)height/(double)ImagePixbuf_Original->get_height();
 		double ratiow = (double)width/(double)ImagePixbuf_Original->get_width();
@@ -206,7 +206,7 @@
 								double * scalefactor,
 								Gdk::InterpType interp_type)
 	{
-	if(ImagePixbuf_Original != 0 && loaded == true)
+	if(ImagePixbuf_Original && loaded == true)
 		{
 		if( width <= ImagePixbuf_Original->get_width() || height <= ImagePixbuf_Original->get_height() )
 		    {
@@ -242,7 +242,7 @@
 // the rotation of the image
 void ImageEventBox::RotateImage(Gdk::PixbufRotation rotateby)
 	{
-	if(ImagePixbuf_Original != 0 && loaded == true)
+	if(ImagePixbuf_Original && loaded == true)
 		{
 		try
 			{

Return to bug 224475

Lines 1-5 Link Here

(-)gimmage/files/patch-src__FileManager.cpp (-2 / +21 lines)
1	--- ./src/FileManager.cpp.orig 2007-07-20 23:42:55.000000000 +0400	1	--- src/FileManager.cpp.orig 2017-12-19 13:56:03.689269000 -0800
2	+++ ./src/FileManager.cpp 2007-07-20 23:43:03.000000000 +0400	2	+++ src/FileManager.cpp 2017-12-19 13:58:29.142551000 -0800
3	@@ -23,12 +23,13 @@	3	@@ -23,12 +23,13 @@
4		4
5	#include "FileManager.h"	5	#include "FileManager.h"
Lines 14-16 Link Here
14	+#include <unistd.h>	14	+#include <unistd.h>
15	#include <sys/stat.h>	15	#include <sys/stat.h>
16	}	16	}
		17
		18	@@ -378,7 +379,7 @@
		19	// OR
		20	// we've hit the first picture going forwards and now want to go backwards
		21	// we display the last picture
		22	- if( last_op_previous && file_iterator == begin \|\| last_op_next && file_iterator == begin )
		23	+ if( (last_op_previous && file_iterator == begin) \|\| (last_op_next && file_iterator == begin) )
		24	{
		25	last_op_previous = true;
		26	last_op_next = false;
		27	@@ -466,7 +467,7 @@
		28	result.find("PCX") != Glib::ustring::npos \|\|
		29	result.find("PGM") != Glib::ustring::npos \|\|
		30	result.find("PPM") != Glib::ustring::npos \|\|
		31	- result.find("TIFF") != Glib::ustring::npos && result.find("EPS") == Glib::ustring::npos \|\|
		32	+ result.find("TIFF") != Glib::ustring::npos & result.find("EPS") == Glib::ustring::npos \|\|
		33	result.find("X pixmap image text") != Glib::ustring::npos \|\|
		34	result.find("Targa") != Glib::ustring::npos \|\|
		35	result.find("PBM") != Glib::ustring::npos \|\|

Line 0 Link Here

(-)gimmage/files/patch-src__ImageEventBox.cpp (+38 lines)
	1	--- src/ImageEventBox.cpp.orig 2007-06-26 06:51:16.000000000 -0700
	2	+++ src/ImageEventBox.cpp 2017-12-19 19:52:07.625718000 -0800
	3	@@ -149,7 +149,7 @@
	4	void ImageEventBox::ScaleImage( double scalefactor,
	5	Gdk::InterpType interp_type)
	6	{
	7	- if(ImagePixbuf_Original != 0 && loaded == true)
	8	+ if(ImagePixbuf_Original && loaded == true)
	9	{
	10	int new_width = (int)(scalefactor * (double)ImagePixbuf_Original->get_width());
	11	int new_height = (int)(scalefactor * (double)ImagePixbuf_Original->get_height());
	12	@@ -176,7 +176,7 @@
	13	double * scalefactor,
	14	Gdk::InterpType interp_type)
	15	{
	16	- if(ImagePixbuf_Original != 0 && loaded == true)
	17	+ if(ImagePixbuf_Original && loaded == true)
	18	{
	19	double ratioh = (double)height/(double)ImagePixbuf_Original->get_height();
	20	double ratiow = (double)width/(double)ImagePixbuf_Original->get_width();
	21	@@ -206,7 +206,7 @@
	22	double * scalefactor,
	23	Gdk::InterpType interp_type)
	24	{
	25	- if(ImagePixbuf_Original != 0 && loaded == true)
	26	+ if(ImagePixbuf_Original && loaded == true)
	27	{
	28	if( width <= ImagePixbuf_Original->get_width() \|\| height <= ImagePixbuf_Original->get_height() )
	29	{
	30	@@ -242,7 +242,7 @@
	31	// the rotation of the image
	32	void ImageEventBox::RotateImage(Gdk::PixbufRotation rotateby)
	33	{
	34	- if(ImagePixbuf_Original != 0 && loaded == true)
	35	+ if(ImagePixbuf_Original && loaded == true)
	36	{
	37	try
	38	{