Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/gnome
In directory usw-pr-cvs1:/tmp/cvs-serv28565/gnome
Added Files:
gnome-mime-data-2.0.0-1.info scrollkeeper-0.2-7.info
scrollkeeper-0.2-7.patch
Log Message:
ready for 10.2
--- NEW FILE: gnome-mime-data-2.0.0-1.info ---
Package: gnome-mime-data
Version: 2.0.0
Revision: 1
BuildDepends: intltool
Conflicts: gnome-vfs (<< 1.0.5), gnome-vfs-ssl (<< 1.0.5)
Source: mirror:gnome:2.0.0/sources/%n/%n-%v.tar.bz2
Source-MD5:1d5005376f37c9e03741e34b30e25d75
ConfigureParams: --mandir=%p/share/man
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog NEWS README
ConfFiles: %p/etc/gnome-vfs-mime-magic
Description: The GNOME MIME database
DescDetail: <<
The GNOME MIME database contains a basic set of applications and MIME
types for a GNOME system.
<<
License: GPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: scrollkeeper-0.2-7.info ---
Package: scrollkeeper
Version: 0.2
Revision: 7
Source: gnome
BuildDepends: readline
Depends: libxml
PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
UpdateLibtool: true
SetLIBS: -lintl
ConfigureParams: --mandir='${prefix}/share/man'
InstallScript: <<
make install DESTDIR=%d scrollkeeperdocdir=%p/share/doc/%n
install -c -m 644 AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README %i/share/doc/%n
(cd %i/share/doc/%n && ln -s ../../%n/doc/scrollkeeper_manual html)
mv %i/share/scrollkeeper/doc/scrollkeeper_manual %i/share/doc/%n/
rm -rf %i/share/scrollkeeper/doc
rm -rf %i/var/lib/scrollkeeper/*
(cd %i/share/scrollkeeper/Templates && ln -fns bg bg_BG)
(cd %i/share/scrollkeeper/Templates && ln -fns bg bg_BG.cp1251)
(cd %i/share/scrollkeeper/Templates && ln -fns de de_AT)
(cd %i/share/scrollkeeper/Templates && ln -fns C en)
(cd %i/share/scrollkeeper/Templates && ln -fns en en_AU)
(cd %i/share/scrollkeeper/Templates && ln -fns en en_GB)
(cd %i/share/scrollkeeper/Templates && ln -fns en en_SE)
(cd %i/share/scrollkeeper/Templates && ln -fns en en_UK)
(cd %i/share/scrollkeeper/Templates && ln -fns en en_US)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_DO)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_ES)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_GT)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_HN)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_MX)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_PA)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_PE)
(cd %i/share/scrollkeeper/Templates && ln -fns es es_SV)
(cd %i/share/scrollkeeper/Templates && ln -fns ja ja_JP.eucJP)
(cd %i/share/scrollkeeper/Templates && ln -fns nb no)
(cd %i/share/scrollkeeper/Templates && ln -fns nn no_NY)
(cd %i/share/scrollkeeper/Templates && ln -fns pt pt_PT)
(cd %i/share/scrollkeeper/Templates && ln -fns sr sr_YU)
(cd %i/share/scrollkeeper/Templates && ln -fns sv sv_SE)
(cd %i/share/scrollkeeper/Templates && ln -fns zh zh_CN)
(cd %i/share/scrollkeeper/Templates && ln -fns zh zh_CN.GB2312)
(cd %i/share/scrollkeeper/Templates && ln -fns zh zh_TW)
(cd %i/share/scrollkeeper/Templates && ln -fns zh zh_TW.Big5)
<<
PostInstScript: <<
scrollkeeper-rebuilddb
<<
PostRmScript: <<
if [ "$1" = "purge" ]; then
rm -rf %p/var/lib/scrollkeeper
fi
<<
Description: Cataloging system for documentation on open systems
DescDetail: <<
ScrollKeeper is a cataloging system for documentation. It manages
documentation metadata (as specified by the Open Source Metadata
Framework (OMF)) and provides a simple API to allow help browsers to
find, sort, and search the document catalog. It will also be able to
communicate with catalog servers on the Net to search for documents
which are not on the local system.
<<
DescPackaging: <<
Re-created some symbolic links to be relative.
Files under %p/var/lib/scrollkeeper is created dynamically. PostInst/PostRm
script handles them.
<<
DescPort: <<
Problems solved by the patch:
- BUG: calling realpath() with too small buffer in cl/src/install.c
- BUG: does not see errno after stat() in cl/src/install.c
- BUG: does not check return value of find_first_element().
- BUG: memory leak in toc_extract_end_element().
- Include <limits.h> for PATH_MAX in cl/src/install.c
- Add strtok_r().
- Changes /var/log to @PREFIX@/var/log
<<
License: GPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: scrollkeeper-0.2-7.patch ---
diff -Naur scrollkeeper-0.2.old/cl/src/install.c scrollkeeper-0.2.new/cl/src/install.c
--- scrollkeeper-0.2.old/cl/src/install.c Thu Mar 15 20:10:33 2001
+++ scrollkeeper-0.2.new/cl/src/install.c Wed Nov 21 22:22:32 2001
@@ -19,6 +19,7 @@
#include <config.h>
#include <tree.h>
#include <parser.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <locale.h>
@@ -228,12 +229,22 @@
char *category, *token, *rest;
category = strdup(c_node->childs->content);
+#ifdef HAVE_STRTOK_R
token = strtok_r(category, SEP, &rest);
+#else
+ token = strtok(category, SEP);
+ rest = token ? (category + strlen(category) + 1) : NULL;
+#endif
add_doc_to_content_list(cl_doc->root->childs, token, &rest,
docpath, omf_name, title, format, unique_id,
0);
free((void *)category);
category = strdup(c_node->childs->content);
+#ifdef HAVE_STRTOK_R
token = strtok_r(category, SEP, &rest);
+#else
+ token = strtok(category, SEP);
+ rest = token ? (category + strlen(category) + 1) : NULL;
+#endif
add_doc_to_content_list(cl_ext_doc->root->childs, token,
&rest,
docpath, omf_name, title, format, unique_id,
1);
free((void *)category);
@@ -420,7 +431,12 @@
node->childs->childs->type == XML_TEXT_NODE &&
!strcmp(cat_token, node->childs->childs->content))
{
+#ifdef HAVE_STRTOK_R
cat_token = strtok_r(NULL, SEP, rest);
+#else
+ cat_token = strtok(*rest, SEP);
+ *rest = (cat_token) ? (*rest + strlen(*rest) + 1) : 0;
+#endif
if (cat_token == NULL)
{
/* we have a match so create a node */
@@ -527,7 +543,7 @@
else /* link the directory */
{
char *target_locale;
- char aux_path[PATHLEN];
+ char aux_path[PATH_MAX];
/* TODO this has to be changed for Solaris as the routine
with this name does not do the same stuff
@@ -608,7 +624,7 @@
sprintf(toc_dir, "%s/TOC", scrollkeeper_dir);
stat(toc_dir, &buf);
- if (!S_ISDIR(buf.st_mode))
+ if (!S_ISDIR(buf.st_mode) || errno == ENOENT)
{
sprintf(command, "mkdir %s", toc_dir);
system(command);
diff -Naur scrollkeeper-0.2.old/doc/scrollkeeper_manual/C/Makefile.in
scrollkeeper-0.2.new/doc/scrollkeeper_manual/C/Makefile.in
--- scrollkeeper-0.2.old/doc/scrollkeeper_manual/C/Makefile.in Wed Mar 28 21:23:00
2001
+++ scrollkeeper-0.2.new/doc/scrollkeeper_manual/C/Makefile.in Wed Nov 21 22:22:32
+2001
@@ -301,7 +301,9 @@
install-data-am: index.html omf
-$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images
-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
- -cp $(srcdir)/$(sgml_files) $(DESTDIR)$(docdir)
+ -for file in $(sgml_files); do \
+ cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
+ done
-for file in $(srcdir)/$(docname)/*.html $(srcdir)/$(docname)/*.css; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \
diff -Naur scrollkeeper-0.2.old/libs/error.c scrollkeeper-0.2.new/libs/error.c
--- scrollkeeper-0.2.old/libs/error.c Thu Mar 15 23:36:55 2001
+++ scrollkeeper-0.2.new/libs/error.c Wed Nov 21 22:26:37 2001
@@ -32,11 +32,11 @@
struct stat buf;
FILE *fid;
- if (stat("/var/log/scrollkeeper.log", &buf) == -1)
+ if (stat("@PREFIX@/var/log/scrollkeeper.log", &buf) == -1)
{
if (errno == ENOENT)
{
- fid = fopen("/var/log/scrollkeeper.log", "w");
+ fid = fopen("@PREFIX@/var/log/scrollkeeper.log", "w");
if (fid == NULL)
return;
}
@@ -47,14 +47,14 @@
{
if (buf.st_size < (1<<24))
{
- fid = fopen("/var/log/scrollkeeper.log", "a");
+ fid = fopen("@PREFIX@/var/log/scrollkeeper.log", "a");
if (fid == NULL)
return;
}
else
{
- rename("/var/log/scrollkeeper.log", "/var/log/scrollkeeper.log.1");
- fid = fopen("/var/log/scrollkeeper.log", "w");
+ rename("@PREFIX@/var/log/scrollkeeper.log",
+"@PREFIX@/var/log/scrollkeeper.log.1");
+ fid = fopen("@PREFIX@/var/log/scrollkeeper.log", "w");
if (fid == NULL)
return;
}
diff -Naur scrollkeeper-0.2.old/toc/src/toc-extract.c
scrollkeeper-0.2.new/toc/src/toc-extract.c
--- scrollkeeper-0.2.old/toc/src/toc-extract.c Thu Oct 12 23:53:39 2000
+++ scrollkeeper-0.2.new/toc/src/toc-extract.c Wed Nov 21 22:22:32 2001
@@ -97,10 +97,15 @@
stack_el = find_first_element (context, element_list);
- if (!stack_el->ignore)
+ list_free (element_list);
+
+ if (stack_el)
{
- print_indent(context->depth);
- printf("</tocsect%d>\n", context->depth-1);
+ if (!stack_el->ignore)
+ {
+ print_indent(context->depth);
+ printf("</tocsect%d>\n", context->depth-1);
+ }
}
}
@@ -190,11 +195,11 @@
stack_el = find_first_element (context, element_list);
+ list_free (element_list);
+ if (!stack_el)
+ return;
if (stack_el->title_output)
- {
- list_free (element_list);
return;
- }
temp = (char *)calloc(len+1, sizeof(char));
strncpy(temp, chars, len);
@@ -220,8 +225,6 @@
};
free(temp);
-
- list_free (element_list);
}
static void print_indent(int depth)
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
