diff options
| author | drochner <drochner@pkgsrc.org> | 2006-08-10 14:07:55 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-08-10 14:07:55 +0000 |
| commit | 2a14fc8345dc6abfb5672073b4fd37d85debbf10 (patch) | |
| tree | daba840cab371bcaf23d62f98167d479bdb72864 /devel/devhelp/patches | |
| parent | e3b70c75965aebce771ff63eb49a24a6659eb253 (diff) | |
| download | pkgsrc-2a14fc8345dc6abfb5672073b4fd37d85debbf10.tar.gz | |
update to 0.12
too many changes to list here, see the NEWS file in the distribution
most notably: uses gecko (firefox or mozilla) to render HTML
pkgsrc change: The search path for gtk-doc books has changed. Now
we support the gtk-doc standard share/gtk-doc/html/* (which was patched
out previously), and in addition share/doc/* (which is used by most
pkgsrc installed books). The latter was share/doc/html/* previously
which rendered the whole thing almost useless because only few pkgs
used it. This is in response to PR pkg/34159 by "khorben@syn.localhost".
Diffstat (limited to 'devel/devhelp/patches')
| -rw-r--r-- | devel/devhelp/patches/patch-aa | 31 | ||||
| -rw-r--r-- | devel/devhelp/patches/patch-ab | 22 | ||||
| -rw-r--r-- | devel/devhelp/patches/patch-ac | 13 | ||||
| -rw-r--r-- | devel/devhelp/patches/patch-ad | 13 |
4 files changed, 26 insertions, 53 deletions
diff --git a/devel/devhelp/patches/patch-aa b/devel/devhelp/patches/patch-aa index 2252389a103..b3762f3421f 100644 --- a/devel/devhelp/patches/patch-aa +++ b/devel/devhelp/patches/patch-aa @@ -1,20 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/09/25 16:04:07 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/08/10 14:07:55 drochner Exp $ ---- src/dh-base.c.orig 2003-06-28 23:16:34.000000000 +0200 +--- src/dh-base.c.orig 2006-08-10 14:47:22.000000000 +0200 +++ src/dh-base.c -@@ -221,9 +221,12 @@ base_init_books (DhBase *base) - } - - /* Insert the books from default gtk-doc install path. */ -- base_add_books (base, DATADIR "/gtk-doc/html"); -- base_add_books (base, "/usr/share/gtk-doc/html"); -- base_add_books (base, DATADIR "/devhelp/books"); -+ dir = g_build_filename (DATADIR, "doc", "html", NULL); -+ base_add_books (base, dir); -+ g_free (dir); -+ dir = g_build_filename (g_get_home_dir (), ".devhelp2", "books", NULL); -+ base_add_books (base, dir); -+ g_free (dir); - dir = g_build_filename (g_get_home_dir (), ".devhelp", "books", NULL); - base_add_books (base, dir); - g_free (dir); +@@ -233,6 +233,10 @@ base_add_books_in_data_dir(DhBase *base, + dir = g_build_filename(data_dir, "devhelp", "books", NULL); + base_add_books(base, dir); + g_free(dir); ++ ++ dir = g_build_filename(data_dir, "doc", NULL); ++ base_add_books(base, dir); ++ g_free(dir); + } + + static void diff --git a/devel/devhelp/patches/patch-ab b/devel/devhelp/patches/patch-ab deleted file mode 100644 index 398ecb368c6..00000000000 --- a/devel/devhelp/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/01/30 19:21:41 joerg Exp $ - ---- libegg/toolbar/eggtoolbar.c.orig 2006-01-30 19:07:59.000000000 +0000 -+++ libegg/toolbar/eggtoolbar.c -@@ -2570,7 +2570,7 @@ egg_toolbar_insert_widget (EggToolbar *t - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2587,7 +2587,7 @@ egg_toolbar_append_element (EggToolbar - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/devel/devhelp/patches/patch-ac b/devel/devhelp/patches/patch-ac deleted file mode 100644 index d3ea335acb4..00000000000 --- a/devel/devhelp/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2006/01/30 19:21:41 joerg Exp $ - ---- src/dh-parser.c.orig 2006-01-30 19:11:10.000000000 +0000 -+++ src/dh-parser.c -@@ -37,8 +37,6 @@ - #define DH_PARSER(o) ((DhParser *) o) - #define BYTES_PER_READ 4096 - --extern int errno; -- - typedef struct { - GMarkupParser *m_parser; - GMarkupParseContext *context; diff --git a/devel/devhelp/patches/patch-ad b/devel/devhelp/patches/patch-ad new file mode 100644 index 00000000000..73de9316889 --- /dev/null +++ b/devel/devhelp/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2006/08/10 14:07:55 drochner Exp $ + +--- misc/Makefile.in.orig 2006-08-10 14:17:59.000000000 +0200 ++++ misc/Makefile.in +@@ -246,7 +246,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = gedit-plugin ++SUBDIRS = + EXTRA_DIST = devhelp.el devhelp.vim html2funcs.py html2xml.py man2xml.py + all: all-recursive + |