Attachment 189000 Details for Bug 224475 – svn diff for graphics/gimmage v3 (obsoletes previous)

[patch] svn diff for graphics/gimmage v3 (obsoletes previous)

graphics_gimmage3.diff (text/plain), 4.33 KB, created by Chris Hutchinson on 2017-12-20 17:25:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2017-12-20 17:25:42 UTC

Size: 4.33 KB

patch

obsolete

>Index: gimmage/Makefile
>===================================================================
>--- gimmage/Makefile	(revision 456776)
>+++ gimmage/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gimmage
> PORTVERSION=	0.2.3
>-PORTREVISION=	12
>+PORTREVISION=	13
> CATEGORIES=	graphics
> MASTER_SITES=	BERLIOS
> 
>@@ -13,13 +13,23 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libcurl.so:ftp/curl
>+LIB_DEPENDS+=	libcurl.so:ftp/curl \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
> 
>-BROKEN=		fails to compile: ustring.h: expected ';' at end of declaration list
>+USES=		compiler:c++11-lang desktop-file-utils gettext pkgconfig
>+USE_GNOME+=	gtkmm24 gdkpixbuf2
>+GNU_CONFIGURE=	yes
>+USE_CXXSTD=	c++11
> 
>-USES=		desktop-file-utils gettext pkgconfig
>-USE_GNOME=	gtkmm24
>-GNU_CONFIGURE=	yes
>+OPTIONS_DEFINE=		NLS
>+NLS_USES=		gettext
>+NLS_CONFIGURE_ENABLE=	gettext
>+
>+# HooWee! we still have some work to do!
>+CXXFLAGS+=	-stdlib=libc++ -Wc++11-extensions -Wc++11-long-long \
>+		-Wunused-command-line-argument -Wreturn-type \
>+		-Wwritable-strings -Wlogical-op-parentheses
> CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
> 
> .include <bsd.port.mk>
>Index: gimmage/files/patch-src__FileManager.cpp
>===================================================================
>--- gimmage/files/patch-src__FileManager.cpp	(revision 456776)
>+++ gimmage/files/patch-src__FileManager.cpp	(working copy)
>@@ -1,5 +1,5 @@
>---- ./src/FileManager.cpp.orig	2007-07-20 23:42:55.000000000 +0400
>-+++ ./src/FileManager.cpp	2007-07-20 23:43:03.000000000 +0400
>+--- 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"
>@@ -14,3 +14,22 @@
> +#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	||
>Index: gimmage/files/patch-src__ImageEventBox.cpp
>===================================================================
>--- gimmage/files/patch-src__ImageEventBox.cpp	(nonexistent)
>+++ gimmage/files/patch-src__ImageEventBox.cpp	(working copy)
>@@ -0,0 +1,38 @@
>+--- 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
>+ 			{

Flags:

portmaster: maintainer-approval+

Actions: View | Diff

Attachments on bug 224475: 188985 | 188986 | 189000