Tue Aug 28 00:30:45 2012 UTC ()
add patch comments


(gdt)
diff -r1.6 -r1.7 pkgsrc/graphics/geeqie/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/geeqie/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/graphics/geeqie/patches/patch-ac
cvs diff -r1.6 -r1.7 pkgsrc/graphics/geeqie/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/distinfo 2012/08/27 22:19:32 1.6
+++ pkgsrc/graphics/geeqie/distinfo 2012/08/28 00:30:44 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2012/08/27 22:19:32 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2012/08/28 00:30:44 gdt Exp $
2 2
3SHA1 (geeqie-1.1.tar.gz) = 77167479e91e03d9512535a146c5d2d77941257f 3SHA1 (geeqie-1.1.tar.gz) = 77167479e91e03d9512535a146c5d2d77941257f
4RMD160 (geeqie-1.1.tar.gz) = 060c62c3db32fe4bc05aa6dccd052360d3aac3cf 4RMD160 (geeqie-1.1.tar.gz) = 060c62c3db32fe4bc05aa6dccd052360d3aac3cf
5Size (geeqie-1.1.tar.gz) = 1966211 bytes 5Size (geeqie-1.1.tar.gz) = 1966211 bytes
6SHA1 (patch-ab) = 7a8a882489f9a6c9ea810051229a41803954be72 6SHA1 (patch-ab) = a2aa37f813b32b216410515e6e80fe8fdc9c6803
7SHA1 (patch-ac) = 4109912f790351c4cc14d6db753c9571a421ae36 7SHA1 (patch-ac) = 531d7338f1c42c62a738aa8fb4253b3324e71458
cvs diff -r1.4 -r1.5 pkgsrc/graphics/geeqie/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/patches/Attic/patch-ab 2010/09/25 12:29:01 1.4
+++ pkgsrc/graphics/geeqie/patches/Attic/patch-ab 2012/08/28 00:30:45 1.5
@@ -1,13 +1,21 @@ @@ -1,13 +1,21 @@
1$NetBSD: patch-ab,v 1.4 2010/09/25 12:29:01 wiz Exp $ 1$NetBSD: patch-ab,v 1.5 2012/08/28 00:30:45 gdt Exp $
 2
 3Generate html docs in build phase (instead of install phase).
 4gnome-doc-tool seems to ignore "-o html" so manually generate
 5the same effect.
 6
 7Solves PLIST problem due to missing html files.
 8
 9This is not know to be reported upstream.
2 10
3--- doc/Makefile.in.orig 2010-09-25 12:02:12.000000000 +0000 11--- doc/Makefile.in.orig 2010-09-25 12:02:12.000000000 +0000
4+++ doc/Makefile.in 12+++ doc/Makefile.in
5@@ -408,7 +408,7 @@ uninstall-am: uninstall-helpDATA 13@@ -408,7 +408,7 @@ uninstall-am: uninstall-helpDATA
6 html/GuideIndex.html: docbook/GuideIndex.xml 14 html/GuideIndex.html: docbook/GuideIndex.xml
7 rm -rf html; mkdir html 15 rm -rf html; mkdir html
8 if [ -x "$(GNOME_DOC_TOOL)" ]; then \ 16 if [ -x "$(GNOME_DOC_TOOL)" ]; then \
9- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \ 17- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
10+ cd html && "$(GNOME_DOC_TOOL)" html ../$(srcdir)/docbook/GuideIndex.xml ; \ 18+ cd html && "$(GNOME_DOC_TOOL)" html ../$(srcdir)/docbook/GuideIndex.xml ; \
11 else \ 19 else \
12 echo "gnome-doc-tool not found, html is not built" ; \ 20 echo "gnome-doc-tool not found, html is not built" ; \
13 fi 21 fi
cvs diff -r1.3 -r1.4 pkgsrc/graphics/geeqie/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/geeqie/patches/Attic/patch-ac 2010/02/20 20:50:34 1.3
+++ pkgsrc/graphics/geeqie/patches/Attic/patch-ac 2012/08/28 00:30:45 1.4
@@ -1,14 +1,21 @@ @@ -1,14 +1,21 @@
1$NetBSD: patch-ac,v 1.3 2010/02/20 20:50:34 gdt Exp $ 1$NetBSD: patch-ac,v 1.4 2012/08/28 00:30:45 gdt Exp $
 2
 3Comment from 2009/07/24:
 4
 5 disable the SIGBUS handler completely -- as implemented it can only
 6 cause trouble
 7
 8This is not known to be reported upstream.
2 9
3--- src/main.c.orig 2010-02-17 21:21:19.000000000 +0000 10--- src/main.c.orig 2010-02-17 21:21:19.000000000 +0000
4+++ src/main.c 11+++ src/main.c
5@@ -709,6 +709,7 @@ void exit_program(void) 12@@ -709,6 +709,7 @@ void exit_program(void)
6 */ 13 */
7 /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */ 14 /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
8  15
9+#if 0 16+#if 0
10 #if defined(SIGBUS) && defined(SA_SIGINFO) 17 #if defined(SIGBUS) && defined(SA_SIGINFO)
11 static void sigbus_handler_cb(int signum, siginfo_t *info, void *context) 18 static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
12 { 19 {
13@@ -717,9 +718,11 @@ static void sigbus_handler_cb(int signum 20@@ -717,9 +718,11 @@ static void sigbus_handler_cb(int signum
14 mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 21 mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);