Update of /cvsroot/fink/experimental/msek/gnome2/compat
In directory usw-pr-cvs1:/tmp/cvs-serv24678
Added Files:
gnome-applets-1.4.0.5-3.info gnome-applets-1.4.0.5-3.patch
gnome-core-1.4.0.8-2.info gnome-core-1.4.0.8-2.patch
gnome-pim-1.4.0-2.info gnome-pim-1.4.0-2.patch
gnome-python-1.4.1-8.info gnome-python-1.4.1-8.patch
gnome-utils-1.4.1.2-3.info gnome-utils-1.4.1.2-3.patch
gnomeicu-0.98.2-2.info guppi-0.40.2-2.info
guppi-0.40.2-2.patch guppi-0.40.2-4.info guppi-0.40.2-4.patch
guppi16-0.40.3-2.info guppi16-0.40.3-2.patch
libxpg4-20010605-18.info libxpg4-20010605-18.patch
nautilus-1.0.6-3.info nautilus-1.0.6-3.patch
sawfish-1.0.1-2.info sawfish-1.0.1-2.patch xchat-1.8.9-2.info
xchat-1.8.9-2.patch xmms-1.2.7-2.info xmms-1.2.7-2.patch
Log Message:
needs modification to co-exists with GNOME2.
--- NEW FILE: gnome-applets-1.4.0.5-3.info ---
Package: gnome-applets
Version: 1.4.0.5
Revision: 3
Source: mirror:gnome:stable/sources/%n/%n-%v.tar.bz2
Depends: gnome-core-shlibs, libghttp-shlibs, libgtop-shlibs, gdk-pixbuf-shlibs,
gettext (>= 0.10.40-2)
BuildDepends: gnome-core-dev, libghttp, libgtop, gdk-pixbuf, gal19, freetype2,
libjpeg, libpng, libtiff, netpbm, audiofile, db3, esound, glib, gtk+, orbit, readline,
giflib, imlib, bonobo-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, libgtop-dev, oaf-dev, guile-dev, libwww, libxml, popt,
libglade, gnome-vfs-dev | gnome-vfs-ssl-dev, scrollkeeper
Patch: %f.patch
UpdatePoMakefile: true
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --mandir=%p/share/man
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
Description: Various applets for GNOME panel
DescDetail: <<
GNOME (GNU Network Object Model Environment) is a user-friendly
set of applications and desktop tools to be used in conjunction with a
window manager for the X Window System. GNOME is similar in purpose and
scope to CDE and KDE, but GNOME is based completely on Open Source
software. The gnome-applets package provides Panel applets which
enhance your GNOME experience.
You should install the gnome-applets package if you would like embed small
utilities in the GNOME panel.
<<
License: GPL/GFDL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gnome-applets-1.4.0.5-3.patch ---
diff -Naur gnome-applets-1.4.0.5.old/gkb-new/preset.c
gnome-applets-1.4.0.5.new/gkb-new/preset.c
--- gnome-applets-1.4.0.5.old/gkb-new/preset.c Fri Oct 26 18:12:16 2001
+++ gnome-applets-1.4.0.5.new/gkb-new/preset.c Sat Mar 2 23:38:17 2002
@@ -29,6 +29,7 @@
* USA
*/
+#include <sys/types.h>
#include <dirent.h>
#include "gkb.h"
diff -Naur gnome-applets-1.4.0.5.old/jbc/jbc-applet.c
gnome-applets-1.4.0.5.new/jbc/jbc-applet.c
--- gnome-applets-1.4.0.5.old/jbc/jbc-applet.c Fri Oct 26 18:11:16 2001
+++ gnome-applets-1.4.0.5.new/jbc/jbc-applet.c Sat Mar 2 23:38:17 2002
@@ -74,7 +74,11 @@
do_flicker ()
{
thetime = time (NULL);
+#ifdef HAVE_LOCALTIME_R
localtime_r (&thetime, &atime);
+#else
+ memcpy (&atime, localtime (&thetime), sizeof (struct tm));
+#endif
d[0] = atime.tm_hour / 10;
d[1] = atime.tm_hour % 10;
diff -Naur gnome-applets-1.4.0.5.old/omf-install/Makefile.in
gnome-applets-1.4.0.5.new/omf-install/Makefile.in
--- gnome-applets-1.4.0.5.old/omf-install/Makefile.in Sun Feb 3 09:50:53 2002
+++ gnome-applets-1.4.0.5.new/omf-install/Makefile.in Sat Mar 2 23:38:17 2002
@@ -296,7 +296,7 @@
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+# -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
uninstall-local:
-for file in $(srcdir)/*.omf; do \
--- NEW FILE: gnome-core-1.4.0.8-2.info ---
Package: gnome-core
Version: 1.4.0.8
Revision: 2
Source: mirror:gnome:stable/sources/%n/%n-%v.tar.bz2
Depends: %N-shlibs (= %v-%r)
Conflicts: gnome-desktop, gnome-session, gnome-terminal, gnome-panel
Replaces: gnome-desktop, gnome-session, gnome-terminal, gnome-panel
BuildDepends: gal19, freetype2, audiofile, db3, esound, glib, gtk+, libjpeg, libpng,
libtiff, netpbm, orbit, readline, imlib, bonobo-dev, control-center-dev, gconf-dev,
glibwww, gnome-libs-dev, gnome-print-dev, gtkhtml-dev, oaf-dev, guile-dev, libwww,
libxml, popt, libglade, gnome-vfs-dev | gnome-vfs-ssl-dev
Patch: %f.patch
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --mandir=%p/share/man
InstallScript: <<
make install DESTDIR=%d
mv %i/bin/gnome-session %i/bin/gnome-session-real
echo '#!/bin/sh' >%i/bin/gnome-session
echo 'exec gnome-session-real --no-xshm "$@"' >>%i/bin/gnome-session
chmod 755 %i/bin/gnome-session
mv %i/bin/panel %i/bin/panel-real
echo '#!/bin/sh' >%i/bin/panel
echo 'exec panel-real --no-xshm "$@"' >>%i/bin/panel
chmod 755 %i/bin/panel
<<
SplitOff: <<
Package: %N-shlibs
Depends: gnome-libs (>= 1.4.1.4), gdk-pixbuf (>= 0.16), scrollkeeper, gtkhtml, bzip2
Replaces: %N (<= 1.4.0.6-2)
Files: lib/libpanel_applet.*.dylib lib/libpanel_status.*.dylib
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 1.4.0.6-2)
Files: include lib/libpanel_applet.dylib lib/libpanel_status.dylib
lib/libpanel_applet.*a lib/libpanel_status.*a
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
PostInstScript: scrollkeeper-update
PostRmScript: scrollkeeper-update
Description: Common files for Gnome core apps.
DescPort: <<
It is important to compile the gtk+ package under OS X 10.1.1 to avoid
crashes in some applets.
<<
License: GPL/GFDL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gnome-core-1.4.0.8-2.patch ---
diff -Naur gnome-core-1.4.0.8.old/applets/desk-guide/gwmthumbnail.c
gnome-core-1.4.0.8.new/applets/desk-guide/gwmthumbnail.c
--- gnome-core-1.4.0.8.old/applets/desk-guide/gwmthumbnail.c Fri Oct 26 18:12:47
2001
+++ gnome-core-1.4.0.8.new/applets/desk-guide/gwmthumbnail.c Wed Jun 12 22:45:21
+2002
@@ -29,23 +29,29 @@
/* --- Gdk & GdkPixbuf compat prototypes --- */
+static
GdkImage* gdk_image_get (GdkWindow *window,
gint x,
gint y,
gint width,
gint height);
+static
GdkColormap* gdk_window_get_colormap (GdkWindow *window);
+static
GdkVisual* gdk_window_get_visual (GdkWindow *window);
+static
GdkImage* gdk_image_new_shared_with_pixmap (GdkWindow *window,
gint width,
gint height,
GdkPixmap **pixmap_p);
+static
GdkPixbuf* gdk_pixbuf_from_image (GdkImage *image,
guint x,
guint y,
guint width,
guint height,
GdkColormap *cmap);
+static
void gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
guint dest_x,
guint dest_y,
@@ -537,7 +543,7 @@
#include <sys/shm.h>
#endif /* USE_SHM */
-GdkImage*
+static GdkImage*
gdk_image_new_shared_with_pixmap (GdkWindow *window,
gint width,
gint height,
@@ -617,7 +623,7 @@
/* fixed gdk_image_get(), so we don't crash if we get an X error
*/
-GdkImage*
+static GdkImage*
gdk_image_get (GdkWindow *window,
gint x,
gint y,
@@ -677,7 +683,7 @@
/* instead of bailing on NULL, return the root window's colormap,
* also, guard against XErrors
*/
-GdkColormap*
+static GdkColormap*
gdk_window_get_colormap (GdkWindow *window)
{
GdkWindowPrivate *window_private;
@@ -708,7 +714,7 @@
/* instead of bailing on NULL, return the root window's visual, also
* guard against XErrors
*/
-GdkVisual*
+static GdkVisual*
gdk_window_get_visual (GdkWindow *window)
{
GdkWindowPrivate *window_private;
@@ -876,7 +882,7 @@
x, y, width, height, cmap);
}
-void
+static void
gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
guint dest_x,
guint dest_y,
@@ -909,7 +915,7 @@
cmap);
}
-GdkPixbuf*
+static GdkPixbuf*
gdk_pixbuf_from_image (GdkImage *image,
guint x,
guint y,
diff -Naur gnome-core-1.4.0.8.old/applets/fish/Makefile.in
gnome-core-1.4.0.8.new/applets/fish/Makefile.in
--- gnome-core-1.4.0.8.old/applets/fish/Makefile.in Mon Apr 29 05:58:16 2002
+++ gnome-core-1.4.0.8.new/applets/fish/Makefile.in Wed Jun 12 22:45:21 2002
@@ -236,7 +236,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
LIBS = @LIBS@
-libfish_applet_la_LDFLAGS =
+libfish_applet_la_LDFLAGS = -module
libfish_applet_la_LIBADD =
libfish_applet_la_OBJECTS = fish.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff -Naur gnome-core-1.4.0.8.old/applets/gen_util/Makefile.in
gnome-core-1.4.0.8.new/applets/gen_util/Makefile.in
--- gnome-core-1.4.0.8.old/applets/gen_util/Makefile.in Mon Apr 29 05:58:20 2002
+++ gnome-core-1.4.0.8.new/applets/gen_util/Makefile.in Wed Jun 12 22:45:21 2002
@@ -246,7 +246,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
LIBS = @LIBS@
-libgen_util_applet_la_LDFLAGS =
+libgen_util_applet_la_LDFLAGS = -module
libgen_util_applet_la_LIBADD =
libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \
printer.lo clock.lo remote-helper.lo
diff -Naur gnome-core-1.4.0.8.old/applets/tasklist/Makefile.in
gnome-core-1.4.0.8.new/applets/tasklist/Makefile.in
--- gnome-core-1.4.0.8.old/applets/tasklist/Makefile.in Mon Apr 29 05:58:35 2002
+++ gnome-core-1.4.0.8.new/applets/tasklist/Makefile.in Wed Jun 12 22:45:21 2002
@@ -259,7 +259,7 @@
tasklist_menu.$(OBJEXT) tasklist_properties.$(OBJEXT) gstc.$(OBJEXT) \
gwmh.$(OBJEXT)
tasklist_applet_DEPENDENCIES = ../../panel/libpanel_applet.la
-tasklist_applet_LDFLAGS =
+tasklist_applet_LDFLAGS = -module
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
diff -Naur gnome-core-1.4.0.8.old/configure gnome-core-1.4.0.8.new/configure
--- gnome-core-1.4.0.8.old/configure Mon Apr 29 05:51:38 2002
+++ gnome-core-1.4.0.8.new/configure Wed Jun 12 22:45:51 2002
@@ -3962,11 +3962,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-undefined suppress -flat_namespace'
# 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 gnome-core-1.4.0.8.old/help-browser/gnome-help-browser.c
gnome-core-1.4.0.8.new/help-browser/gnome-help-browser.c
--- gnome-core-1.4.0.8.old/help-browser/gnome-help-browser.c Fri Oct 26 18:13:26
2001
+++ gnome-core-1.4.0.8.new/help-browser/gnome-help-browser.c Wed Jun 12 22:45:21
+2002
@@ -81,8 +81,8 @@
void destroy_server(HelpWindow win);
/* MANPATH should probably come from somewhere */
-#define DEFAULT_MANPATH GNOME_PREFIX
"/man:/usr/man:/usr/share/man:/usr/local/man:/usr/X11R6/man"
-#define DEFAULT_INFOPATH GNOME_PREFIX
"/info:/usr/info:/usr/share/info:/usr/local/info"
+#define DEFAULT_MANPATH GNOME_PREFIX
+"/share/man:/usr/share/man:/usr/local/share/man:/usr/X11R6/man"
+#define DEFAULT_INFOPATH GNOME_PREFIX
+"/share/info:/usr/share/info:/usr/local/share/info"
/* GHELPPATH probably needs some automatic additions inside toc */
#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \
"/opt/gnome/share/gnome/help:" \
diff -Naur gnome-core-1.4.0.8.old/ltmain.sh gnome-core-1.4.0.8.new/ltmain.sh
--- gnome-core-1.4.0.8.old/ltmain.sh Mon Apr 29 05:51:25 2002
+++ gnome-core-1.4.0.8.new/ltmain.sh Wed Jun 12 22:45:22 2002
@@ -2862,6 +2862,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 gnome-core-1.4.0.8.old/po/Makefile.in.in
gnome-core-1.4.0.8.new/po/Makefile.in.in
--- gnome-core-1.4.0.8.old/po/Makefile.in.in Mon Apr 29 05:51:24 2002
+++ gnome-core-1.4.0.8.new/po/Makefile.in.in Wed Jun 12 22:45:22 2002
@@ -106,7 +106,10 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+ case "$$cat" in \
+ *.gmo) lang=`echo $$cat | sed 's/\.gmo$$//'` ;; \
+ *.mo) lang=`echo $$cat | sed 's/\.mo$$//'` ;; \
+ esac; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
--- NEW FILE: gnome-pim-1.4.0-2.info ---
Package: gnome-pim
Version: 1.4.0
Revision: 2
Depends: gnome-libs, gnome-core-shlibs
BuildDepends: gnome-core-dev, gal19, gdk-pixbuf, freetype2, libjpeg, libpng, libtiff,
netpbm, audiofile, db3, esound, glib, gtk+, orbit, readline, giflib, imlib,
bonobo-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev, gnome-print-dev,
gtkhtml-dev, oaf-dev, guile-dev, libwww, libxml, popt, libglade, gnome-vfs-dev |
gnome-vfs-ssl-dev
Source: gnome
Patch: %f.patch
UpdateLibtool: true
UpdatePoMakefile: true
SetCPPFLAGS: -no-cpp-precomp
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Calendar and address book for GNOME.
DescPort: Add existing test for <malloc.h>.
License: GPL
Homepage: http://www.gnome.org/
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
--- NEW FILE: gnome-pim-1.4.0-2.patch ---
diff -Naur gnome-pim-1.4.0.old/configure gnome-pim-1.4.0.new/configure
--- gnome-pim-1.4.0.old/configure Thu Mar 29 16:53:56 2001
+++ gnome-pim-1.4.0.new/configure Thu Sep 6 20:15:17 2001
@@ -4347,7 +4347,7 @@
PROGRAMS_GNCAL="gncal"
-for ac_hdr in langinfo.h
+for ac_hdr in langinfo.h malloc.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff -Naur gnome-pim-1.4.0.old/configure.in gnome-pim-1.4.0.new/configure.in
--- gnome-pim-1.4.0.old/configure.in Thu Mar 29 16:51:43 2001
+++ gnome-pim-1.4.0.new/configure.in Thu Sep 6 20:15:17 2001
@@ -47,7 +47,7 @@
AC_SUBST(PROGRAMS_GNCAL)
dnl Checks for header files.
-AC_CHECK_HEADERS(langinfo.h)
+AC_CHECK_HEADERS(langinfo.h malloc.h)
dnl This determines, if struct tm containes tm_gmtoff field
dnl or we should use extern long int timezone.
diff -Naur gnome-pim-1.4.0.old/libversit/vcc.y gnome-pim-1.4.0.new/libversit/vcc.y
--- gnome-pim-1.4.0.old/libversit/vcc.y Thu Mar 29 16:51:43 2001
+++ gnome-pim-1.4.0.new/libversit/vcc.y Thu Sep 6 20:16:52 2001
@@ -108,7 +108,9 @@
#include <string.h>
#ifndef __MWERKS__
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#endif
#include <stdio.h>
#include <stdlib.h>
diff -Naur gnome-pim-1.4.0.old/libversit/vobject.c
gnome-pim-1.4.0.new/libversit/vobject.c
--- gnome-pim-1.4.0.old/libversit/vobject.c Sat Jan 1 05:35:35 2000
+++ gnome-pim-1.4.0.new/libversit/vobject.c Thu Sep 6 20:16:10 2001
@@ -43,7 +43,9 @@
*/
#ifndef MWERKS
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#endif
#include "vobject.h"
--- NEW FILE: gnome-python-1.4.1-8.info ---
Package: gnome-python
Version: 1.4.1
Revision: 8
Maintainer: Jeremy Higgs <[EMAIL PROTECTED]>
Source: gnome
Source-MD5: 52f8b5ef4cbdaba3c00c08e28702be69
Depends: pygtk, dlcompat, gnome-core-shlibs, gtkglarea, control-center
BuildDepends: gnome-core-dev, gal19, gdk-pixbuf, freetype2, libjpeg, libpng, libtiff,
netpbm, audiofile, db3, esound, glib, gtk+, orbit, readline, giflib, imlib, gdbm, gmp,
bonobo-dev, control-center-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, oaf-dev, expat, guile-dev, libwww, libxml, popt,
tcltk-dev, libglade, gnome-vfs-dev | gnome-vfs-ssl-dev
Patch: %f.patch
UpdateConfigGuess: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -I%p/include/libcapplet1
InstallScript: <<
make install prefix=%i
install -d -m 755 %i/share/doc/%n/examples
install -m 644 pygnome/examples/* %i/share/doc/%n/examples
<<
PostInstScript: <<
if [ -d %p/lib/python2.1/site-packages ]; then
glibtool --finish %p/lib/python2.1/site-packages
elif [ -d %p/lib/python2.2/site-packages ]; then
glibtool --finish %p/lib/python2.2/site-packages
fi
<<
DocFiles: COPYING NEWS README
#
Description: Python bindings for GNOME
DescDetail: <<
gnome-python provides bindings for the GNOME libraries to use the Python programming
language.
<<
DescPort: <<
Config.guess and config.sub scripts updated.
'no-cpp-precomp' set as a CPPFLAG to compile source properly.
Patch updates configure script for libtool compatibility with
MacOS X/Darwin, and disables building of PyGTK, which is contained in another package.
<<
DescPackaging: <<
PostInstScript runs libtool on the installation directory of the package.
<<
Homepage: http://www.daa.com.au/~james/pygtk/
License: LGPL
--- NEW FILE: gnome-python-1.4.1-8.patch ---
diff -ru gnome-python-1.4.1/Makefile.in gnome-python-1.4.1-patched/Makefile.in
--- gnome-python-1.4.1/Makefile.in Mon Apr 23 03:56:22 2001
+++ gnome-python-1.4.1-patched/Makefile.in Thu Sep 13 13:40:33 2001
@@ -133,7 +133,7 @@
AUTOMAKE_OPTIONS = 1.4a
-SUBDIRS = macros pygtk pygnome
+SUBDIRS = macros pygnome
EXTRA_DIST = gnome-python.spec
subdir = .
diff -ru gnome-python-1.4.1/configure gnome-python-1.4.1-patched/configure
--- gnome-python-1.4.1/configure Mon Apr 23 03:56:24 2001
+++ gnome-python-1.4.1-patched/configure Thu Sep 13 13:41:03 2001
@@ -1855,9 +1855,11 @@
;;
darwin* | rhapsody*)
+ lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared libr\
+ary'
lt_cv_file_magic_cmd='/usr/bin/file -L'
case "$host_os" in
- rhapsody* | darwin1.012)
+ rhapsody* | darwin1.[012])
lt_cv_file_magic_test_file=`echo
/System/Library/Frameworks/System.framework/Versions/*/System | head -1`
;;
*) # Darwin 1.3 on
@@ -3470,8 +3472,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
- 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`'
+ 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)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
@@ -3868,8 +3873,11 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo
so || echo dylib` ${libname}${release}${major}.`test .$module = .yes && echo so ||
echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
- soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo
dylib`'
+ # 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.
+ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo
+so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so ||
+echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo
+dylib)'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
;;
Only in gnome-python-1.4.1-patched/: configure~
--- NEW FILE: gnome-utils-1.4.1.2-3.info ---
Package: gnome-utils
Version: 1.4.1.2
Revision: 3
Source: mirror:gnome:stable/sources/%n/%n-%v.tar.bz2
Depends: guile, libglade, libgtop, gnome-core-shlibs, gettext (>= 0.10.40-2),
gal19-shlibs
BuildDepends: gnome-core-dev, gal19, gdk-pixbuf, freetype2, libjpeg, libpng, libtiff,
netpbm, audiofile, db3, esound, glib, gtk+, orbit, readline, giflib, imlib,
bonobo-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev, gnome-print-dev,
gtkhtml-dev, libgtop-dev, oaf-dev, guile-dev, libwww, libxml, popt, gnome-vfs-dev |
gnome-vfs-ssl-dev
Patch: %f.patch
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --with-messages=/var/log/system.log --mandir=%p/share/man
--disable-static
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog NEWS README THANKS
Description: GNOME utility programs
DescDetail: <<
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
manager for the X Window System. GNOME is similar in purpose and scope
to CDE and KDE, but GNOME is based completely on free software.
This package will install some GNOME utilities, such as the
calculator, search tool, and system information overview tool.
<<
DescPort: <<
gfloppy doesn't work on Darwin.
.
gdialog is disabled because it doesn't compile with Apple's curses
implementation.
<<
License: GPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gnome-utils-1.4.1.2-3.patch ---
diff -Naur gnome-utils-1.4.1.2.old/Makefile.in gnome-utils-1.4.1.2.new/Makefile.in
--- gnome-utils-1.4.1.2.old/Makefile.in Fri Feb 1 13:43:50 2002
+++ gnome-utils-1.4.1.2.new/Makefile.in Sun Mar 3 00:05:21 2002
@@ -206,7 +206,7 @@
@BUILD_GFLOPPY_TRUE@gfloppy = gfloppy
-SUBDIRS = po intl macros idl $(gfloppy) logview gcharmap gcalc gsearchtool
$(gdiskfree) $(stripchart) gdictsrc $(guile_DIRS) mini-utils splash gdialog
meat-grinder exe-handler omf-install
+SUBDIRS = po intl macros idl $(gfloppy) logview gcharmap gcalc gsearchtool
+$(gdiskfree) $(stripchart) gdictsrc $(guile_DIRS) mini-utils splash meat-grinder
+exe-handler omf-install
DIST_SUBDIRS = po intl macros idl gfloppy logview gcharmap gcalc gsearchtool
gdiskfree stripchart gdictsrc gtt cromagnon mini-utils splash gdialog
meat-grinder exe-handler omf-install
diff -Naur gnome-utils-1.4.1.2.old/gtt/util.c gnome-utils-1.4.1.2.new/gtt/util.c
--- gnome-utils-1.4.1.2.old/gtt/util.c Sat Oct 6 03:26:13 2001
+++ gnome-utils-1.4.1.2.new/gtt/util.c Sun Mar 3 00:05:21 2002
@@ -32,7 +32,9 @@
#include <gnome.h>
/* hack alert --xxx fixme -- we need to configure.in for have_langinfo */
+#if !defined(__APPLE__)
#define HAVE_LANGINFO_D_FMT
+#endif
#ifdef HAVE_LANGINFO_D_FMT
#include <langinfo.h>
#endif
diff -Naur gnome-utils-1.4.1.2.old/logview/log_repaint.c
gnome-utils-1.4.1.2.new/logview/log_repaint.c
--- gnome-utils-1.4.1.2.old/logview/log_repaint.c Fri Aug 24 14:19:38 2001
+++ gnome-utils-1.4.1.2.new/logview/log_repaint.c Sun Mar 3 00:05:21 2002
@@ -24,7 +24,9 @@
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include <string.h>
#include <gnome.h>
#include "logview.h"
diff -Naur gnome-utils-1.4.1.2.old/logview/logrtns.c
gnome-utils-1.4.1.2.new/logview/logrtns.c
--- gnome-utils-1.4.1.2.old/logview/logrtns.c Fri Aug 24 14:19:38 2001
+++ gnome-utils-1.4.1.2.new/logview/logrtns.c Sun Mar 3 00:05:21 2002
@@ -821,7 +821,7 @@
if (IsLeapYear (curmark->year - lastyear + thisyear))
curmark->time += 24 * 60 * 60; /* Add one day */
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
curmark->time += correction - tmptm->tm_gmtoff;
#else
curmark->time += correction - timezone;
@@ -847,7 +847,7 @@
if (IsLeapYear (thisyear))
log->lstats.enddate += 24 * 60 * 60; /* Add one day */
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
log->lstats.enddate += correction - tmptm->tm_gmtoff;
#else
log->lstats.enddate += correction - timezone;
@@ -858,7 +858,7 @@
if (IsLeapYear (thisyear - lastyear))
log->lstats.startdate += 24 * 60 * 60; /* Add one day */
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
log->lstats.startdate += correction - tmptm->tm_gmtoff;
#else
log->lstats.startdate += correction - timezone;
diff -Naur gnome-utils-1.4.1.2.old/logview/logrtns.h
gnome-utils-1.4.1.2.new/logview/logrtns.h
--- gnome-utils-1.4.1.2.old/logview/logrtns.h Mon Jun 25 07:44:47 2001
+++ gnome-utils-1.4.1.2.new/logview/logrtns.h Sun Mar 3 00:05:21 2002
@@ -24,7 +24,9 @@
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include <string.h>
#include "logview.h"
diff -Naur gnome-utils-1.4.1.2.old/po/Makefile.in.in
gnome-utils-1.4.1.2.new/po/Makefile.in.in
--- gnome-utils-1.4.1.2.old/po/Makefile.in.in Fri Feb 1 09:55:27 2002
+++ gnome-utils-1.4.1.2.new/po/Makefile.in.in Sun Mar 3 00:05:21 2002
@@ -58,6 +58,7 @@
POTFILES = \
CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo
@@ -106,7 +107,7 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
--- NEW FILE: gnomeicu-0.98.2-2.info ---
Package: gnomeicu
Version: 0.98.2
Revision: 2
Maintainer: Peter O'Gorman <[EMAIL PROTECTED]>
Depends: gnome-libs, imlib, glib-shlibs, dlcompat, esound-shlibs, audiofile-shlibs,
gdk-pixbuf-shlibs, gnome-core-shlibs, orbit-shlibs, gdbm-shlibs,libglade,libxml
BuildDepends: gnet, glib, esound, audiofile, gdk-pixbuf, orbit, gdbm, gal19, freetype2
, libjpeg, libpng, libtiff, netpbm, db3, gtk+, readline, giflib, bonobo-dev,
control-center-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, oaf-dev, guile-dev, libwww, popt, gnome-vfs-dev |
gnome-vfs-ssl-dev
Source: mirror:custom:%n/%n-%v.tar.gz
CustomMirror: <<
nam-US: http://telia.dl.sourceforge.net/sourceforge/
nam-US: http://unc.dl.sourceforge.net/sourceforge/
eur-BE: http://belnet.dl.sourceforge.net/sourceforge/
<<
Patchscript: touch src/malloc.h
Installscript: <<
make DESTDIR=%d install
<<
SetCPPFlags: -no-cpp-precomp
Description: Popular ICQ program
DescPort: <<
Does touch malloc.h to avoid a patch. May not actually work, I don't know
due to my NAT.
<<
DocFiles: COPYING README*
Homepage: http://gnomeicu.sourceforge.net
License: GPL
--- NEW FILE: guppi-0.40.2-2.info ---
Package: guppi
Version: 0.40.2
Revision: 2
Description: a GNOME-based framework for graphing and interactive data analysis.
DescDetail: Guppi is a library that can be used to extend other programs.
Your own programs can either link directly to Guppi's shared libraries,
or can embed Guppi plots via Bonobo, GNOME's component architecture.
Source: mirror:gnome:stable/sources/Guppi/Guppi-%v.tar.gz
Patch: %f.patch
Depends: gnome-core, gnome-print, guile, libglade, gnumeric, python, gal19-shlibs
BuildDepends: gal19, gdk-pixbuf, freetype2, libjpeg, libpng, libtiff, netpbm,
audiofile, db3, esound, glib, gtk+, orbit, readline, giflib, imlib, gdbm, gmp,
bonobo-dev, control-center-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, oaf-dev, expat, guile-dev, libole2, libwww, libxml,
popt, tcltk-dev, gnome-vfs-dev | gnome-vfs-ssl-dev
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -flat_namespace
ConfigureParams: --mandir='${prefix}/share/man' --infodir='${prefix}/share/info'
--enable-gnumeric
License: GPL
DescPort: -flat_namespace LDFLAG needed to link indirectly referenced symbols.
Patch to configure to get flags right for dynamic linking.
Docfiles: README TODO INSTALL NEWS COPYING
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/guppi
--- NEW FILE: guppi-0.40.2-2.patch ---
--- Guppi-0.40.2/configure.orig Mon Dec 10 06:36:52 2001
+++ Guppi-0.40.2/configure Mon Dec 10 06:37:03 2001
@@ -3872,7 +3872,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 .$module = .yes && echo -bundle || echo -dynamiclib)
+-flat_namespace -undefined suppress -o $lib $libobjs $deplibs$linker_flags
+-install_name $rpath/$soname $verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
--- NEW FILE: guppi-0.40.2-4.info ---
Package: guppi
Version: 0.40.2
Revision: 4
Description: a GNOME-based framework for graphing and interactive data analysis.
DescDetail: Guppi is a library that can be used to extend other programs.
Your own programs can either link directly to Guppi's shared libraries,
or can embed Guppi plots via Bonobo, GNOME's component architecture.
Source: mirror:gnome:stable/sources/Guppi/Guppi-%v.tar.gz
Patch: %f.patch
Depends: %N-shlibs (= %v-%r)
BuildDepends: gal19, gdk-pixbuf, freetype2, libjpeg, libpng, libtiff, netpbm,
audiofile, db3, esound, glib, gtk+, orbit, readline, giflib, imlib, gdbm, gmp,
bonobo-dev, control-center-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, oaf-dev, expat, guile-dev, libole2, libwww, libxml,
popt, tcltk-dev
Conflicts: guppi16
Replaces: guppi16
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -flat_namespace
ConfigureParams: --mandir='${prefix}/share/man' --infodir='${prefix}/share/info'
--enable-gnumeric
License: GPL
DescPort: -flat_namespace LDFLAG needed to link indirectly referenced symbols.
Patch to configure to get flags right for dynamic linking.
SplitOff: <<
Package: %N-shlibs
Depends: gnome-core-shlibs, gnome-print, guile, libglade, gnumeric, python,
gal19-shlibs
Replaces: %N (<= 0.40.2-2)
Files: lib/guppi/plug-ins/0.40.2 lib/libguppi.*.dylib lib/libguppitank.*.dylib
Docfiles: README TODO INSTALL NEWS COPYING
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Conflicts: guppi16-dev
Replaces: %N (<= 0.40.2-2), guppi16-dev
Files: include lib/libguppi.dylib lib/libguppitank.dylib lib/*.la lib/*.sh
share/aclocal
Docfiles: README TODO INSTALL NEWS COPYING
<<
Docfiles: README TODO INSTALL NEWS COPYING
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/guppi
--- NEW FILE: guppi-0.40.2-4.patch ---
--- Guppi-0.40.2/configure.orig Mon Dec 10 06:36:52 2001
+++ Guppi-0.40.2/configure Mon Dec 10 06:37:03 2001
@@ -3872,7 +3872,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 .$module = .yes && echo -bundle || echo -dynamiclib)
+-flat_namespace -undefined suppress -o $lib $libobjs $deplibs$linker_flags
+-install_name $rpath/$soname $verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
--- NEW FILE: guppi16-0.40.3-2.info ---
Package: guppi16
Version: 0.40.3
Revision: 2
Description: a GNOME-based framework for graphing and interactive data analysis.
DescDetail: Guppi is a library that can be used to extend other programs.
Your own programs can either link directly to Guppi's shared libraries,
or can embed Guppi plots via Bonobo, GNOME's component architecture.
Source: mirror:gnome:stable/sources/Guppi/Guppi-%v.tar.gz
Patch: %f.patch
Depends: %N-shlibs (= %v-%r)
BuildDepends: gal19, gdk-pixbuf, freetype2, libjpeg, libpng, libtiff, netpbm,
audiofile, db3, esound, glib, gtk+, orbit, readline, giflib, imlib, gdbm, gmp,
bonobo-dev, control-center-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, oaf-dev, expat, guile-dev, libole2, libwww, libxml,
popt, tcltk-dev
Conflicts: guppi
Replaces: guppi
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -flat_namespace
ConfigureParams: --mandir='${prefix}/share/man' --infodir='${prefix}/share/info'
--enable-gnumeric
SplitOff: <<
Package: %N-shlibs
Depends: gnome-core-shlibs, gnome-print, guile, libglade, gnumeric (>= 1.0.3-1),
python, gal19-shlibs
Files: lib/guppi/plug-ins/%v lib/libguppi.*.dylib lib/libguppitank.*.dylib
Docfiles: README TODO INSTALL NEWS COPYING
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Conflicts: guppi-dev
Replaces: guppi-dev
Files: include lib/libguppi.dylib lib/libguppitank.dylib lib/*.la lib/*.sh
share/aclocal
Docfiles: README TODO INSTALL NEWS COPYING
<<
Docfiles: README TODO INSTALL NEWS COPYING
License: GPL
DescPort: -flat_namespace LDFLAG needed to link indirectly referenced symbols.
Patch to configure to get flags right for dynamic linking.
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/guppi
--- NEW FILE: guppi16-0.40.3-2.patch ---
diff -ru Guppi-0.40.3/configure Guppi-0.40.3-patched/configure
--- Guppi-0.40.3/configure 2002-01-21 23:15:34.000000000 -0500
+++ Guppi-0.40.3-patched/configure 2002-05-15 18:12:26.000000000 -0400
@@ -4784,7 +4784,7 @@
;;
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.
--- NEW FILE: libxpg4-20010605-18.info ---
Package: libxpg4
Version: 20010605
Revision: 18
Source: mirror:custom:%n-darwin-%v.tar.gz
Source2: mirror:custom:localedata.tar.gz
CustomMirror: <<
Primary: http://www.ab.wakwak.com/~tino/darwin/
Secondary: http://hp.vector.co.jp/authors/VA008857/macosx/fink/mirror/libxpg4/
<<
SourceDirectory: libxpg4
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%f.patch| patch -p1
<<
CompileScript: <<
make CFLAGS='-DXPG4 -D__NETBSD_SYSCALLS -O3 -fno-common -no-cpp-precomp'
make -C fink
<<
InstallScript: <<
install -d -m 755 %i/lib/xpg4 %i/bin/libxpg4 %i/share %i/etc/profile.d
make -C fink install DESTDIR=%d
(cd %i/bin/libxpg4 && ln -sf ../bash.real sh)
install -c -m 644 libxpg4.dylib %i/lib/xpg4
mv ../locale %i/share/locale
<<
PreInstScript: <<
if [ upgrade = "$1" -a -d %p/bin/xpg4 ]; then
rm -rf %p/bin/xpg4
fi
if [ install = "$1" -o upgrade = "$1" ]; then
for f in bash cvs cvs-proxy galeon gnome-panel gnuplotx hugs mplayer \
octave rbash scigraphica xchat; do
dpkg-divert --package %n --add --rename \
--divert %p/bin/$f.real %p/bin/$f
done
fi
<<
PreRmScript: <<
if [ "$1" != 'upgrade' ]; then
echo "**********WARNING**********"
echo "If you uninstall libxpg4, you should restart your terminal and"
echo "X Window System as soon as possible."
echo "After you uninstall this package, you can't launch any program"
echo "without removing libxpg4.dylib from DYLD_INSERT_LIBRARIES"
echo "environment variable. So, this package should be uninstalled"
echo "solely."
done=no
while [ "$done" != "yes" ]; do
echo -n 'Are you sure? [y/N] '
read answer
case "$answer" in
'Y'|'y') done=yes;;
'N'|'n'|'') exit 1;;
*) ;;
esac
done
fi
<<
PostRmScript: <<
if [ remove = "$1" ]; then
for f in bash cvs cvs-proxy galeon gnome-panel gnuplotx hugs mplayer \
octave rbash scigraphica xchat; do
dpkg-divert --package %n --remove --rename \
--divert %p/bin/$f.real %p/bin/$f
done
fi
<<
Description: Locale-enabling preload library
DescDetail: <<
This is a port of FreeBSD 3.x's libxpg4, posted to darwin-development ML
(see http://www.darwinfo.org/devlist.php3?number=9143).
To use this, set DYLD_INSERT_LIBRARIES environment variable like this:
setenv DYLD_INSERT_LIBRARIES /sw/lib/xpg4/libxpg4.dylib
If you use init.(sh|csh), this will be done automatically.
They also set DYLD_FORCE_FLAT_NAMESPACE automatically. On Mac OS X 10.1,
this is required DYLD_INSERT_LIBRARIES to effect on a two-level namespace
images.
Some programs does not work if DYLD_FORCE_FLAT_NAMESPACE is set. Such
programs are listed in libxpg4.conf and init.(sh|csh) does not set
DYLD_FORCE_FLAT_NAMESPACE for them.
<<
DescPackaging: <<
This library should not be linked with any library or program. So,
library install location is outside of standard library search path.
<<
License: BSD
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
--- NEW FILE: libxpg4-20010605-18.patch ---
diff -Naur libxpg4.old/Makefile libxpg4.new/Makefile
--- libxpg4.old/Makefile Tue Jun 5 18:33:44 2001
+++ libxpg4.new/Makefile Mon May 13 23:47:11 2002
@@ -21,7 +21,7 @@
ranlib /usr/local/lib/${TARGET}.a
${TARGET}.dylib: ${OBJECTS}
- ${CC} -dynamiclib -o $@ ${OBJECTS}
+ ${CC} -dynamiclib -flat_namespace -o $@ ${OBJECTS}
${TARGET}.a: ${OBJECTS}
ar cru $@ ${OBJECTS}
diff -Naur libxpg4.old/fink/Makefile libxpg4.new/fink/Makefile
--- libxpg4.old/fink/Makefile Thu Jan 1 09:00:00 1970
+++ libxpg4.new/fink/Makefile Fri Jun 28 23:42:52 2002
@@ -0,0 +1,40 @@
+WRAPPER = bash cvs cvs-proxy galeon gnome-panel gnuplotx hugs mplayer octave \
+ rbash scigraphica xchat
+PROFILE = libxpg4.sh libxpg4.csh
+CLEAN = $(WRAPPER) stamp-build
+PREFIX = @PREFIX@
+DESTDIR =
+
+CFLAGS = -O3
+
+all: stamp-build
+
+stamp-build: wrapper.c
+ for i in $(WRAPPER); do \
+ if [ $$i = bash ]; then \
+ cc -o $$i -DPROGNAME=\"$(PREFIX)/bin/$$i.real\"
+-DSHNAME=\"$(PREFIX)/bin/libxpg4/sh\" wrapper.c; \
+ elif [ $$i = cvs ]; then \
+ cc -o $$i -DPROGNAME=\"$(PREFIX)/bin/$$i.real\" -DCVSNAME=\"/usr/bin/cvs\"
+wrapper.c; \
+ else \
+ cc -o $$i -DPROGNAME=\"$(PREFIX)/bin/$$i.real\" wrapper.c; \
+ fi; \
+ done
+ touch $@
+
+install: all install-wrapper install-profile
+
+install-wrapper: stamp-build
+ install -d -m 755 $(DESTDIR)$(PREFIX)/bin
+ for i in $(WRAPPER); do \
+ install -c -m 755 $$i $(DESTDIR)$(PREFIX)/bin/; \
+ done
+
+install-profile:
+ install -d -m 755 $(DESTDIR)$(PREFIX)/etc/profile.d
+ for i in $(PROFILE); do \
+ install -c -m 755 $$i $(DESTDIR)$(PREFIX)/etc/profile.d/; \
+ done
+
+clean:
+ rm -rf $(CLEAN)
+
diff -Naur libxpg4.old/fink/libxpg4.csh libxpg4.new/fink/libxpg4.csh
--- libxpg4.old/fink/libxpg4.csh Thu Jan 1 09:00:00 1970
+++ libxpg4.new/fink/libxpg4.csh Mon May 13 23:47:11 2002
@@ -0,0 +1,20 @@
+# libxpg4.csh
+
+# This instructs dyld to load the libxpg4 library before loading
+# any other libraries. This way the functions in the libxpg4 library
+# replace the functions in libSystem.
+
+set libxpg4="@PREFIX@/lib/xpg4/libxpg4.dylib"
+
+if ( -e "$libxpg4" ) then
+ set libpath="$libxpg4"
+ if ( $?DYLD_INSERT_LIBRARIES ) then
+ if ( "$DYLD_INSERT_LIBRARIES" != "") then
+ set libpath=`echo "${libxpg4}:${DYLD_INSERT_LIBRARIES}" | tr
+':' '\n' | sort | uniq | paste -s -d ':' -`
+ endif
+ endif
+
+ setenv DYLD_INSERT_LIBRARIES "$libpath"
+ setenv DYLD_FORCE_FLAT_NAMESPACE 1
+endif
+
diff -Naur libxpg4.old/fink/libxpg4.sh libxpg4.new/fink/libxpg4.sh
--- libxpg4.old/fink/libxpg4.sh Thu Jan 1 09:00:00 1970
+++ libxpg4.new/fink/libxpg4.sh Mon May 13 23:47:11 2002
@@ -0,0 +1,23 @@
+# libxpg4.sh
+
+# This instructs dyld to load the libxpg4 library before loading
+# any other libraries. This way the functions in the libxpg4 library
+# replace the functions in libSystem.
+
+libxpg4="@PREFIX@/lib/xpg4/libxpg4.dylib"
+
+if [ -f "$libxpg4" ]; then
+ if [ -z "$DYLD_INSERT_LIBRARIES" ]; then
+ DYLD_INSERT_LIBRARIES="$libxpg4"
+ else
+ DYLD_INSERT_LIBRARIES=` \
+ echo "$libxpg4:$DYLD_INSERT_LIBRARIES" \
+ | tr ':' '\n' | sort | uniq \
+ | paste -s -d ':' -`
+ fi
+ DYLD_FORCE_FLAT_NAMESPACE=1
+
+ export DYLD_INSERT_LIBRARIES
+ export DYLD_FORCE_FLAT_NAMESPACE
+fi
+
diff -Naur libxpg4.old/fink/wrapper.c libxpg4.new/fink/wrapper.c
--- libxpg4.old/fink/wrapper.c Thu Jan 1 09:00:00 1970
+++ libxpg4.new/fink/wrapper.c Mon May 13 23:51:08 2002
@@ -0,0 +1,58 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef SHNAME
+char *
+get_progname (const char *name)
+{
+ int len;
+
+ len = strlen (name);
+ if (len < 2)
+ return PROGNAME;
+ if (name[len - 2] != 's' || name[len - 1] != 'h')
+ return PROGNAME;
+ if (len > 2 && (name [len - 3] != '/'))
+ return PROGNAME;
+
+ return SHNAME;
+}
+#elif defined(CVSNAME)
+#include <sys/types.h>
+#include <sys/stat.h>
+char *
+get_progname (const char *name)
+{
+ struct stat sb;
+ if (stat(PROGNAME, &sb) == -1)
+ return CVSNAME;
+ return PROGNAME;
+}
+#else
+char *
+get_progname (const char *name)
+{
+ return PROGNAME;
+}
+#endif
+
+int
+main(int argc, char *argv[])
+{
+ char **new_argv;
+
+ new_argv = calloc (argc + 1, sizeof (char*));
+ if (new_argv == NULL)
+ return -1;
+
+ memcpy (new_argv, argv, sizeof (char*) * argc);
+ new_argv[0] = get_progname (argv[0]);
+
+ unsetenv ("DYLD_FORCE_FLAT_NAMESPACE");
+ execv (new_argv[0], new_argv);
+
+ fprintf (stderr, "%s is not installed.\n", argv[0]);
+ exit (1);
+}
+
diff -Naur libxpg4.old/setlocale.c libxpg4.new/setlocale.c
--- libxpg4.old/setlocale.c Tue Jun 5 16:23:41 2001
+++ libxpg4.new/setlocale.c Mon May 13 23:47:11 2002
@@ -51,7 +51,7 @@
#include <locale.h>
#include <rune.h>
#undef _PATH_LOCALE
-#define _PATH_LOCALE "/usr/local/share/locale"
+#define _PATH_LOCALE "@PREFIX@/share/locale"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff -Naur libxpg4.old/setrunelocale.c libxpg4.new/setrunelocale.c
--- libxpg4.old/setrunelocale.c Tue Jun 5 18:30:19 2001
+++ libxpg4.new/setrunelocale.c Mon May 13 23:47:11 2002
@@ -36,7 +36,7 @@
#include <rune.h>
#undef _PATH_LOCALE
-#define _PATH_LOCALE "/usr/local/share/locale"
+#define _PATH_LOCALE "@PREFIX@/share/locale"
#include <errno.h>
#include <limits.h>
#include <string.h>
--- NEW FILE: nautilus-1.0.6-3.info ---
Package: nautilus
Version: 1.0.6
Revision: 3
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
###
Depends: mozilla, bonobo, control-center-shlibs, eel, libghttp, orbit-shlibs (>=
0.5.15)
BuildDepends: librsvg, orbit, orbit-bin, gdk-pixbuf, freetype2, libjpeg, libpng,
libtiff, netpbm, audiofile, db3, esound, glib, gtk+, readline, giflib, imlib,
bonobo-dev, control-center-dev, gconf-dev, gnome-libs-dev, gnome-print-dev, oaf-dev,
guile-dev, libxml, popt, libglade, gnome-vfs-dev | gnome-vfs-ssl-dev
###
Source: gnome
###
Patch: %f.patch
# Change all uses of <libxml/foo.h> to <gnome-xml/foo.h>.
PatchScript: (for ii in `grep -rIl '^#include <libxml/\(.*\)>$' .`; do sed -e
's|^#include <libxml/\(.*\)>$|#include <gnome-xml/\1>|g' $ii > ${ii}.tmp; mv -f
${ii}.tmp $ii; done)
###
ConfigureParams: --mandir=%i/share/man --with-mozilla-include-place=%p/include/mozilla
--with-mozilla-lib-place=%p/lib/mozilla
SetCPPFlags: -no-cpp-precomp -DNULL=0L
###
PostInstScript: scrollkeeper-update
PostRmScript: scrollkeeper-update
DocFiles: README COPYING* AUTHORS NEWS
###
Description: Next-generation GNOME file manager.
DescDetail: <<
Nautilus is an open-source file manager and graphical shell being developed by
Eazel, Inc. and others. It is part of the GNOME project, and its source code can
be found in the GNOME CVS repository. Nautilus is still in the early stages of
development. It will become an integral part of the GNOME desktop environment
when it is finished.
<<
DescPort: <<
- Libtool conveniece library bug fixed.
- Conflicting versions of libxml headers replaced.
- Mozilla pointed out to configure script.
- 'test' directory not built.
- gdk-pixbuf includes, libintl libraries added where needed.
- Unknown use of 'Wl,' flag to cc removed.
- get_mount_list() changed to use getmntinfo instead of /proc/mounts.
- added makefile rule for .oaf.in file, to set the full location of
a component.
- added file system attributes for HFS.
<<
DescUsage: <<
If you are running X rootless, launch Nautilus with '--no-desktop' flag, so it
doesn't take over root window. If you are running an early version of oafd,
try "oaf-slay" before running Nautilus.
Known bugs:
- Web searches crash the mozilla view.
- Opening the "Backgrounds and Emblems" dialog segfaults.
- Not really a bug, but Nautilus knows nothing about resource forks, Mac
applications, bundles, etc. So beware! Certain actions (like moving a file
with a rsource fork to another disk) may damage your data.
<<
ChangeLog: <<
1.0.6-2 :
- Tree view works.
- "Failure to allocate ~2 GB" startup error gone with new version of orbit.
- Help pages display properly.
- scrollkeeper-update performed in Post{Inst|Rm}Scripts.
- sample component no longer built, to save time.
<<
###
License: GPL
Homepage: http://nautilus.eazel.com
--- NEW FILE: nautilus-1.0.6-3.patch ---
diff -Naur nautilus-1.0.6/Makefile.in nautilus-new/Makefile.in
--- nautilus-1.0.6/Makefile.in 2001-11-07 22:54:44.000000000 -0500
+++ nautilus-new/Makefile.in 2002-04-15 17:42:27.000000000 -0400
@@ -226,7 +226,7 @@
@HAVE_APPLETS_TRUE@APPLETS_SUBDIRS = applets
-SUBDIRS = data icons
cut-n-paste-code libnautilus libnautilus-adapter
libnautilus-private helper-utilities
helper-scripts src components
$(APPLETS_SUBDIRS) test user-guide
help po
omf-install $(NULL)
+SUBDIRS = data icons
+cut-n-paste-code libnautilus libnautilus-adapter
+ libnautilus-private helper-utilities
+helper-scripts src components
+ $(APPLETS_SUBDIRS) user-guide help
+ po omf-install
+$(NULL)
EXTRA_DIST = TRADEMARK_NOTICE COPYING.LIB
COPYING-DOCS HACKING
MAINTAINERS
nautilus.spec.in nautilus-clean.sh
nautilus.desktop nautilus.desktop.in
nautilus-help.desktop
nautilus-help.desktop.in nautilus-launch-icon.png
gnome-starthere-96.png gnome-starthere.png
nautilusConf.sh.in nautilus-config.in
ChangeLog-20000414
ChangeLog-20000625 ChangeLog-20000831
ChangeLog-20001018 xml-i18n-extract.in
xml-i18n-merge.in xml-i18n-update.in
Makefile.shared
$(DESKTOP_IN_FILES) $(DESKTOP_FILES)
$(NULL)
diff -Naur nautilus-1.0.6/components/Makefile.in nautilus-new/components/Makefile.in
--- nautilus-1.0.6/components/Makefile.in 2001-11-07 22:57:49.000000000 -0500
+++ nautilus-new/components/Makefile.in 2002-04-15 17:42:27.000000000 -0400
@@ -222,7 +222,7 @@
@BUILD_MOZILLA_COMPONENT_TRUE@MOZILLA_COMPONENT_SUBDIRS = mozilla
-SUBDIRS = adapter hardware
help history
image-viewer
loser music
news notes
sample text
throbber tree
$(MOZILLA_COMPONENT_SUBDIRS)
$(NULL)
+SUBDIRS = adapter hardware
+ help history
+ image-viewer
+loser music
+ news notes
+ text throbber
+ tree
+$(MOZILLA_COMPONENT_SUBDIRS) $(NULL)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
diff -Naur nautilus-1.0.6/components/help/Makefile.in
nautilus-new/components/help/Makefile.in
--- nautilus-1.0.6/components/help/Makefile.in 2001-11-07 22:58:32.000000000 -0500
+++ nautilus-new/components/help/Makefile.in 2002-04-16 10:36:36.000000000 -0400
@@ -238,7 +238,7 @@
mapdatadir = $(datadir)/nautilus/components/hyperbola/maps
mapdata_DATA = pages.map
-module_flags = -export_dynamic -avoid-version
+module_flags = -export_dynamic -avoid-version -module
modulesdir = $(libdir)/vfs/modules
libvfs_help_la_SOURCES = help-method.c help-method.h
diff -Naur nautilus-1.0.6/components/help/converters/gnome-db2html2/Makefile.in
nautilus-new/components/help/converters/gnome-db2html2/Makefile.in
--- nautilus-1.0.6/components/help/converters/gnome-db2html2/Makefile.in
2001-11-07 22:58:37.000000000 -0500
+++ nautilus-new/components/help/converters/gnome-db2html2/Makefile.in 2002-04-15
+17:42:28.000000000 -0400
@@ -221,7 +221,7 @@
INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
$(GNOMEUI_CFLAGS) $(XML_CFLAGS)
-LDADD = $(GNOME_LIBS) $(XML_LIBS)
+LDADD = $(GNOME_LIBS) $(XML_LIBS) $(INTLLIBS)
bin_PROGRAMS = gnome-db2html2
diff -Naur nautilus-1.0.6/components/help/converters/gnome-info2html2/Makefile.in
nautilus-new/components/help/converters/gnome-info2html2/Makefile.in
--- nautilus-1.0.6/components/help/converters/gnome-info2html2/Makefile.in
2001-11-07 22:58:36.000000000 -0500
+++ nautilus-new/components/help/converters/gnome-info2html2/Makefile.in
+2002-04-15 17:42:28.000000000 -0400
@@ -221,7 +221,7 @@
INCLUDES = $(GNOMEUI_CFLAGS)
-LDADD = $(GNOME_LIBS) $(Z_LIBS) $(BZ_LIBS)
+LDADD = $(GNOME_LIBS) $(Z_LIBS) $(BZ_LIBS) $(INTLLIBS)
bin_PROGRAMS = gnome-info2html2
diff -Naur nautilus-1.0.6/components/sample/Makefile.in
nautilus-new/components/sample/Makefile.in
--- nautilus-1.0.6/components/sample/Makefile.in 2001-11-07 23:00:36.000000000
-0500
+++ nautilus-new/components/sample/Makefile.in 2002-04-15 17:42:28.000000000 -0400
@@ -224,7 +224,7 @@
NULL =
-INCLUDES = -DG_LOG_DOMAIN=\"Nautilus-Sample\"
-DDATADIR=\"$(datadir)\"
-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" -I$(top_srcdir)
-I$(top_builddir)
$(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS)
$(OAF_CFLAGS)
+INCLUDES = -DG_LOG_DOMAIN=\"Nautilus-Sample\"
+-DDATADIR=\"$(datadir)\"
+-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" -I$(top_srcdir)
+ -I$(top_builddir)
+$(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS)
+ $(OAF_CFLAGS)
+$(GDK_PIXBUF_CFLAGS)
bin_PROGRAMS = nautilus-sample-content-view
diff -Naur nautilus-1.0.6/components/tree/Makefile.in
nautilus-new/components/tree/Makefile.in
--- nautilus-1.0.6/components/tree/Makefile.in 2001-11-07 23:01:18.000000000 -0500
+++ nautilus-new/components/tree/Makefile.in 2002-04-15 21:49:34.000000000 -0400
@@ -247,7 +247,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libnautilus_tree_view_la_LDFLAGS =
+libnautilus_tree_view_la_LDFLAGS = -module
libnautilus_tree_view_la_LIBADD =
libnautilus_tree_view_la_OBJECTS = nautilus-tree-change-queue.lo \
nautilus-tree-expansion-state.lo nautilus-tree-model.lo \
@@ -544,6 +544,11 @@
@XML_I18N_MERGE_OAF_RULE@
+Nautilus_View_tree.oaf.in: Makefile
+ sed -e "s|\@LIBDIR\@|$(libdir)|" Nautilus_View_tree.oaf.in > \
+ Nautilus_View_tree.oaf.in.tmp; \
+ mv -f Nautilus_View_tree.oaf.in.tmp Nautilus_View_tree.oaf.in;
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naur nautilus-1.0.6/components/tree/Nautilus_View_tree.oaf.in
nautilus-new/components/tree/Nautilus_View_tree.oaf.in
--- nautilus-1.0.6/components/tree/Nautilus_View_tree.oaf.in 2001-01-05
08:10:49.000000000 -0500
+++ nautilus-new/components/tree/Nautilus_View_tree.oaf.in 2002-04-15
+18:57:51.000000000 -0400
@@ -1,6 +1,6 @@
<oaf_info>
-<oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d"
type="shlib" location="libnautilus-tree-view.so">
+<oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d"
+type="shlib" location="@LIBDIR@/libnautilus-tree-view.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
diff -Naur nautilus-1.0.6/configure nautilus-new/configure
--- nautilus-1.0.6/configure 2001-11-07 20:55:40.000000000 -0500
+++ nautilus-new/configure 2002-04-15 17:42:28.000000000 -0400
@@ -3478,7 +3478,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 -install_name
+$rpath/$soname $verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
@@ -6966,7 +6966,7 @@
_mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_libs"
-CC="g++"
+CC="c++"
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lxpcom"
echo $ac_n "checking for xpcom""... $ac_c" 1>&6
@@ -7251,7 +7251,7 @@
found_mozilla=true
- MOZILLA_COMPONENT_RPATH_FLAGS=-Wl,-rpath=$_mozilla_lib_place
+ MOZILLA_COMPONENT_RPATH_FLAGS=
MOZILLA_COMPONENT_LDFLAGS=-L$_mozilla_lib_place
MOZILLA_COMPONENT_LIBS="$_mozilla_gtk_moz_embed_libs \
$_mozilla_gtk_super_win_libs \
diff -Naur nautilus-1.0.6/libnautilus-private/filesystem-attributes.xml
nautilus-new/libnautilus-private/filesystem-attributes.xml
--- nautilus-1.0.6/libnautilus-private/filesystem-attributes.xml 2001-10-02
11:15:57.000000000 -0400
+++ nautilus-new/libnautilus-private/filesystem-attributes.xml 2002-04-15
+17:42:28.000000000 -0400
@@ -9,6 +9,7 @@
<filesystem name="ext2" _default_volume_name="Ext2 Linux Volume" trash="yes"/>
<filesystem name="ext3" _default_volume_name="Ext3 Linux Volume" trash="yes"/>
<filesystem name="fat" _default_volume_name="MSDOS Volume" trash="yes"/>
+ <filesystem name="hfs" _default_volume_name="Macintosh Volume" trash="yes"/>
<filesystem name="iso9660" _default_volume_name="CDROM Volume"/>
<filesystem name="jfs" _default_volume_name="JFS Volume" trash="yes"/>
<filesystem name="hpfs" _default_volume_name="Windows NT Volume"/>
diff -Naur nautilus-1.0.6/libnautilus-private/nautilus-customization-data.c
nautilus-new/libnautilus-private/nautilus-customization-data.c
--- nautilus-1.0.6/libnautilus-private/nautilus-customization-data.c 2001-09-20
14:34:48.000000000 -0400
+++ nautilus-new/libnautilus-private/nautilus-customization-data.c 2002-04-15
+17:42:28.000000000 -0400
@@ -32,6 +32,8 @@
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-i18n.h>
+#include <eel/eel-xml-extensions.h>
+
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
@@ -51,7 +53,6 @@
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-scalable-font.h>
-#include <eel/eel-xml-extensions.h>
#include <eel/eel-string.h>
typedef enum {
diff -Naur nautilus-1.0.6/libnautilus-private/nautilus-desktop-file-loader.c
nautilus-new/libnautilus-private/nautilus-desktop-file-loader.c
--- nautilus-1.0.6/libnautilus-private/nautilus-desktop-file-loader.c 2001-09-26
12:37:15.000000000 -0400
+++ nautilus-new/libnautilus-private/nautilus-desktop-file-loader.c 2002-04-15
+17:42:28.000000000 -0400
@@ -39,7 +39,6 @@
#include <ctype.h>
#include <locale.h>
#include <iconv.h>
-#include <langinfo.h>
typedef struct NautilusDesktopFileSection NautilusDesktopFileSection;
typedef struct NautilusDesktopFileAddition NautilusDesktopFileAddition;
@@ -1040,7 +1039,7 @@
if (!initialized) {
/* whee, we are totally unportable (broken too) */
setlocale (LC_CTYPE, "");
- locale = nl_langinfo (CODESET);
+ locale = "UTF-8";
initialized = TRUE;
}
G_UNLOCK (init_validate);
diff -Naur nautilus-1.0.6/libnautilus-private/nautilus-medusa-support.c
nautilus-new/libnautilus-private/nautilus-medusa-support.c
--- nautilus-1.0.6/libnautilus-private/nautilus-medusa-support.c 2001-04-11
14:36:16.000000000 -0400
+++ nautilus-new/libnautilus-private/nautilus-medusa-support.c 2002-04-15
+17:42:28.000000000 -0400
@@ -31,6 +31,7 @@
#include <eel/eel-glib-extensions.h>
#include <eel/eel-string.h>
+#include <stdint.h>
#include <dirent.h>
#include <stdio.h>
#include <sys/types.h>
diff -Naur nautilus-1.0.6/libnautilus-private/nautilus-volume-monitor.c
nautilus-new/libnautilus-private/nautilus-volume-monitor.c
--- nautilus-1.0.6/libnautilus-private/nautilus-volume-monitor.c 2001-10-09
20:16:39.000000000 -0400
+++ nautilus-new/libnautilus-private/nautilus-volume-monitor.c 2002-04-16
+02:47:40.000000000 -0400
@@ -96,6 +96,10 @@
#include <sys/ucred.h>
#endif
+#ifdef __APPLE__
+#define HAVE_SYS_MOUNT_H
+#endif
+
#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
#endif
@@ -963,90 +967,28 @@
static GList *
get_mount_list (NautilusVolumeMonitor *monitor)
{
- GList *volumes;
- NautilusVolume *volume;
- static time_t last_mtime = 0;
- static FILE *fh = NULL;
- static GList *saved_list = NULL;
- const char *file_name;
- const char *separator;
- char line[PATH_MAX * 3];
- char device_name[sizeof (line)];
- EelStringList *list;
- char *device_path, *mount_path, *file_system_type_name;
- struct stat sb;
-
- volumes = NULL;
-
- if (mnttab_exists) {
- file_name = "/etc/mnttab";
- separator = "\t";
- } else {
- file_name = "/proc/mounts";
- separator = " ";
- }
-
- /* /proc/mounts mtime never changes, so stat /etc/mtab.
- * Isn't this lame?
- */
- if (stat ("/etc/mtab", &sb) < 0) {
- g_warning ("Unable to stat %s: %s", file_name,
- g_strerror (errno));
+ GList *volumes = NULL;
+ struct statfs *fsinfos = NULL;
+ int fsnum, fsidx;
+
+ fsnum = getmntinfo(&fsinfos, MNT_WAIT);
+ if (fsnum == -1) {
+ g_warning ("Unable to stat filesystems.");
return NULL;
}
- if (sb.st_mtime == last_mtime) {
- return copy_mount_list (saved_list);
- }
-
- last_mtime = sb.st_mtime;
-
- if (fh == NULL) {
- fh = fopen (file_name, "r");
- if (fh == NULL) {
- g_warning ("Unable to open %s: %s", file_name, strerror
(errno));
- return NULL;
- }
- } else {
- rewind (fh);
- }
-
- while (fgets (line, sizeof(line), fh)) {
- if (sscanf (line, "%s", device_name) != 1) {
- continue;
- }
-
- list = eel_string_list_new_from_tokens (line, separator, FALSE);
- if (list == NULL) {
- continue;
- }
-
- /* The string list needs to have at least 3 items per line.
- * We need to find at least device path, mount path and file system
type.
- */
- if (eel_string_list_get_length (list) >= 3) {
- device_path = eel_string_list_nth (list, 0);
- mount_path = eel_string_list_nth (list, 1);
- file_system_type_name = eel_string_list_nth (list, 2);
- volume = create_volume (device_path, mount_path);
- if (eel_string_list_get_length (list) >= 4 &&
- option_list_has_option (eel_string_list_nth (list, 3),
MNTOPT_RO))
- volume->is_read_only = TRUE;
- volumes = finish_creating_volume_and_prepend
- (monitor, volume, file_system_type_name, volumes);
-
- g_free (device_path);
- g_free (mount_path);
- g_free (file_system_type_name);
- }
-
- eel_string_list_free (list);
+ for (fsidx = 0; fsidx < fsnum; ++fsidx) {
+ struct statfs afs = fsinfos[fsidx];
+ NautilusVolume *volume = NULL;
+
+ volume = create_volume (afs.f_mntfromname, afs.f_mntonname);
+ if (afs.f_flags & MNT_RDONLY)
+ volume->is_read_only = TRUE;
+ volumes = finish_creating_volume_and_prepend
+ (monitor, volume, afs.f_fstypename, volumes);
}
-
- free_mount_list (saved_list);
- saved_list = volumes;
-
- return copy_mount_list (volumes);
+
+ return volumes;
}
#endif /* !SOLARIS_MNT */
diff -Naur nautilus-1.0.6/ltmain.sh nautilus-new/ltmain.sh
--- nautilus-1.0.6/ltmain.sh 2001-11-07 20:55:25.000000000 -0500
+++ nautilus-new/ltmain.sh 2002-04-15 17:42:28.000000000 -0400
@@ -2892,7 +2892,12 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
- eval cmds=\"$archive_cmds\"
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+ done
+ eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
diff -Naur nautilus-1.0.6/omf-install/Makefile.in nautilus-new/omf-install/Makefile.in
--- nautilus-1.0.6/omf-install/Makefile.in 2001-11-07 23:02:57.000000000 -0500
+++ nautilus-new/omf-install/Makefile.in 2002-04-17 01:36:41.000000000 -0400
@@ -325,7 +325,7 @@
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+# -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
uninstall-local:
-for file in $(srcdir)/*.omf; do \
@@ -333,7 +333,7 @@
rm -f $(omf_dest_dir)/$$basefile; \
done
-rmdir $(omf_dest_dir)
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+# -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- NEW FILE: sawfish-1.0.1-2.info ---
Package: sawfish
Version: 1.0.1
Revision: 2
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: imlib, rep-gtk, esound, control-center-shlibs
BuildDepends: gdk-pixbuf, libjpeg, libpng, libtiff, netpbm, audiofile, db3, glib,
gtk+, orbit, readline, giflib, gdbm, control-center-dev, gconf-dev, gnome-libs-dev,
oaf-dev, guile-dev, librep-dev, libxml, popt, libglade, gnome-vfs-dev |
gnome-vfs-ssl-dev
Source: mirror:custom:fink/%n-%v-repack.tar.bz2
CustomMirror: <<
nam-US: http://telia.dl.sourceforge.net/sourceforge/
nam-US: http://unc.dl.sourceforge.net/sourceforge/
eur-BE: http://belnet.dl.sourceforge.net/sourceforge/
<<
SourceDirectory: %n-%v
UpdateConfigGuessInDirs: etc
Patch: %f.patch
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --infodir=%p/share/info
CompileScript: <<
./configure %c
make host_type=powerpc-apple-darwin
<<
InstallScript: <<
make install host_type=powerpc-apple-darwin DESTDIR=%d
mkdir -p %i/share/gnome/wm-properties
install -m 644 Sawfish.desktop %i/share/gnome/wm-properties/
<<
DocFiles: AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO
InfoDocs: sawfish.info
#
Description: Themeable and scriptable window manager
DescDetail: <<
Sawfish is probably the most flexible window manager around. It is
written in rep, a Lisp dialect. The language is also used for
extensions, customizations and themes. One could call it 'the Emacs of
window managers'.
<<
DescPort: <<
Uses autoconf. The configure script is patched to disable dlmalloc,
which doesn't work on Darwin.
Forces the host_type to be something without an OS version number in
it.
Previous versions by Christoph Pfisterer.
<<
License: GPL
Homepage: http://sawmill.sourceforge.net/
--- NEW FILE: sawfish-1.0.1-2.patch ---
diff -ru sawfish-1.0.1/configure sawfish-1.0.1-patched/configure
--- sawfish-1.0.1/configure Mon Oct 15 06:55:25 2001
+++ sawfish-1.0.1-patched/configure Thu Dec 27 15:28:50 2001
@@ -3286,7 +3286,7 @@
if test "$doug_lea_malloc" = "no"; then
case ${host} in
- *-dec-osf*|*-sparc-sun*)
+ *-dec-osf*|*-sparc-sun*|*-darwin*)
cat >> confdefs.h <<\EOF
#define LIBC_MALLOC 1
EOF
--- NEW FILE: xchat-1.8.9-2.info ---
Package: xchat
Version: 1.8.9
Revision: 2
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: gnome-core-shlibs, db3-shlibs, dlcompat (>= 20020120-1)
BuildDepends: db3 (>= 3.3.11-4), python, gal19, gdk-pixbuf, freetype2, libjpeg,
libpng, libtiff, netpbm, audiofile, esound, glib, gtk+, orbit, readline, giflib,
imlib, gdbm, gmp, bonobo-dev, control-center-dev, gconf-dev, glibwww, gnome-core-dev,
gnome-libs-dev, gnome-print-dev, gtkhtml-dev, oaf-dev, expat, guile-dev, libwww,
libxml, popt, tcltk-dev, gnome-vfs-dev | gnome-vfs-ssl-dev
Conflicts: xchat-ssl
Replaces: xchat-ssl
Source: http://www.xchat.org/files/source/1.8/xchat-%v.tar.gz
Patch: %f.patch
UpdateLibtool: true
ConfigureParams: --enable-japanese-conv --enable-hebrew --enable-panel --enable-python
SetLIBS: -lintl -liconv
SetCPPFLAGS: -no-cpp-precomp
DocFiles: AUTHORS COPYING FAQ README
Description: Graphical IRC client
DescDetail: <<
Xchat is a graphical IRC client for UNIX operating systems (I.R.C. is Internet
Relay Chat, see http://irchelp.org for more information about IRC in general).
It runs under the X Window System and uses the GTK+ toolkit. Optionally it can
be compiled to use Gnome.
<<
DescPort: <<
The SetLIBS is necessary to get xchat to link.
<<
Homepage: http://www.xchat.org
License: GPL
--- NEW FILE: xchat-1.8.9-2.patch ---
diff -ru xchat-1.8.7/configure xchat-1.8.7-patched/configure
--- xchat-1.8.7/configure Mon Jan 7 11:16:55 2002
+++ xchat-1.8.7-patched/configure Tue Jan 29 19:13:29 2002
@@ -4357,8 +4357,8 @@
fi
PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
echo "$ac_t""ok" 1>&6
- CFLAGS="$CFLAGS $PERL_CFLAGS"
- LIBS="$LIBS $PERL_LDFLAGS"
+ CFLAGS="$PERL_CFLAGS $CFLAGS"
+ LIBS="$PERL_LDFLAGS $LIBS"
cat >> confdefs.h <<\EOF
#define USE_PERL 1
EOF
--- NEW FILE: xmms-1.2.7-2.info ---
Package: xmms
Version: 1.2.7
Revision: 2
Depends: %N-bin
BuildDepends: esound, libogg, libvorbis, fink (>= 0.9.9), gdk-pixbuf, freetype2,
libjpeg, libpng, libtiff, netpbm, audiofile, db3, glib, gtk+, orbit, readline, gal19,
giflib, imlib, bonobo-dev, gconf-dev, glibwww, gnome-core-dev, gnome-libs-dev,
gnome-print-dev, gtkhtml-dev, oaf-dev, guile-dev, libmikmod, libwww, libxml, popt,
libglade, gnome-vfs-dev | gnome-vfs-ssl-dev
Replaces: %N (<< 1.2.7)
Source: http://www.xmms.org/files/1.2.x/%n-%v.tar.bz2
Patch: %f.patch
UpdatePoMakefile: true
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --mandir=%p/share/man
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/share/pixmaps %i/share/gnome/apps/Multimedia
install -c -m 644 xmms/*.xpm %i/share/pixmaps
install -c -m 644 gnomexmms/*.xpm %i/share/pixmaps
install -c -m 644 xmms/xmms.desktop %i/share/gnome/apps/Multimedia
<<
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: esound-bin, libvorbis-shlibs, libmikmod-shlibs, libxml-shlibs
Replaces: %N (<< 1.2.7)
Files: lib/libxmms.*.dylib
<<
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs, gnome-core-shlibs, libgl
Replaces: %N (<< 1.2.7)
Files: bin/*xmms etc/ lib/xmms share/applets/ share/locale/ share/man/
share/pixmaps/ share/xmms/
<<
DocFiles: AUTHORS COPYING ChangeLog FAQ NEWS README TODO
Description: Multimedia player for the X Window System
DescDetail: <<
X MultiMedia System is a sound player written from scratch. Since it
uses the WinAmp GUI, it can use WinAmp skins. It can play mp3s, mods, s3ms,
and other formats. It now has support for input, output, general, and
visualization plugins.
<<
License: GPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.xmms.org/
--- NEW FILE: xmms-1.2.7-2.patch ---
diff -Naur xmms-1.2.7.old/Input/cdaudio/cdaudio.c
xmms-1.2.7.new/Input/cdaudio/cdaudio.c
--- xmms-1.2.7.old/Input/cdaudio/cdaudio.c Tue Feb 5 23:39:11 2002
+++ xmms-1.2.7.new/Input/cdaudio/cdaudio.c Thu Jun 13 02:35:01 2002
@@ -558,7 +558,11 @@
subchnl.data = &subinfo;
ioctl(cdda_fd, CDIOCREADSUBCHANNEL, &subchnl);
+#ifdef XMMS_CDROM_BSD_DARWIN
+ return(LBA_DARWIN(subchnl.data->what.position.absaddr));
+#else
return(LBA(subchnl.data->what.position.absaddr.msf));
+#endif
}
static void drive_get_volume(int *l, int *r)
diff -Naur xmms-1.2.7.old/Input/cdaudio/cdaudio.h
xmms-1.2.7.new/Input/cdaudio/cdaudio.h
--- xmms-1.2.7.old/Input/cdaudio/cdaudio.h Tue Feb 5 23:39:11 2002
+++ xmms-1.2.7.new/Input/cdaudio/cdaudio.h Thu Jun 13 02:35:01 2002
@@ -98,11 +98,8 @@
} flags;
};
-#ifdef XMMS_CDROM_BSD_DARWIN
-# define LBA(msf) ((msf[1] * 60 + msf[2]) * 75 + msf[3])
-#else
-# define LBA(msf) ((msf.minute * 60 + msf.second) * 75 + msf.frame)
-#endif
+#define LBA(msf) ((msf.minute * 60 + msf.second) * 75 + msf.frame)
+#define LBA_DARWIN(msf) ((msf[1] * 60 + msf[2]) * 75 + msf[3])
typedef struct
{
diff -Naur xmms-1.2.7.old/configure xmms-1.2.7.new/configure
--- xmms-1.2.7.old/configure Tue Mar 5 06:57:01 2002
+++ xmms-1.2.7.new/configure Thu Jun 13 02:35:40 2002
@@ -3867,7 +3867,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 .$module != .yes
+&& echo -install_name $rpath/$soname $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 xmms-1.2.7.old/gnomexmms/gnomexmms.desktop
xmms-1.2.7.new/gnomexmms/gnomexmms.desktop
--- xmms-1.2.7.old/gnomexmms/gnomexmms.desktop Tue Nov 28 07:20:58 2000
+++ xmms-1.2.7.new/gnomexmms/gnomexmms.desktop Thu Jun 13 02:35:01 2002
@@ -9,6 +9,6 @@
Name[sv]=XMMS-panelprogram
Name[pt_BR]=Applet do XMMS
Exec=gnomexmms --activate-goad-server=gnomexmms
-Icon=
+Icon=gnomexmms.xpm
Terminal=0
Type=Application
diff -Naur xmms-1.2.7.old/libxmms/util.c xmms-1.2.7.new/libxmms/util.c
--- xmms-1.2.7.old/libxmms/util.c Fri Jun 1 22:07:49 2001
+++ xmms-1.2.7.new/libxmms/util.c Thu Jun 13 02:35:01 2002
@@ -14,6 +14,13 @@
#include <sys/sysctl.h>
#endif
+#if defined (__APPLE__)
+#include <mach/mach.h>
+#include <mach/thread_policy.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
@@ -72,6 +79,28 @@
gboolean xmms_check_realtime_priority(void)
{
+#if defined (__APPLE__)
+ struct thread_time_constraint_policy ttcpolicy;
+ int bus_speed, mib [2] = { CTL_HW, HW_BUS_FREQ };
+ size_t len;
+
+ len = sizeof (bus_speed);
+ sysctl (mib, 2, &bus_speed, &len, NULL, 0);
+
+ /* Is it enough? */
+ ttcpolicy.period = bus_speed / 120;
+ ttcpolicy.computation = bus_speed / 1000;
+ ttcpolicy.constraint = bus_speed / 500;
+ ttcpolicy.preemptible = 1;
+
+ thread_policy_set (mach_thread_self (),
+ THREAD_TIME_CONSTRAINT_POLICY,
+ (int*)&ttcpolicy,
+ THREAD_TIME_CONSTRAINT_POLICY_COUNT);
+
+ return TRUE;
+#endif
+
#ifdef HAVE_SCHED_SETSCHEDULER
#ifdef __FreeBSD__
/*
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
No, I will not fix your computer.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
