Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14713/10.4/stable/main/finkinfo/gnome
Added Files:
bonobo.info bonobo.patch glibwww.info libglade.info
libglade.patch scrollkeeper.info scrollkeeper.patch
Removed Files:
bonobo-1.0.20-13.info bonobo-1.0.20-13.patch
glibwww-0.2-14.info libglade-0.17-13.info
libglade-0.17-13.patch scrollkeeper-0.3.12-2.info
scrollkeeper-0.3.12-2.patch
Log Message:
Rename %f->%n
--- NEW FILE: scrollkeeper.info ---
Package: scrollkeeper
Version: 0.3.12
Revision: 2
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 7d8eb0717345f09281d52e2523ae4f94
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
Depends: libxslt-shlibs, libxml2-bin (>= 2.4.25-4), docbook-dtd (>= 4.1.2-4)
BuildDepends: libxml2, libxslt, intltool, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
NoSetLDFLAGS: true
SetLIBS: -L%p/lib -lintl
ConfigureParams: --localstatedir=%p/var --mandir=%p/share/man
--with-omfdirs=%p/share/omf
CompileScript: ./configure %c; make -j2
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/etc/xml/catalog.d
install -c -m 644 scrollkeeper.xmlcatalog %i/etc/xml/catalog.d/%n
<<
PostInstScript: <<
case "$1" in
configure)
update-xml-catalog
;;
esac
<<
PostRmScript: <<
case "$1" in
abort-install|purge|remove)
if [ -x %p/sbin/update-xml-catalog ]; then
update-xml-catalog
fi
;;
esac
<<
ConfFiles: %p/etc/scrollkeeper.conf
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
Description: Cataloging system for documentation
DescDetail: <<
ScrollKeeper is a cataloging system for documentation. It manages
documentation metadata, as specified by the Open Source Metadata
Framework (OMF), as well as metadata which it extracts directly
from DocBook documents. It provides a simple API to allow help
browsers to find, sort, and search the document catalog. Some
day it may also be able to communicate with catalog servers on
the Net to search for documents which are not on the local system.
<<
DescPackaging:<<
For fink packager:
If your package installs .omf file(s), be sure to follow these rules:
1. Remove following line (usually in omf-install/Makefile.in), which
will modify files in %p directly.
-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
2. Add dependency on scrollkeeper.
Depends: scrollkeeper, ...
3. Add PostInstScript and PostRmScript.
PostInstScript: <<
if [ configure = "$1" ]; then
scrollkeeper-update -q
fi
<<
PostRmScript: <<
if [ remove != "$1" ]; then
scrollkeeper-update -q
fi
<<
Originally packaged by Masanori Sekino.
<<
License: GPL/GFDL
Maintainer: None <fink-devel@lists.sourceforge.net>
Homepage: http://www.gnome.org/
--- NEW FILE: glibwww.info ---
Package: glibwww
Version: 0.2
Revision: 14
Source: gnome
Source-MD5: 3f20f0e7b01acb8dc81502e088cd9389
BuildDependsOnly: True
BuildDepends: audiofile, esound, glib, gtk+ (>= 1.2.10-20), libjpeg, libtiff,
netpbm, orbit-dev (>= 0.5.17-15), imlib (>= 1.9.14-14), gnome-libs-dev (>=
1.4.2-19), libwww, gettext-dev, gettext-bin, gettext-tools
Depends: %N-shlibs (= %v-%r)
UpdateLibtool: true
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -lintl
SplitOff: <<
Package: %N-shlibs
Depends: gnome-libs (>= 1.4.2-19), libwww
Replaces: %N (<= 0.2-3)
Files: lib/libglibwww.*.dylib
Shlibs: %p/lib/libglibwww.1.dylib 2.0.0 %n (>= 0.2-4)
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Set of register/unregister functions
License: GPL
Maintainer: None <fink-devel@lists.sourceforge.net>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: http://www.gnome.org/
--- NEW FILE: libglade.patch ---
diff -Naur libglade-0.17.old/doc/Makefile.in libglade-0.17.new/doc/Makefile.in
--- libglade-0.17.old/doc/Makefile.in Fri Sep 7 12:14:11 2001
+++ libglade-0.17.new/doc/Makefile.in Sat Mar 2 21:09:50 2002
@@ -351,14 +351,14 @@
if test "$$installfiles" = '$(srcdir)/html/*.html'; \
then echo '-- Nothing to install' ; \
else \
+ echo '-- Fixing Crossreferences' ; \
+ gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html
--html-dir=$(HTML_DIR); \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \
- echo '-- Fixing Crossreferences' ; \
- gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) || true;
\
fi)
uninstall-local:
--- glibwww-0.2-14.info DELETED ---
--- NEW FILE: libglade.info ---
Package: libglade
Version: 0.17
Revision: 13
Source: gnome
Source-MD5: 38b2e2cfd813783fe157617813bfe3b3
Patch: %n.patch
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: True
BuildDepends: gtk-doc (>= 0.9-4), libjpeg, libtiff, netpbm, audiofile, esound,
glib, gtk+ (>= 1.2.10-20), orbit-dev (>= 0.5.17-15), giflib, imlib (>=
1.9.14-14), gnome-libs-dev (>= 1.4.2-19), gettext-dev, gettext-bin,
gettext-tools, libiconv-dev
DescPackaging: <<
Uses pkgconfig.
Any package which BuildDepends on this one must also BuildDepend on:
glib, gnome-libs-dev, gtk+
Originally packaged by Masanori Sekino.
<<
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3
ConfigureParams: --disable-static
CompileScript: <<
./configure %c
touch doc/scan-build.stamp
make
<<
SplitOff: <<
Package: %N-shlibs
Depends: gnome-libs (>= 1.4.2-19), libxml
Replaces: %N (<= 0.17-2)
Files: lib/libglade.*.dylib lib/libglade-gnome.*.dylib
Shlibs: <<
%p/lib/libglade-gnome.0.dylib 5.0.0 %n (>= 0.17-3)
%p/lib/libglade.0.dylib 5.0.0 %n (>= 0.17-3)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Library to load .glade files at runtime
DescDetail: <<
This library allows you to load user interfaces in your program, which are
stored externally. This allows alteration of the interface without
recompilation of the program.
The interfaces can also be edited with GLADE.
<<
License: LGPL/GFDL
Maintainer: None <fink-devel@lists.sourceforge.net>
Homepage: http://www.gnome.org/
--- scrollkeeper-0.3.12-2.info DELETED ---
--- libglade-0.17-13.info DELETED ---
--- scrollkeeper-0.3.12-2.patch DELETED ---
--- NEW FILE: bonobo.patch ---
diff -Naur bonobo-1.0.20.old/Makefile.in bonobo-1.0.20.new/Makefile.in
--- bonobo-1.0.20.old/Makefile.in Fri Apr 12 00:17:56 2002
+++ bonobo-1.0.20.new/Makefile.in Sun May 19 14:54:54 2002
@@ -166,7 +166,7 @@
NULL =
-SUBDIRS = macros intl idl
libefs bonobo storage-modules
monikers components samples
gshell tests doc po
+SUBDIRS = macros intl idl
libefs bonobo storage-modules
monikers components samples
gshell doc po
confexecdir = $(libdir)
diff -Naur bonobo-1.0.20.old/configure bonobo-1.0.20.new/configure
--- bonobo-1.0.20.old/configure Fri Apr 12 00:10:55 2002
+++ bonobo-1.0.20.new/configure Wed Jun 12 06:03:38 2002
@@ -5533,11 +5533,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-flat_namespace -undefined suppress'
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts
-install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 &&
echo $verstring)'
+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test
.$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
diff -Naur bonobo-1.0.20.old/libefs/configure bonobo-1.0.20.new/libefs/configure
--- bonobo-1.0.20.old/libefs/configure Fri Apr 12 00:11:03 2002
+++ bonobo-1.0.20.new/libefs/configure Tue Jun 4 21:10:28 2002
@@ -4553,11 +4553,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-flat_namespace -undefined suppress'
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts
-install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 &&
echo $verstring)'
+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts
-install_name $rpath/$soname $tmp_verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
diff -Naur bonobo-1.0.20.old/ltmain.sh bonobo-1.0.20.new/ltmain.sh
--- bonobo-1.0.20.old/ltmain.sh Fri Apr 12 00:10:55 2002
+++ bonobo-1.0.20.new/ltmain.sh Thu May 30 21:39:32 2002
@@ -1727,7 +1727,7 @@
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ # need_relink=yes
fi
if test -n "$old_archive_from_expsyms_cmds"; then
@@ -2888,6 +2888,11 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
eval cmds=\"$archive_cmds\"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
diff -Naur bonobo-1.0.20.old/storage-modules/bonobo-storage-fs.c
bonobo-1.0.20.new/storage-modules/bonobo-storage-fs.c
--- bonobo-1.0.20.old/storage-modules/bonobo-storage-fs.c Tue Sep 25
01:21:33 2001
+++ bonobo-1.0.20.new/storage-modules/bonobo-storage-fs.c Sun May 19
14:55:09 2002
@@ -329,11 +329,15 @@
CORBA_Environment *ev)
{
BonoboStorageFS *storage_fs = BONOBO_STORAGE_FS (storage);
+ struct stat st;
char *full;
full = g_concat_dir_and_file (storage_fs->path, path);
- if (remove (full) == -1) {
+ /* remove() on Mac OS X(10.0.4) does not remove a directory. */
+ /* if (remove (full) == -1) { */
+ stat (full, &st);
+ if ((S_ISDIR(st.st_mode) ? rmdir (full) : unlink (full)) == -1) {
if (errno == ENOENT)
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
--- libglade-0.17-13.patch DELETED ---
--- NEW FILE: bonobo.info ---
Package: bonobo
Version: 1.0.20
Revision: 13
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: c4c586e2f8670a0adf6116f9b7e6e496
Depends: %N-shlibs (= %v-%r)
BuildDepends: gdk-pixbuf (>= 0.18.0-12), x11, libjpeg, libtiff, netpbm,
audiofile, esound, glib, gtk+ (>= 1.2.10-20), giflib, imlib (>= 1.9.14-14),
gnome-libs-dev (>= 1.4.2-19), gnome-print-dev (>= 0.36-11), oaf-dev (>=
0.6.10-22), libxml, popt, libglade (>= 0.17-13), orbit-dev (>= 0.5.17-15),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev
SetCPPFLAGS: -no-cpp-precomp -DORBIT_DEF_CORBA_sequence_CORBA_string
-DTC_DEF_TC_CORBA_sequence_CORBA_string
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
Patch: %n.patch
UpdatePoMakefile: true
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Depends: gnome-libs (>= 1.4.2-19), oaf (>= 0.6.10-22), gnome-print (>=
0.36-11), libxml (>= 1.8.15), orbit (>= 0.5.17-15), gettext (>= 0.10.40-2)
Replaces: %N (<= 1.0.19-1)
Files: lib/libbonobo*.*.dylib lib/libefs.*.dylib
Shlibs: <<
%p/lib/libbonobo-print.2.dylib 3.0.0 %n (>= 1.0.20-2)
%p/lib/libbonobo.2.dylib 3.0.0 %n (>= 1.0.20-2)
%p/lib/libbonobox.2.dylib 3.0.0 %n (>= 1.0.20-2)
%p/lib/libefs.1.dylib 2.0.0 %n (>= 1.0.20-2)
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 1.0.20-3)
Files: bin/libefs-config include lib/lib*.dylib lib/*.a lib/*.la lib/*.sh
lib/pkgconfig share/idl
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
Description: Library for compound documents in GNOME
DescDetail: <<
Bonobo is a library that provides the necessary framework for GNOME
applications to deal with compound documents, i.e. those with a
spreadsheet and graphic embedded in a word-processing document.
<<
DescPort: <<
This patch does:
- Add -module libtool flag to storage-modules.
- Workaround of remove(3) bug.
- Enable shared libraries on Mac OS X 10.1.
<<
License: GPL/LGPL
Maintainer: None <fink-devel@lists.sourceforge.net>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: http://www.gnome.org/
--- bonobo-1.0.20-13.info DELETED ---
--- bonobo-1.0.20-13.patch DELETED ---
--- NEW FILE: scrollkeeper.patch ---
diff -Naur scrollkeeper-0.3.12.old/Makefile.in
scrollkeeper-0.3.12.new/Makefile.in
--- scrollkeeper-0.3.12.old/Makefile.in Thu Jan 23 15:11:56 2003
+++ scrollkeeper-0.3.12.new/Makefile.in Thu Feb 27 02:40:53 2003
@@ -145,7 +145,7 @@
EXTRA_DIST = scrollkeeper.spec.in COPYING-DOCS TODO intltool-extract.in
intltool-merge.in intltool-update.in scrollkeeper-spec.txt
-scrollkeeperdocdir = $(datadir)/doc/scrollkeeper-$(VERSION)
+scrollkeeperdocdir = $(datadir)/doc/scrollkeeper
scrollkeeperdoc_DATA = COPYING-DOCS
scrollkeeper_localstate_dir = $(localstatedir)/lib/scrollkeeper
subdir = .
@@ -539,10 +539,10 @@
rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir)
$(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir)
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
- PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
- echo "`date +\"%b %d %X\"` Installing ScrollKeeper
`scrollkeeper-config --version`..." >>
$(DESTDIR)$(localstatedir)/log/scrollkeeper.log
- PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
- $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p
$(DESTDIR)$(scrollkeeper_localstate_dir)
+# PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
+# echo "`date +\"%b %d %X\"` Installing ScrollKeeper
`scrollkeeper-config --version`..." >>
$(DESTDIR)$(localstatedir)/log/scrollkeeper.log
+# PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
+# $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p
$(DESTDIR)$(scrollkeeper_localstate_dir)
# Remove generated files
uninstall-local:
diff -Naur scrollkeeper-0.3.12.old/cl/src/Makefile.in
scrollkeeper-0.3.12.new/cl/src/Makefile.in
--- scrollkeeper-0.3.12.old/cl/src/Makefile.in Thu Jan 23 15:11:58 2003
+++ scrollkeeper-0.3.12.new/cl/src/Makefile.in Thu Feb 27 02:39:46 2003
@@ -148,9 +148,9 @@
LDADD = \
+ $(top_builddir)/libs/libscrollkeeper.la \
$(XML_LIBS) \
- $(XSLT_LIBS) \
- $(top_builddir)/libs/libscrollkeeper.la
+ $(XSLT_LIBS)
bin_PROGRAMS = scrollkeeper-preinstall scrollkeeper-update
scrollkeeper-install scrollkeeper-uninstall scrollkeeper-get-cl
diff -Naur scrollkeeper-0.3.12.old/configure scrollkeeper-0.3.12.new/configure
--- scrollkeeper-0.3.12.old/configure Thu Jan 23 15:12:13 2003
+++ scrollkeeper-0.3.12.new/configure Thu Feb 27 02:39:46 2003
@@ -5376,7 +5376,7 @@
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
+ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
@@ -8795,7 +8795,7 @@
*)
echo "$as_me:$LINENO: checking for docbook-dtd412-xml" >&5
echo $ECHO_N "checking for docbook-dtd412-xml... $ECHO_C" >&6
- if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" |
grep "No entry" >/dev/null ; then
+ if xmlcatalog ${prefix}/etc/xml/catalog "-//OASIS//DTD DocBook XML
V4.1.2//EN" | grep "No entry" >/dev/null ; then
echo "* ERROR * "
echo " "
echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make
sure that you have the docbook-dtd412-xml package installed. If it is
installed, the package probably did not register the DTD in the catalog
properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more
information."
diff -Naur scrollkeeper-0.3.12.old/extract/dtds/Makefile.in
scrollkeeper-0.3.12.new/extract/dtds/Makefile.in
--- scrollkeeper-0.3.12.old/extract/dtds/Makefile.in Thu Jan 23 15:12:02 2003
+++ scrollkeeper-0.3.12.new/extract/dtds/Makefile.in Thu Feb 27 02:39:46 2003
@@ -335,9 +335,9 @@
# ScrollKeeper OMF Variation DTD V1.0
install-data-hook:
- -/usr/bin/xmlcatalog --noout --add "public" \
- "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
- "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
+# -/usr/bin/xmlcatalog --noout --add "public" \
+# "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+# "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
#
# Unregister the DTD(s) in the system XML Catalog
diff -Naur scrollkeeper-0.3.12.old/extract/src/Makefile.in
scrollkeeper-0.3.12.new/extract/src/Makefile.in
--- scrollkeeper-0.3.12.old/extract/src/Makefile.in Thu Jan 23 15:12:04 2003
+++ scrollkeeper-0.3.12.new/extract/src/Makefile.in Thu Feb 27 02:39:46 2003
@@ -148,9 +148,9 @@
LDADD = \
+ $(top_builddir)/libs/libscrollkeeper.la \
$(XML_LIBS) \
- $(XSLT_LIBS) \
- $(top_builddir)/libs/libscrollkeeper.la
+ $(XSLT_LIBS)
scrollkeeper_extract_SOURCES = \
diff -Naur scrollkeeper-0.3.12.old/libs/database.c
scrollkeeper-0.3.12.new/libs/database.c
--- scrollkeeper-0.3.12.old/libs/database.c Thu Jan 23 15:10:57 2003
+++ scrollkeeper-0.3.12.new/libs/database.c Thu Feb 27 02:39:46 2003
@@ -17,6 +17,7 @@
*/
#include <config.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
@@ -27,7 +28,7 @@
#include <dirent.h>
#include <scrollkeeper.h>
-#define PATHLEN 256
+#define PATHLEN PATH_MAX
/*
diff -Naur scrollkeeper-0.3.12.old/libs/i18n.c
scrollkeeper-0.3.12.new/libs/i18n.c
--- scrollkeeper-0.3.12.old/libs/i18n.c Thu Jan 23 15:10:57 2003
+++ scrollkeeper-0.3.12.new/libs/i18n.c Thu Feb 27 02:39:46 2003
@@ -22,6 +22,25 @@
#include <string.h>
#include <locale.h>
+static void*
+strndup (const char *src, size_t n)
+{
+ size_t i;
+ char *dst;
+
+ if (src == NULL)
+ return NULL;
+
+ dst = (char*) malloc (n + 1);
+ if (dst != NULL) {
+ for (i = 0; i < n && src[i]; i++)
+ dst[i] = src[i];
+ dst[i] = '\0';
+ }
+
+ return dst;
+}
+
/* Mask components used in locale spec. Ordering is from least significant to
* most significant.
*/
@@ -169,7 +188,7 @@
lang = getenv("LANGUAGE");
if (lang == NULL || lang[0] == '\0') {
- lang = setlocale(LC_MESSAGES, NULL);
+ lang = setlocale(LC_ALL, NULL);
}
if (lang == NULL || lang[0] == '\0') {
diff -Naur scrollkeeper-0.3.12.old/libs/install.c
scrollkeeper-0.3.12.new/libs/install.c
--- scrollkeeper-0.3.12.old/libs/install.c Thu Jan 23 15:10:57 2003
+++ scrollkeeper-0.3.12.new/libs/install.c Thu Feb 27 02:39:46 2003
@@ -19,6 +19,7 @@
#include <config.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <locale.h>
@@ -32,7 +33,7 @@
#define _(String) gettext (String)
#define SEP "|"
-#define PATHLEN 256
+#define PATHLEN PATH_MAX
#ifdef SOLARIS
/*extern char *strtok_r(char *, const char *, char **);*/
diff -Naur scrollkeeper-0.3.12.old/libs/scrollkeeper.h.in
scrollkeeper-0.3.12.new/libs/scrollkeeper.h.in
--- scrollkeeper-0.3.12.old/libs/scrollkeeper.h.in Thu Jan 23 15:10:57 2003
+++ scrollkeeper-0.3.12.new/libs/scrollkeeper.h.in Thu Feb 27 02:39:46 2003
@@ -21,6 +21,7 @@
#include <libxml/tree.h>
#include <sys/types.h>
+#include <limits.h>
#define _(String) gettext (String)
@@ -29,11 +30,11 @@
* Paths
*
*/
-#define SCROLLKEEPERLOCALEDIR "/usr/share/locale"
+#define SCROLLKEEPERLOCALEDIR "@prefix@/share/locale"
#define SCROLLKEEPERLOGFILE "@localstatedir@/log/scrollkeeper.log"
#define SCROLLKEEPERLOGFILE_ROT "@localstatedir@/log/scrollkeeper.log.1"
#define SCROLLKEEPER_OMF_DTD
"@prefix@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
-#define PATHLEN 256
+#define PATHLEN PATH_MAX
/*
*
diff -Naur scrollkeeper-0.3.12.old/libs/uninstall.c
scrollkeeper-0.3.12.new/libs/uninstall.c
--- scrollkeeper-0.3.12.old/libs/uninstall.c Thu Jan 23 15:10:57 2003
+++ scrollkeeper-0.3.12.new/libs/uninstall.c Thu Feb 27 02:39:46 2003
@@ -17,6 +17,7 @@
*/
#include <config.h>
+#include <limits.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <stdlib.h>
@@ -29,7 +30,7 @@
#define _(String) gettext (String)
-#define PATHLEN 256
+#define PATHLEN PATH_MAX
struct IdTab {
int id;
diff -Naur scrollkeeper-0.3.12.old/ltmain.sh scrollkeeper-0.3.12.new/ltmain.sh
--- scrollkeeper-0.3.12.old/ltmain.sh Thu Jan 23 15:11:19 2003
+++ scrollkeeper-0.3.12.new/ltmain.sh Thu Feb 27 02:39:46 2003
@@ -2952,6 +2952,11 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ if test "x$verstring" = "x0.0"; then
+ tmp_verstring=
+ else
+ tmp_verstring="$verstring"
+ fi
eval cmds=\"$archive_cmds\"
fi
save_ifs="$IFS"; IFS='~'
diff -Naur scrollkeeper-0.3.12.old/scrollkeeper.xmlcatalog
scrollkeeper-0.3.12.new/scrollkeeper.xmlcatalog
--- scrollkeeper-0.3.12.old/scrollkeeper.xmlcatalog Thu Jan 1 09:00:00 1970
+++ scrollkeeper-0.3.12.new/scrollkeeper.xmlcatalog Thu Feb 27 02:39:46 2003
@@ -0,0 +1,3 @@
+"public" \
+ "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ "file://@PREFIX@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
