From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 1 16:10:51 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C7EC16A412 for ; Wed, 1 Nov 2006 16:10:51 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2400043D91 for ; Wed, 1 Nov 2006 16:10:38 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kA1GAbbi017106 for ; Wed, 1 Nov 2006 16:10:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kA1GAbtv017105; Wed, 1 Nov 2006 16:10:37 GMT (envelope-from gnats) Resent-Date: Wed, 1 Nov 2006 16:10:37 GMT Resent-Message-Id: <200611011610.kA1GAbtv017105@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lars Engels Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E25016A416 for ; Wed, 1 Nov 2006 16:04:28 +0000 (UTC) (envelope-from lars@0x20.net) Received: from mail.0x20.net (mail.0x20.net [217.69.67.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF4F543D58 for ; Wed, 1 Nov 2006 16:04:27 +0000 (GMT) (envelope-from lars@0x20.net) Received: from krusty.bsd-geek.de (dslb-084-063-044-230.pools.arcor-ip.net [84.63.44.230]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.0x20.net (Postfix) with ESMTP id 26A603605D for ; Wed, 1 Nov 2006 17:04:25 +0100 (CET) Received: from krusty.bsd-geek.de (krusty.bsd-geek.de [127.0.0.1]) by krusty.bsd-geek.de (8.13.6/8.13.6) with ESMTP id kA1G4Ig0022851 for ; Wed, 1 Nov 2006 17:04:19 +0100 (CET) (envelope-from lars@krusty.bsd-geek.de) Received: (from root@localhost) by krusty.bsd-geek.de (8.13.6/8.13.6/Submit) id kA1G4Ij7022850; Wed, 1 Nov 2006 17:04:18 +0100 (CET) (envelope-from lars) Message-Id: <200611011604.kA1G4Ij7022850@krusty.bsd-geek.de> Date: Wed, 1 Nov 2006 17:04:18 +0100 (CET) From: Lars Engels To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105024: [MAINTAINER] www/swiggle: add functionality patches X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2006 16:10:51 -0000 >Number: 105024 >Category: ports >Synopsis: [MAINTAINER] www/swiggle: add functionality patches >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 01 16:10:37 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Lars Engels >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD krusty.bsd-geek.de 6.1-STABLE FreeBSD 6.1-STABLE #3: Mon Jul 3 00:09:33 CEST >Description: Add two patches to add new features: - -e suppresses exif information on the page and shows it in HTML comments - -E suppresses all exif information - -D displays the filename instead of its size below the image Added file(s): - files/patch-html.c - files/patch-swiggle.c - files/patch-swiggle.h Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- swiggle-0.3.3_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/Makefile /usr/ports/www/swiggle/Makefile --- /usr/ports/www/swiggle.orig/Makefile Wed Nov 1 15:12:14 2006 +++ /usr/ports/www/swiggle/Makefile Wed Nov 1 15:12:32 2006 @@ -6,7 +6,7 @@ PORTNAME= swiggle PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://homepage.univie.ac.at/l.ertl/swiggle/files/ \ http://bsd-geek.de/FreeBSD/distfiles/ diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/files/patch-html.c /usr/ports/www/swiggle/files/patch-html.c --- /usr/ports/www/swiggle.orig/files/patch-html.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/www/swiggle/files/patch-html.c Wed Nov 1 16:18:43 2006 @@ -0,0 +1,164 @@ +--- html.c.orig Sat Oct 23 22:57:02 2004 ++++ html.c Wed Nov 1 15:45:01 2006 +@@ -50,6 +50,7 @@ + #define MAX_PER_PAGE (cols*rows) + + extern int cols; ++extern int exif_display; + extern int rows; + extern char generated[]; + extern char *albumdesc; +@@ -115,37 +116,66 @@ + imglist[x].width, + imglist[x].height, + (int) (imglist[x].filesize/1024)); +- +- fprintf(html, "\n"); +- +- if (imglist[x].datetime != NULL) { +- fprintf(html, "\n" +- "\n\n", +- imglist[x].datetime); +- } +- if (imglist[x].aperture != NULL) { +- fprintf(html, "\n" +- "\n\n", +- imglist[x].aperture); +- } +- if (imglist[x].exposuretime != NULL) { +- fprintf(html, "\n\n\n", +- imglist[x].exposuretime); +- } +- if (imglist[x].flash != NULL) { +- fprintf(html, "\n" +- "\n\n", +- imglist[x].flash); +- } +- if (imglist[x].model != NULL) { +- fprintf(html, "\n" +- "\n\n", +- imglist[x].model); ++ ++ /* Display by default */ ++ if (exif_display == 1) { ++ fprintf(html, "
Taken:%s
Aperture:%s
Exposure Time:" +- "%s
Flash:%s
Model:%s
\n"); ++ ++ if (imglist[x].datetime != NULL) { ++ fprintf(html, "\n" ++ "\n\n", ++ imglist[x].datetime); ++ } ++ if (imglist[x].aperture != NULL) { ++ fprintf(html, "\n" ++ "\n\n", ++ imglist[x].aperture); ++ } ++ if (imglist[x].exposuretime != NULL) { ++ fprintf(html, "\n\n\n", ++ imglist[x].exposuretime); ++ } ++ if (imglist[x].flash != NULL) { ++ fprintf(html, "\n" ++ "\n\n", ++ imglist[x].flash); ++ } ++ if (imglist[x].model != NULL) { ++ fprintf(html, "\n" ++ "\n\n", ++ imglist[x].model); ++ } ++ ++ fprintf(html, "
Taken:%s
Aperture:%s
Exposure Time:" ++ "%s
Flash:%s
Model:%s
\n

\n\n"); ++ /* Hide in comments if user requests */ ++ } else if (exif_display == 2) { ++ fprintf(html, "\n"); + } + +- fprintf(html, "\n

\n\n"); +- + if (offset == 1) { + fprintf(html, "" + "Back to thumbnails\n"); +@@ -197,7 +227,7 @@ + * Returns the number of thumbnail index pages created. + */ + int +-create_thumbindex(char *dir, struct imginfo *imglist, int imgcount) ++create_thumbindex(char *dir, struct imginfo *imglist, int imgcount, int show_descr) + { + char *desc, final[MAXPATHLEN], tmp[MAXPATHLEN]; + int pages, offset, x, y; +@@ -277,21 +307,33 @@ + while (x < y) { + if (x % cols == 0) + fprintf(html, "\n"); +- +- fprintf(html, "\n" +- "\"%s\"
\n%d x %d, %d KB" +- "\n

\n\n", +- imglist[x].filename, +- imglist[x].filename, +- imglist[x].filename, +- imglist[x].thumbwidth, +- imglist[x].thumbheight, +- imglist[x].width, +- imglist[x].height, +- (int)(imglist[x].filesize / 1024)); +- ++ if (show_descr) { ++ fprintf(html, "\n" ++ "\"%s\"
\n%s" ++ "\n

\n\n", ++ imglist[x].filename, ++ imglist[x].filename, ++ imglist[x].filename, ++ imglist[x].thumbwidth, ++ imglist[x].thumbheight, ++ imglist[x].description); ++ } else { ++ fprintf(html, "\n" ++ "\"%s\"
\n%d x %d, %d KB" ++ "\n

\n\n", ++ imglist[x].filename, ++ imglist[x].filename, ++ imglist[x].filename, ++ imglist[x].thumbwidth, ++ imglist[x].thumbheight, ++ imglist[x].width, ++ imglist[x].height, ++ (int)(imglist[x].filesize / 1024)); ++ } + if ((x % cols == cols - 1) || (x + 1 == imgcount)) + fprintf(html, "\n"); + diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/files/patch-swiggle.c /usr/ports/www/swiggle/files/patch-swiggle.c --- /usr/ports/www/swiggle.orig/files/patch-swiggle.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/www/swiggle/files/patch-swiggle.c Wed Nov 1 16:36:04 2006 @@ -0,0 +1,70 @@ +--- swiggle.c.orig Sat Oct 23 22:58:37 2004 ++++ swiggle.c Wed Nov 1 16:34:10 2006 +@@ -66,12 +66,14 @@ + char generated[1024]; + char *progname = ""; + int cols = 5; ++int exif_display = 1; /* By default, display the exif data */ + int rows = 3; + int scaleheight = 480; + int thumbheight = 96; + int force = 0; + int bilinear = 0; + int rm_orphans = 1; ++int show_descr = 0; + int (*sort_func)(); + + #define MAX_PER_PAGE (cols*rows) +@@ -113,7 +115,7 @@ + progname = argv[0]; + sort_func = sort_by_filename; + +- while ((i = getopt(argc, argv, "c:d:h:H:r:s:flov")) != -1) { ++ while ((i = getopt(argc, argv, "c:d:h:H:r:s:DeEflov")) != -1) { + switch (i) { + case 'c': + cols = (int) strtol(optarg, &eptr, 10); +@@ -163,6 +165,12 @@ + usage(); + } + break; ++ case 'e': ++ exif_display = 2; ++ break; ++ case 'E': ++ exif_display = 0; ++ break; + case 'f': + force = 1; + break; +@@ -172,6 +180,9 @@ + case 'o': + rm_orphans = 0; + break; ++ case 'D': ++ show_descr = 1; ++ break; + case 'v': + version(); + break; +@@ -353,7 +364,7 @@ + qsort(imglist, imgcount, sizeof(struct imginfo), sort_func); + + create_html(dir, imglist, imgcount); +- x = create_thumbindex(dir, imglist, imgcount); ++ x = create_thumbindex(dir, imglist, imgcount, show_descr); + printf("%d thumbnail index pages created.\n", x); + } + +@@ -1040,6 +1051,11 @@ + "(default: %d)\n", thumbheight); + fprintf(stderr, " -H ... height of the scaled images in pixel " + "(default: %d)\n", scaleheight); ++ fprintf(stderr, " -e ... don't display exif data on the page, " ++ "insert it in html comments\n"); ++ fprintf(stderr, " -E ... don't display exif data at all\n"); ++ fprintf(stderr, " -D ... display filename instead of size on " ++ "index page\n"); + fprintf(stderr, " -f ... force rebuild of everything; ignore " + "cache\n"); + fprintf(stderr, " -o ... don't remove orphaned files\n"); diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/files/patch-swiggle.h /usr/ports/www/swiggle/files/patch-swiggle.h --- /usr/ports/www/swiggle.orig/files/patch-swiggle.h Thu Jan 1 01:00:00 1970 +++ /usr/ports/www/swiggle/files/patch-swiggle.h Wed Nov 1 16:19:55 2006 @@ -0,0 +1,11 @@ +--- swiggle.h.orig Sat Oct 23 22:58:37 2004 ++++ swiggle.h Wed Nov 1 15:43:27 2006 +@@ -72,7 +72,7 @@ + }; + + void create_html(char *, struct imginfo *, int); +-int create_thumbindex(char *, struct imginfo *, int); ++int create_thumbindex(char *, struct imginfo *, int, int); + + int resize_bicubic(struct jpeg_decompress_struct *, + struct jpeg_compress_struct *, const unsigned char *, unsigned char **); --- swiggle-0.3.3_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: