Sat Jun 11 18:54:24 2011 UTC ()
Update to 11.06.1

Changelog:
2011.06.09  v.11.06.1
Bugfix: A hole was closed that could cause a crash if an area is
deleted while an edit function is open and active.

2011.06.01  v.11.06
+ Smart Erase and Remove Dust were made slightly more effective.
+ Brightness/Color retouching and Tone Mapping were made 25-40% faster.
+ Retouching brightness/color by "painting" with the mouse (dodge and
  burn) was made much faster (instant response on a fast computer).
+ If at startup the previous image file is no longer present then a
  gallery of the 100 most recent files viewed is shown.
+ New function: Tools > Toolbar Style: set to text, icons, or both.
+ New function: Tools > Edit Translation: edit translations interactively
  as Fotoxx is being used, and the changes are immediately effective.
+ Several other small usability improvements were made.
+ Minor bugfix: paste area edge blending lost 1 pixel around the edge.


(ryoon)
diff -r1.13 -r1.14 pkgsrc/graphics/fotoxx/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/fotoxx/PLIST
diff -r1.5 -r1.6 pkgsrc/graphics/fotoxx/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/fotoxx/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/graphics/fotoxx/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc
cvs diff -r1.13 -r1.14 pkgsrc/graphics/fotoxx/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/Makefile 2011/05/11 01:31:01 1.13
+++ pkgsrc/graphics/fotoxx/Makefile 2011/06/11 18:54:23 1.14
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.13 2011/05/11 01:31:01 ryoon Exp $ 1# $NetBSD: Makefile,v 1.14 2011/06/11 18:54:23 ryoon Exp $
2# 2#
3 3
4DISTNAME= fotoxx-11.05.1 4DISTNAME= fotoxx-11.06.1
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ 6MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://kornelix.squarespace.com/fotoxx/ 9HOMEPAGE= http://kornelix.squarespace.com/fotoxx/
10COMMENT= Program for editing image files from a digital camera 10COMMENT= Program for editing image files from a digital camera
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool 16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw 17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw
cvs diff -r1.5 -r1.6 pkgsrc/graphics/fotoxx/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/PLIST 2011/05/11 01:27:03 1.5
+++ pkgsrc/graphics/fotoxx/PLIST 2011/06/11 18:54:23 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2011/05/11 01:27:03 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.6 2011/06/11 18:54:23 ryoon Exp $
2bin/fotoxx 2bin/fotoxx
3share/applications/kornelix-fotoxx.desktop 3share/applications/kornelix-fotoxx.desktop
4share/doc/fotoxx/CHANGES 4share/doc/fotoxx/CHANGES
5share/doc/fotoxx/COPYING 5share/doc/fotoxx/COPYING
6share/doc/fotoxx/README 6share/doc/fotoxx/README
7share/doc/fotoxx/TRANSLATIONS 7share/doc/fotoxx/TRANSLATIONS
8share/doc/fotoxx/fotoxx.man 8share/doc/fotoxx/fotoxx.man
9share/doc/fotoxx/images/HDF-paint.jpg 9share/doc/fotoxx/images/HDF-paint.jpg
10share/doc/fotoxx/images/HDR-adjust.jpg 10share/doc/fotoxx/images/HDR-adjust.jpg
11share/doc/fotoxx/images/annotate.jpg 11share/doc/fotoxx/images/annotate.jpg
12share/doc/fotoxx/images/brightness-color.jpg 12share/doc/fotoxx/images/brightness-color.jpg
13share/doc/fotoxx/images/brightness-ramp.png 13share/doc/fotoxx/images/brightness-ramp.png
14share/doc/fotoxx/images/curve-edit.jpg 14share/doc/fotoxx/images/curve-edit.jpg
@@ -21,26 +21,27 @@ share/doc/fotoxx/images/manage-tags.jpg @@ -21,26 +21,27 @@ share/doc/fotoxx/images/manage-tags.jpg
21share/doc/fotoxx/images/navigation.jpeg 21share/doc/fotoxx/images/navigation.jpeg
22share/doc/fotoxx/images/pano-dialog.jpeg 22share/doc/fotoxx/images/pano-dialog.jpeg
23share/doc/fotoxx/images/remove-dust.jpg 23share/doc/fotoxx/images/remove-dust.jpg
24share/doc/fotoxx/images/rename.jpeg 24share/doc/fotoxx/images/rename.jpeg
25share/doc/fotoxx/images/save-as.jpeg 25share/doc/fotoxx/images/save-as.jpeg
26share/doc/fotoxx/images/search-images.jpg 26share/doc/fotoxx/images/search-images.jpg
27share/doc/fotoxx/images/select-area.png 27share/doc/fotoxx/images/select-area.png
28share/doc/fotoxx/images/select-edit.jpg 28share/doc/fotoxx/images/select-edit.jpg
29share/doc/fotoxx/images/select-whole-image.jpg 29share/doc/fotoxx/images/select-whole-image.jpg
30share/doc/fotoxx/images/sharpen.jpeg 30share/doc/fotoxx/images/sharpen.jpeg
31share/doc/fotoxx/images/smart-erase.png 31share/doc/fotoxx/images/smart-erase.png
32share/doc/fotoxx/images/stack.png 32share/doc/fotoxx/images/stack.png
33share/doc/fotoxx/images/tone-mapping.png 33share/doc/fotoxx/images/tone-mapping.png
 34share/doc/fotoxx/images/translate.jpg
