From e30f56505553ed4a29fea0d36338f3e74ddc57a2 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 9 Jan 2008 19:21:08 +0000 Subject: update to 34 changes: + multiple language capability for GUI, German translation done. + fix crash after attempting to open a non-image file type --- graphics/fotox/Makefile | 17 ++++++----- graphics/fotox/PLIST | 9 ++++-- graphics/fotox/distinfo | 11 +++---- graphics/fotox/patches/patch-aa | 66 ++++++++++------------------------------- 4 files changed, 38 insertions(+), 65 deletions(-) (limited to 'graphics/fotox') diff --git a/graphics/fotox/Makefile b/graphics/fotox/Makefile index 6111f9936e6..a6121106125 100644 --- a/graphics/fotox/Makefile +++ b/graphics/fotox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2008/01/09 19:21:08 drochner Exp $ # -DISTNAME= fotox.32 -PKGNAME= fotox-32 +DISTNAME= fotox.34 +PKGNAME= fotox-34 CATEGORIES= graphics MASTER_SITES= http://kornelix.squarespace.com/storage/fotox/ @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://kornelix.squarespace.com/fotox/ COMMENT= Simple image manipulation program -WRKSRC= ${WRKDIR} +WRKSRC= ${WRKDIR}/fotox USE_LANGUAGES= c++ USE_TOOLS+= pkg-config @@ -18,18 +18,21 @@ FDATA= ${PREFIX}/share/fotox SUBST_CLASSES+= data SUBST_STAGE.data= pre-build -SUBST_FILES.data= zlib.cpp +SUBST_FILES.data= zfuncs.cpp SUBST_VARS.data= FDATA do-build: - (cd ${WRKSRC} && ${SH} fotox-build.sh) + (cd ${WRKSRC} && ${SH} build ${PREFIX}/bin y) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fotox.x ${PREFIX}/bin/fotox + ${INSTALL_PROGRAM} ${WRKSRC}/fotox ${PREFIX}/bin ${INSTALL_DATA_DIR} ${FDATA} ${INSTALL_DATA} ${WRKSRC}/parameters.txt ${FDATA} ${CP} -r ${WRKSRC}/icons ${FDATA} ${INSTALL_DATA} ${WRKSRC}/fotox-guide.pdf ${FDATA} + ${INSTALL_DATA} ${WRKSRC}/*.xtext ${FDATA} + ${INSTALL_DATA} ${WRKSRC}/fotox.desktop ${PREFIX}/share/applications .include "../../x11/gtk2/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/fotox/PLIST b/graphics/fotox/PLIST index 1b879822c87..678c971436d 100644 --- a/graphics/fotox/PLIST +++ b/graphics/fotox/PLIST @@ -1,13 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/01/09 19:21:08 drochner Exp $ bin/fotox +share/applications/fotox.desktop share/fotox/fotox-guide.pdf +share/fotox/fotox.xtext share/fotox/icons/HDR.png +share/fotox/icons/bigger.png share/fotox/icons/blank.png share/fotox/icons/crop.png share/fotox/icons/exif.png share/fotox/icons/exif2.png share/fotox/icons/fotox.png -share/fotox/icons/fotox2.png +share/fotox/icons/fotox1.png share/fotox/icons/goto-end.png share/fotox/icons/goto-top.png share/fotox/icons/help.png @@ -29,10 +32,12 @@ share/fotox/icons/redo.png share/fotox/icons/resize.png share/fotox/icons/rotate.png share/fotox/icons/save.png +share/fotox/icons/smaller.png share/fotox/icons/trash.png share/fotox/icons/tune.png share/fotox/icons/unbend.png share/fotox/icons/undo.png share/fotox/parameters.txt +share/fotox/zfuncs.xtext @dirrm share/fotox/icons @dirrm share/fotox diff --git a/graphics/fotox/distinfo b/graphics/fotox/distinfo index 449961b2494..f0741c5dc50 100644 --- a/graphics/fotox/distinfo +++ b/graphics/fotox/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $ +$NetBSD: distinfo,v 1.2 2008/01/09 19:21:08 drochner Exp $ -SHA1 (fotox.32.tar.gz) = 606333582f72ee4a405fbe8ea31639228a82eed5 -RMD160 (fotox.32.tar.gz) = d030ad1d89b4e8c564bbec7659cd5fe19c172770 -Size (fotox.32.tar.gz) = 1600578 bytes -SHA1 (patch-aa) = f7305ae008e25e2fa51178e8a95472fc6bf035bc +SHA1 (fotox.34.tar.gz) = 219a8d84bd231c97d8eea10d55c3bc6d5779425c +RMD160 (fotox.34.tar.gz) = 774e2fd2934b6720b31199d12ae1047cb2326f1e +Size (fotox.34.tar.gz) = 1547843 bytes +SHA1 (patch-aa) = bc49037c49944db7b097c4123f9735c0198ea02e +SHA1 (patch-ab) = 63e3c6311835d97aadef852a03f528ece47bd61c diff --git a/graphics/fotox/patches/patch-aa b/graphics/fotox/patches/patch-aa index 55a6859f7c9..f2027234029 100644 --- a/graphics/fotox/patches/patch-aa +++ b/graphics/fotox/patches/patch-aa @@ -1,73 +1,37 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2008/01/09 19:21:09 drochner Exp $ ---- zlib.cpp.orig 2007-11-10 17:58:47.000000000 +0100 -+++ zlib.cpp -@@ -15,10 +15,10 @@ +--- zfuncs.cpp.orig 2008-01-02 09:14:04.000000000 +0100 ++++ zfuncs.cpp +@@ -2150,26 +2150,15 @@ char zexedirk[1000], zappdirk[200], - char * syserrText(int err) - { -- static char *ptext, buff[200]; -+ static char buff[200]; - if (err == 0) err = errno; -- ptext = strerror_r(err,buff,200); -- return ptext; -+ strerror_r(err,buff,200); -+ return buff; - } - - -@@ -2115,7 +2115,10 @@ void zlockInit() - { - int ii; - tid_main = pthread_self(); -- for (ii = 0; ii < tmax; ii++) tids[ii] = tlocks[ii] = 0; -+ for (ii = 0; ii < tmax; ii++) { -+ tids[ii] = (pthread_t)0; -+ tlocks[ii] = 0; -+ } - mutex_init(&zmutex,null); - zinit++; - return; -@@ -2482,7 +2485,10 @@ void wfilesave(GtkWidget *mLog) - file = zgetfile("save screen to file","screen-save.txt","save"); - if (! file) return; - err = wfiledump(mLog,file); -- if (err) zmessageACK(strerror_r(errno,file,200)); -+ if (err) { -+ strerror_r(errno,file,200); -+ zmessageACK(file); -+ } - zfree(file); - return; - } -@@ -2646,24 +2652,15 @@ char zexedirk[1000], zappdirk[200], void initz_appfiles(const char *appfile, ...) // null terminator v.07 { - char command[1200], *pp; +- char command[1200], *pp; - int fcc, err; ++ char command[1200]; + int err; struct stat statdat; va_list arglist; -- fcc = readlink("/proc/self/exe",zexedirk,999); // get /dirk-path/appname.x -- if (fcc < 3 || fcc > 997) zappcrash("/proc/self/exe absurd"); +- fcc = readlink("/proc/self/exe",zexedirk,999); // get /dirk-path/appname +- if (fcc <= 0) fcc = readlink("/proc/curproc/file",zexedirk,999); // BSD version v.13 +- if (fcc < 3 || fcc > 997) zappcrash("cannot find executable location"); - zexedirk[fcc] = 0; - pp = strrchr(zexedirk,'/'); -- if (! pp) zappcrash("/proc/self/exe absurd"); +- if (! pp) zappcrash("cannot find executable location"); - *pp = 0; - -- strncpy0(zappname,pp+1,39); // appname +- strncpy0(zappname,pp+1,39); // appname [ .exe ] - pp = strrchr(zappname,'.'); - if (pp) *pp = 0; - - pp = cuserid(0); // get /home/user/.appname/ - if (strEqu(pp,"root")) snprintf(zappdirk,199,"/root/.%s",zappname); -- else snprintf(zappdirk,199,"/home/%s/.%s",pp,zappname); -+ strncpy0(zexedirk, "@FDATA@", 999); -+ strncpy0(zappname,"fotox",39); // appname +- else snprintf(zappdirk,199,"%s/.%s",getenv("HOME"),zappname); // use HOME variable v.13 ++ strncpy0(zexedirk, "/usr/pkg/share/fotox", 999); ++ strncpy0(zappname,"fotox",39); + -+ pp = getenv("HOME"); // get /home/user/.appname/ -+ snprintf(zappdirk,199,"%s/.%s",pp,zappname); ++ snprintf(zappdirk,199,"%s/.%s",getenv("HOME"),zappname); // use HOME variable v.13 err = stat(zappdirk,&statdat); // does it exist already? if (err) { -- cgit v1.2.3