diff options
Diffstat (limited to 'graphics/fotoxx')
-rw-r--r-- | graphics/fotoxx/Makefile | 4 | ||||
-rw-r--r-- | graphics/fotoxx/PLIST | 20 | ||||
-rw-r--r-- | graphics/fotoxx/distinfo | 16 | ||||
-rw-r--r-- | graphics/fotoxx/patches/patch-aa | 18 | ||||
-rw-r--r-- | graphics/fotoxx/patches/patch-ab | 4 | ||||
-rw-r--r-- | graphics/fotoxx/patches/patch-ac | 4 | ||||
-rw-r--r-- | graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc | 46 |
7 files changed, 48 insertions, 64 deletions
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 50dc013c573..fbbe6d6e891 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2011/06/11 18:54:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2011/07/14 08:15:35 ryoon Exp $ # -DISTNAME= fotoxx-11.06.1 +DISTNAME= fotoxx-11.07 CATEGORIES= graphics MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ diff --git a/graphics/fotoxx/PLIST b/graphics/fotoxx/PLIST index 49980046166..818b4b2364e 100644 --- a/graphics/fotoxx/PLIST +++ b/graphics/fotoxx/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2011/06/11 18:54:23 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.7 2011/07/14 08:15:35 ryoon Exp $ bin/fotoxx share/applications/kornelix-fotoxx.desktop share/doc/fotoxx/CHANGES @@ -6,11 +6,12 @@ share/doc/fotoxx/COPYING share/doc/fotoxx/README share/doc/fotoxx/TRANSLATIONS share/doc/fotoxx/fotoxx.man +share/doc/fotoxx/freshmeat share/doc/fotoxx/images/HDF-paint.jpg share/doc/fotoxx/images/HDR-adjust.jpg share/doc/fotoxx/images/annotate.jpg +share/doc/fotoxx/images/bright-ramp.jpg share/doc/fotoxx/images/brightness-color.jpg -share/doc/fotoxx/images/brightness-ramp.png share/doc/fotoxx/images/curve-edit.jpg share/doc/fotoxx/images/edit-collection.jpg share/doc/fotoxx/images/edit-tags.jpg @@ -18,16 +19,19 @@ share/doc/fotoxx/images/expand-brightness.png share/doc/fotoxx/images/gallery image selection.jpg share/doc/fotoxx/images/gammachart.png share/doc/fotoxx/images/manage-tags.jpg +share/doc/fotoxx/images/match-colors.jpg share/doc/fotoxx/images/navigation.jpeg share/doc/fotoxx/images/pano-dialog.jpeg share/doc/fotoxx/images/remove-dust.jpg share/doc/fotoxx/images/rename.jpeg -share/doc/fotoxx/images/save-as.jpeg +share/doc/fotoxx/images/revise-RGB.jpg +share/doc/fotoxx/images/save-as.jpg share/doc/fotoxx/images/search-images.jpg -share/doc/fotoxx/images/select-area.png +share/doc/fotoxx/images/select-area.jpg share/doc/fotoxx/images/select-edit.jpg share/doc/fotoxx/images/select-whole-image.jpg share/doc/fotoxx/images/sharpen.jpeg +share/doc/fotoxx/images/show-RGB.jpg share/doc/fotoxx/images/smart-erase.png share/doc/fotoxx/images/stack.png share/doc/fotoxx/images/tone-mapping.png @@ -35,7 +39,9 @@ share/doc/fotoxx/images/translate.jpg share/doc/fotoxx/images/trim.jpg share/doc/fotoxx/images/unbend.png share/doc/fotoxx/images/watermark.jpg +share/doc/fotoxx/userguide-changes.txt share/doc/fotoxx/userguide-en.html +share/doc/fotoxx/userguide-it.html share/fotoxx/data/desktop share/fotoxx/icons/arrow.png share/fotoxx/icons/busy.png @@ -51,6 +57,7 @@ share/fotoxx/icons/last-page.png share/fotoxx/icons/next-page.png share/fotoxx/icons/next-row.png share/fotoxx/icons/next.png +share/fotoxx/icons/open+W.png share/fotoxx/icons/open.png share/fotoxx/icons/prev-page.png share/fotoxx/icons/prev-row.png @@ -58,14 +65,14 @@ share/fotoxx/icons/prev.png share/fotoxx/icons/print.png share/fotoxx/icons/quit.png share/fotoxx/icons/redo.png +share/fotoxx/icons/save+F.png +share/fotoxx/icons/save+V.png share/fotoxx/icons/save.png -share/fotoxx/icons/saveas.png share/fotoxx/icons/trash.png share/fotoxx/icons/undo.png share/fotoxx/icons/zoom+.png share/fotoxx/icons/zoom-.png share/fotoxx/locales/de/fotoxx.po -share/fotoxx/locales/de/fotoxx.po.old share/fotoxx/locales/de/zfuncs.po share/fotoxx/locales/en/fotoxx.po share/fotoxx/locales/en/zfuncs.po @@ -76,6 +83,7 @@ share/fotoxx/locales/fr/zfuncs.po share/fotoxx/locales/gl/fotoxx.po share/fotoxx/locales/gl/zfuncs.po share/fotoxx/locales/it/fotoxx.po +share/fotoxx/locales/it/fotoxx.po.old share/fotoxx/locales/it/zfuncs.po share/fotoxx/locales/nl/fotoxx.po share/fotoxx/locales/nl/zfuncs.po diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 87865e28c9b..a1c3e0f3595 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2011/06/11 18:54:23 ryoon Exp $ +$NetBSD: distinfo,v 1.7 2011/07/14 08:15:35 ryoon Exp $ -SHA1 (fotoxx-11.06.1.tar.gz) = 85b62abf984103877eca2bcd721b2d382b01c84b -RMD160 (fotoxx-11.06.1.tar.gz) = 14839d3a3fd1d61c5c1fbe3867a0c826dd472eb0 -Size (fotoxx-11.06.1.tar.gz) = 1354440 bytes -SHA1 (patch-aa) = 30cdc0e3fbb1ef445463cb9c89079f2ef4c38c11 -SHA1 (patch-ab) = 8c95419f50a30a88c4cbbf70bd903aa5abb57db9 -SHA1 (patch-ac) = c6be21da3036a442a6441b3a7a857a87953254e6 -SHA1 (patch-fotoxx-11.05.1.cc) = bed6a88408948f3770f77e67046ba3c8635818c3 +SHA1 (fotoxx-11.07.tar.gz) = 011aeb57df73ba6689160379bf90f0b46991df65 +RMD160 (fotoxx-11.07.tar.gz) = a8b6aa6cfb6310695621bcb07932f22a4f2ea3ab +Size (fotoxx-11.07.tar.gz) = 1404130 bytes +SHA1 (patch-aa) = a7cb44980df7e49143689bc11d349c8aceb0115d +SHA1 (patch-ab) = 088a467f899464221f33a1d995ea37947a940f43 +SHA1 (patch-ac) = 369ce1c76b32b47bea3e855c812a7d50474dd2ba +SHA1 (patch-fotoxx-11.05.1.cc) = 25930c9655621132fd4e7773d006b0f75bb58df8 diff --git a/graphics/fotoxx/patches/patch-aa b/graphics/fotoxx/patches/patch-aa index b4f693e6f2f..da01eb7e9e6 100644 --- a/graphics/fotoxx/patches/patch-aa +++ b/graphics/fotoxx/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.4 2011/06/11 18:54:23 ryoon Exp $ +$NetBSD: patch-aa,v 1.5 2011/07/14 08:15:35 ryoon Exp $ ---- Makefile.orig 2011-06-09 06:29:46.000000000 +0000 +--- Makefile.orig 2011-07-01 17:05:59.000000000 +0000 +++ Makefile -@@ -24,8 +24,7 @@ LIBS = `pkg-config --libs gtk+-2.0 gthre - - fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o - $(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o \ -- zfuncs.o $(LIBS) -ltiff -o fotoxx -- @ ./dependencies.sh -+ zfuncs.o $(LIBS) -ltiff -o fotoxx -lcompat +@@ -26,8 +26,7 @@ fotoxx: fotoxx.o fotoxx_area.o fotoxx_in + fotoxx_transform.o fotoxx_art.o fotoxx_comp.o zfuncs.o + $(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_retouch.o \ + fotoxx_transform.o fotoxx_art.o fotoxx_comp.o zfuncs.o \ +- $(LIBS) -ltiff -o fotoxx +- @ ./dependencies.sh ## after the build ++ $(LIBS) -ltiff -o fotoxx -lcompat fotoxx.o: $(VERSION) fotoxx.h $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION) diff --git a/graphics/fotoxx/patches/patch-ab b/graphics/fotoxx/patches/patch-ab index 931d2cc4625..9d024927f55 100644 --- a/graphics/fotoxx/patches/patch-ab +++ b/graphics/fotoxx/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2011/06/11 18:54:23 ryoon Exp $ +$NetBSD: patch-ab,v 1.5 2011/07/14 08:15:35 ryoon Exp $ ---- zfuncs.cc.orig 2011-06-09 06:29:46.000000000 +0000 +--- zfuncs.cc.orig 2011-07-01 17:05:59.000000000 +0000 +++ zfuncs.cc @@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... ) diff --git a/graphics/fotoxx/patches/patch-ac b/graphics/fotoxx/patches/patch-ac index 43a55eb2816..a61de40488f 100644 --- a/graphics/fotoxx/patches/patch-ac +++ b/graphics/fotoxx/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2011/06/11 18:54:23 ryoon Exp $ +$NetBSD: patch-ac,v 1.6 2011/07/14 08:15:35 ryoon Exp $ ---- zfuncs.h.orig 2011-06-09 06:29:46.000000000 +0000 +--- zfuncs.h.orig 2011-07-01 17:05:59.000000000 +0000 +++ zfuncs.h @@ -22,6 +22,7 @@ diff --git a/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc b/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc index c0593945189..9724e71284f 100644 --- a/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc +++ b/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc @@ -1,41 +1,17 @@ -$NetBSD: patch-fotoxx-11.05.1.cc,v 1.2 2011/06/11 18:54:23 ryoon Exp $ +$NetBSD: patch-fotoxx-11.05.1.cc,v 1.3 2011/07/14 08:15:35 ryoon Exp $ ---- fotoxx-11.06.1.cc.orig 2011-06-09 06:29:46.000000000 +0000 -+++ fotoxx-11.06.1.cc -@@ -427,7 +427,7 @@ int gtkinitfunc(void *data) +--- fotoxx-11.07.cc.orig 2011-07-01 17:05:59.000000000 +0000 ++++ fotoxx-11.07.cc +@@ -451,7 +451,7 @@ int gtkinitfunc(void *data) - // set up current file and directory from command line input or last session parameters v.11.04 - -- ppv = get_current_dir_name(); // save current directory -+ ppv = getcwd((char *)0, 0); // save current directory - if (ppv) { - curr_dirk = strdupz(ppv,0,"curr_dirk"); - free(ppv); -@@ -436,6 +436,15 @@ int gtkinitfunc(void *data) - else curr_dirk = 0; - - if (last_file) { // from command line or parameters -+#ifdef __NetBSD__ -+ ppv = zmalloc(MAXPATHLEN+1, "last_file"); -+ if (ppv) { -+ if (realpath(last_file, ppv)) { -+ zfree(last_file); -+ last_file = ppv; -+ } -+ } -+#else - ppv = realpath(last_file,0); // prepend directory if needed + if (topdirk) curr_dirk = strdupz(topdirk,0,"curr_dirk"); // use top directory if defined v.11.07 + else { +- ppv = get_current_dir_name(); // or use current directory ++ ppv = getcwd((char *)0, 0); // or use current directory if (ppv) { - curr_file = strdupz(ppv,0,"curr_file"); -@@ -446,6 +455,7 @@ int gtkinitfunc(void *data) - zfree(last_file); - last_file = 0; - } -+#endif - } - - if (curr_file) { -@@ -1953,7 +1963,7 @@ void m_gallery(GtkWidget *, cchar *) + curr_dirk = strdupz(ppv,0,"curr_dirk"); + free(ppv); +@@ -2083,7 +2083,7 @@ void m_gallery(GtkWidget *, cchar *) if (curr_file) image_gallery(0,"paint1",curr_file_posn,m_gallery2,mWin); // overlay main window v.10.9 else { |