34share/doc/fotoxx/images/trim.jpg 35share/doc/fotoxx/images/trim.jpg
35share/doc/fotoxx/images/unbend.png 36share/doc/fotoxx/images/unbend.png
36share/doc/fotoxx/images/watermark.jpg 37share/doc/fotoxx/images/watermark.jpg
37share/doc/fotoxx/userguide-en.html 38share/doc/fotoxx/userguide-en.html
38share/fotoxx/data/desktop 39share/fotoxx/data/desktop
39share/fotoxx/icons/arrow.png 40share/fotoxx/icons/arrow.png
40share/fotoxx/icons/busy.png 41share/fotoxx/icons/busy.png
41share/fotoxx/icons/drag.png 42share/fotoxx/icons/drag.png
42share/fotoxx/icons/draw.png 43share/fotoxx/icons/draw.png
43share/fotoxx/icons/first-page.png 44share/fotoxx/icons/first-page.png
44share/fotoxx/icons/folder.png 45share/fotoxx/icons/folder.png
45share/fotoxx/icons/folder256.png 46share/fotoxx/icons/folder256.png
46share/fotoxx/icons/fotoxx.png 47share/fotoxx/icons/fotoxx.png
cvs diff -r1.5 -r1.6 pkgsrc/graphics/fotoxx/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/distinfo 2011/05/11 01:27:03 1.5
+++ pkgsrc/graphics/fotoxx/distinfo 2011/06/11 18:54:23 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2011/05/11 01:27:03 ryoon Exp $ 1$NetBSD: distinfo,v 1.6 2011/06/11 18:54:23 ryoon Exp $
2 2
3SHA1 (fotoxx-11.05.1.tar.gz) = 86fc10df92c6ea0e829e7b0e0b27031312f630ca 3SHA1 (fotoxx-11.06.1.tar.gz) = 85b62abf984103877eca2bcd721b2d382b01c84b
4RMD160 (fotoxx-11.05.1.tar.gz) = fda2ef422745ae582ac90eb98d8ac6daea1b2499 4RMD160 (fotoxx-11.06.1.tar.gz) = 14839d3a3fd1d61c5c1fbe3867a0c826dd472eb0
5Size (fotoxx-11.05.1.tar.gz) = 1264701 bytes 5Size (fotoxx-11.06.1.tar.gz) = 1354440 bytes
6SHA1 (patch-aa) = f936cc5bdc02a5a92470c8e02189d748593c6327 6SHA1 (patch-aa) = 30cdc0e3fbb1ef445463cb9c89079f2ef4c38c11
7SHA1 (patch-ab) = b2ad9d5c8a2258729248371bd1e2a2920633331c 7SHA1 (patch-ab) = 8c95419f50a30a88c4cbbf70bd903aa5abb57db9
8SHA1 (patch-ac) = a17fd5ba3edfd746df2a9b4df3ab547505deedfe 8SHA1 (patch-ac) = c6be21da3036a442a6441b3a7a857a87953254e6
9SHA1 (patch-fotoxx-11.05.1.cc) = f9f8a42bb0bf83c998da44e73f94ca47d92351fc 9SHA1 (patch-fotoxx-11.05.1.cc) = bed6a88408948f3770f77e67046ba3c8635818c3
cvs diff -r1.3 -r1.4 pkgsrc/graphics/fotoxx/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-aa 2011/05/11 01:27:03 1.3
+++ pkgsrc/graphics/fotoxx/patches/patch-aa 2011/06/11 18:54:23 1.4
@@ -1,36 +1,14 @@ @@ -1,36 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2011/05/11 01:27:03 ryoon Exp $ 1$NetBSD: patch-aa,v 1.4 2011/06/11 18:54:23 ryoon Exp $
2 2
3--- Makefile.orig 2011-05-01 18:44:26.000000000 +0000 3--- Makefile.orig 2011-06-09 06:29:46.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -23,8 +23,7 @@ LFLAGS = $(LDFLAGS) `pkg-config --libs g 5@@ -24,8 +24,7 @@ LIBS = `pkg-config --libs gtk+-2.0 gthre
6  6
7 fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o 7 fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o
8 $(CXX) $(LFLAGS) -ltiff -o fotoxx fotoxx.o \ 8 $(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o \
9- fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o 9- zfuncs.o $(LIBS) -ltiff -o fotoxx
10- @ ./dependencies.sh 10- @ ./dependencies.sh
11+ fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o -lcompat 11+ zfuncs.o $(LIBS) -ltiff -o fotoxx -lcompat
12  12
13 fotoxx.o: $(VERSION) fotoxx.h 13 fotoxx.o: $(VERSION) fotoxx.h
14 $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION) 14 $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION)
15@@ -48,7 +47,7 @@ install: fotoxx 
16 mkdir -p $(DESTDIR)$(LOCALESDIR) 
17 mkdir -p $(DESTDIR)$(DOCDIR) 
18 mkdir -p $(DESTDIR)$(MANDIR) 
19- mkdir -p $(PREFIX)/share/applications 
20+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications 
21 cp -f fotoxx $(DESTDIR)$(BINDIR) 
22 cp -f data/* $(DESTDIR)$(DATADIR) 
23 cp -f icons/* $(DESTDIR)$(ICONDIR) 
24@@ -60,9 +59,9 @@ install: fotoxx 
25 cp fotoxx.1.gz $(DESTDIR)$(MANDIR) 
26 rm -f fotoxx.1.gz 
27 # menu (desktop) file 
28- echo Exec=/usr/bin/fotoxx >> $(MENUFILE1) 
29- echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(MENUFILE1) 
30- cp $(MENUFILE1) $(DESTDIR)$(MENUFILE2) 
31+ echo Exec=$(BINDIR)/fotoxx >> $(DESTDIR)$(MENUFILE1) 
32+ echo Icon=$(ICONDIR)/fotoxx.png >> $(DESTDIR)$(MENUFILE1) 
33+ cp $(DESTDIR)$(MENUFILE1) $(DESTDIR)$(MENUFILE2) 
34 @ echo "*** use make menu to install the desktop menu" 
35  
36 menu: 
cvs diff -r1.3 -r1.4 pkgsrc/graphics/fotoxx/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ab 2011/05/11 01:27:03 1.3
+++ pkgsrc/graphics/fotoxx/patches/patch-ab 2011/06/11 18:54:23 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.3 2011/05/11 01:27:03 ryoon Exp $ 1$NetBSD: patch-ab,v 1.4 2011/06/11 18:54:23 ryoon Exp $
2 2
3--- zfuncs.cc.orig 2011-05-01 18:44:26.000000000 +0000 3--- zfuncs.cc.orig 2011-06-09 06:29:46.000000000 +0000
4+++ zfuncs.cc 4+++ zfuncs.cc
5@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )  5@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )
6  6
7 printf("zappcrash: \n %s \n",message); // output message to stdout 7 printf("zappcrash: \n %s \n",message); // output message to stdout
8  8
9+#ifdef backtrace 9+#ifdef backtrace
10 nstack = backtrace(stacklist,nstack); // get traceback data 10 nstack = backtrace(stacklist,nstack); // get traceback data
11 stackents = backtrace_symbols(stacklist,nstack); 11 stackents = backtrace_symbols(stacklist,nstack);
12  12
13@@ -84,12 +85,14 @@ void zappcrash(cchar *pMess, ... )  13@@ -84,12 +85,14 @@ void zappcrash(cchar *pMess, ... )
14 printf(" %s \n",stackents[ii]); 14 printf(" %s \n",stackents[ii]);
15  15
16 fid1 = fopen("zappcrash","w"); // text file for backtrace 16 fid1 = fopen("zappcrash","w"); // text file for backtrace
cvs diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ac 2011/05/11 01:27:03 1.4
+++ pkgsrc/graphics/fotoxx/patches/patch-ac 2011/06/11 18:54:23 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ac,v 1.4 2011/05/11 01:27:03 ryoon Exp $ 1$NetBSD: patch-ac,v 1.5 2011/06/11 18:54:23 ryoon Exp $
2 2
3--- zfuncs.h.orig 2011-05-01 18:44:26.000000000 +0000 3--- zfuncs.h.orig 2011-06-09 06:29:46.000000000 +0000
4+++ zfuncs.h 4+++ zfuncs.h
5@@ -22,6 +22,7 @@ 5@@ -22,6 +22,7 @@
6  6
7 // zfuncs.h version v.4.2 7 // zfuncs.h version v.4.4
8  8
9+#include <sys/param.h> 9+#include <sys/param.h>
10 #include <sys/time.h> 10 #include <sys/time.h>
11 #include <sys/stat.h> 11 #include <sys/stat.h>
12 #include <unistd.h> 12 #include <unistd.h>
13@@ -34,9 +35,10 @@ 13@@ -34,9 +35,10 @@
14 #include <pthread.h> 14 #include <pthread.h>
15 #include <errno.h> 15 #include <errno.h>
16 #include <signal.h> 16 #include <signal.h>
17-#include <execinfo.h> 17-#include <execinfo.h>
18+//#include <execinfo.h> 18+//#include <execinfo.h>
19+#include <sys/wait.h> 19+#include <sys/wait.h>
20 #include <locale.h> 20 #include <locale.h>
cvs diff -r1.1 -r1.2 pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc 2011/05/11 01:27:03 1.1
+++ pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc 2011/06/11 18:54:23 1.2
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-fotoxx-11.05.1.cc,v 1.1 2011/05/11 01:27:03 ryoon Exp $ 1$NetBSD: patch-fotoxx-11.05.1.cc,v 1.2 2011/06/11 18:54:23 ryoon Exp $
2 2
3--- fotoxx-11.05.1.cc.orig 2011-05-01 18:44:26.000000000 +0000 3--- fotoxx-11.06.1.cc.orig 2011-06-09 06:29:46.000000000 +0000
4+++ fotoxx-11.05.1.cc 4+++ fotoxx-11.06.1.cc
5@@ -484,7 +484,7 @@ int gtkinitfunc(void *data) 5@@ -427,7 +427,7 @@ int gtkinitfunc(void *data)
6  6
7 // set up current file and directory from command line input or last session parameters v.11.04 7 // set up current file and directory from command line input or last session parameters v.11.04
8  8
9- ppv = get_current_dir_name(); // save current directory 9- ppv = get_current_dir_name(); // save current directory
10+ ppv = getcwd((char *)0, 0); // save current directory 10+ ppv = getcwd((char *)0, 0); // save current directory
11 if (ppv) { 11 if (ppv) {
12 curr_dirk = strdupz(ppv,0,"curr_dirk"); 12 curr_dirk = strdupz(ppv,0,"curr_dirk");
13 free(ppv); 13 free(ppv);
14@@ -493,6 +493,15 @@ int gtkinitfunc(void *data) 14@@ -436,6 +436,15 @@ int gtkinitfunc(void *data)
15 else curr_dirk = 0; 15 else curr_dirk = 0;
16  16
17 if (last_file) { // from command line or parameters 17 if (last_file) { // from command line or parameters
18+#ifdef __NetBSD__ 18+#ifdef __NetBSD__
19+ ppv = zmalloc(MAXPATHLEN+1, "last_file"); 19+ ppv = zmalloc(MAXPATHLEN+1, "last_file");
20+ if (ppv) { 20+ if (ppv) {
21+ if (realpath(last_file, ppv)) { 21+ if (realpath(last_file, ppv)) {
22+ zfree(last_file); 22+ zfree(last_file);
23+ last_file = ppv; 23+ last_file = ppv;
24+ } 24+ }
25+ } 25+ }
26+#else 26+#else
27 ppv = realpath(last_file,0); // prepend directory if needed 27 ppv = realpath(last_file,0); // prepend directory if needed
28 if (ppv) { 28 if (ppv) {
29 curr_file = strdupz(ppv,0,"curr_file"); 29 curr_file = strdupz(ppv,0,"curr_file");
30@@ -503,6 +512,7 @@ int gtkinitfunc(void *data) 30@@ -446,6 +455,7 @@ int gtkinitfunc(void *data)
31 zfree(last_file); 31 zfree(last_file);
32 last_file = 0; 32 last_file = 0;
33 } 33 }
34+#endif 34+#endif
35 } 35 }
36  36
37 if (curr_file) { 37 if (curr_file) {
38@@ -2007,7 +2017,7 @@ void m_gallery(GtkWidget *, cchar *) 38@@ -1953,7 +1963,7 @@ void m_gallery(GtkWidget *, cchar *)
39 if (curr_file) 39 if (curr_file)
40 image_gallery(0,"paint1",curr_file_posn,m_gallery2,mWin); // overlay main window v.10.9 40 image_gallery(0,"paint1",curr_file_posn,m_gallery2,mWin); // overlay main window v.10.9
41 else { 41 else {
42- char *pp = get_current_dir_name(); 42- char *pp = get_current_dir_name();
43+ char *pp = getcwd((char *)0, 0); 43+ char *pp = getcwd((char *)0, 0);
44 if (pp) { 44 if (pp) {
45 image_gallery(pp,"init",0,m_gallery2,mWin); // use current directory v.11.04 45 image_gallery(pp,"init",0,m_gallery2,mWin); // use current directory v.11.04
46 image_gallery(0,"paint1"); 46 image_gallery(0,"paint1");