ports/183778: [patch] graphics/danpei bug fixing, STAGE supporting.

[Ilya A. Arkhipov]

>Number:         183778
>Category:       ports
>Synopsis:       [patch] graphics/danpei bug fixing, STAGE supporting.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 08 10:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ilya A. Arkhipov
>Release:        FreeBSD 11.0-CURRENT
>Organization:
Rambler Internet Holding LLC
>Environment:
FreeBSD m1cro.park 11.0-CURRENT FreeBSD 11.0-CURRENT #3 r256311M: Fri Oct 11 13:38:42 MSK 2013     root at m1cro.park:/usr/obj/usr/src/sys/MICROKERNEL  amd64
>Description:
[patch] graphics/danpei bug fixing, STAGE supporting.
Fixed building with clang
Added STAGE support
>How-To-Repeat:

>Fix:
File was attached

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 332381)
+++ Makefile	(working copy)
@@ -10,6 +10,8 @@
 MAINTAINER=	rum1cro at yandex.ru
 COMMENT=	Image Viewer for X Window System with thumbnail preview feature
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 .if !defined(WITHOUT_IMAGEMAGICK)
@@ -23,5 +25,8 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--without-included-gettext
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/danpei \
+		share/locale/de/LC_MESSAGES/danpei.mo \
+		share/locale/ja/LC_MESSAGES/danpei.mo
+
 .include <bsd.port.mk>
Index: files/patch-image_cache.c
===================================================================
--- files/patch-image_cache.c	(revision 332381)
+++ files/patch-image_cache.c	(working copy)
@@ -1,5 +1,27 @@
---- src/image_cache.c.orig	2003-08-08 09:17:58.000000000 +0200
-+++ src/image_cache.c	2012-05-03 23:39:36.000000000 +0200
+--- src/image_cache.c.orig	2013-11-07 19:24:24.056322038 +0400
++++ src/image_cache.c	2013-11-07 19:32:26.759288924 +0400
+@@ -356,7 +356,7 @@
+   save_file = NULL;
+   cl        = NULL;
+ 
+-  if (tp->cache.cache_dir == NULL) { return; }
++  if (tp->cache.cache_dir == NULL) { return FALSE; }
+ 
+   save_file = (gchar*)malloc(sizeof(gchar) * 
+                              (strlen(tp->cache.cache_dir) +
+@@ -761,9 +761,9 @@
+    /* Initialize the local variables. */
+    png_text_filename = buffer = NULL;
+ 
+-   if (pixbuf == NULL)   { return; }
+-   if (filename == NULL) { return; }
+-   if (strcmp(filename, "") == 0) { return; }
++   if (pixbuf == NULL)   { return FALSE; }
++   if (filename == NULL) { return FALSE; }
++   if (strcmp(filename, "") == 0) { return FALSE; }
+ 
+    fp = fopen (filename, "wb");
+    if (fp == NULL) { return FALSE; }
 @@ -782,7 +782,7 @@
        return FALSE;
     }
@@ -9,3 +31,12 @@
        png_destroy_write_struct(&png_ptr, &info_ptr);
        fclose (fp);
        return FALSE;
+@@ -839,7 +839,7 @@
+          /* expand RGB to RGBA using an opaque alpha value */
+          gint x;
+          gchar *buffer_ptr = buffer;
+-         gchar *source_ptr = pixels;
++         guchar *source_ptr = pixels;
+          for (x = 0; x < width; x++) {
+             *buffer_ptr++ = *source_ptr++;
+             *buffer_ptr++ = *source_ptr++;
Index: files/patch-viewer.c
===================================================================
--- files/patch-viewer.c	(revision 0)
+++ files/patch-viewer.c	(working copy)
@@ -0,0 +1,29 @@
+--- src/viewer.c.orig	2013-11-07 19:33:02.807286361 +0400
++++ src/viewer.c	2013-11-07 19:34:22.533326686 +0400
+@@ -293,7 +293,7 @@
+ 
+   if ((dv->thumb == dv->current_thumb)  &&
+       ((widget->allocation.x == dv->area_x) &&
+-       (widget->allocation.y == dv->area_y)    )){ return; }
++       (widget->allocation.y == dv->area_y)    )){ return 1; }
+ 
+   dv->area_x = widget->allocation.x;
+   dv->area_y = widget->allocation.y;
+@@ -314,7 +314,7 @@
+       filename = g_strconcat(dv->thumb->path, "/", dv->thumb->filename, NULL);
+     }
+   }
+-  if (filename == NULL) { return; }
++  if (filename == NULL) { return 1; }
+ 
+   viewer_read_image(dv, filename, tp);
+ 
+@@ -555,7 +555,7 @@
+   while ((thumb != NULL) && (i < (tp->viewer).adj.value)) {
+     thumb = thumb->next; i++;
+   }
+-  if (thumb == NULL) { return; }
++  if (thumb == NULL) { return FALSE; }
+ 
+   gtk_window_set_title(GTK_WINDOW((tp->viewer).window), 
+     g_strconcat(thumb->path, "/", thumb->filename, NULL));
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 332381)
+++ pkg-plist	(working copy)
@@ -1,3 +0,0 @@
-bin/danpei
-share/locale/de/LC_MESSAGES/danpei.mo
-share/locale/ja/LC_MESSAGES/danpei.mo


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