From 1f4e520f9a5fe654ba12cd57c49418d76d455a48 Mon Sep 17 00:00:00 2001 From: steve Date: Sun, 22 Aug 1999 03:42:59 +0000 Subject: Update to version 1.0.14. PR: 12781 (4 of 19) Submitted by: Ade Lovett --- x11/gnome-libs/files/patch-ac | 46 ++++++++++++++++++------------------------- x11/gnome-libs/files/patch-ad | 19 +++++++++++++----- x11/gnome-libs/files/patch-ag | 8 ++++---- x11/gnome-libs/files/patch-ba | 16 +++++++-------- x11/gnome-libs/files/patch-bc | 8 ++++---- x11/gnome-libs/files/patch-bd | 10 +++++----- x11/gnome-libs/files/patch-be | 10 +++++----- x11/gnome-libs/files/patch-bg | 10 +++++----- 8 files changed, 64 insertions(+), 63 deletions(-) (limited to 'x11/gnome-libs/files') diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac index 184d5e7..3f491f3 100644 --- a/x11/gnome-libs/files/patch-ac +++ b/x11/gnome-libs/files/patch-ac @@ -1,17 +1,26 @@ ---- gnome-config.in.orig Thu Apr 15 13:59:46 1999 -+++ gnome-config.in Sat May 8 17:32:13 1999 -@@ -43,25 +43,25 @@ +--- gnome-config.in.orig Mon May 31 06:04:01 1999 ++++ gnome-config.in Mon Jul 12 10:27:28 1999 +@@ -19,7 +19,7 @@ + pkglibdir=${libdir}/@PACKAGE@ + pkgincludedir=${includedir}/@PACKAGE@ + MODULE_VERSION=@PACKAGE@-@VERSION@ +-module_dirs="$libdir:$GNOME_LIBCONFIG_PATH" ++module_dirs="$sysconfdir:$GNOME_LIBCONFIG_PATH" + + usage() + { +@@ -46,18 +46,18 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib (calls glib12-config) ++ glib (calls GLIB_CONFIG) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk (calls gtk12-config) ++ gtk (calls GTK_CONFIG) gtkxmhtml (only --libs) zvt (only --libs) @@ -22,28 +31,20 @@ is looked in for the necessary information. Those currently installed appear to be: - - EOF - -- conf_shs=`cd ${libdir}; echo *Conf.sh` -+ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` - - if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then - echo " " -@@ -146,19 +146,19 @@ +@@ -149,19 +149,19 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib12-config --libs`" -+ the_flags="$the_flags `glib12-config --cflags`" ++ the_libs="$the_libs `$GLIB_CONFIG --libs`" ++ the_flags="$the_flags `$GLIB_CONFIG --cflags`" ;; gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ the_libs="$the_libs `gtk12-config --libs`" -+ the_flags="$the_flags `gtk12-config --cflags`" ++ the_libs="$the_libs `$GTK_CONFIG --libs`" ++ the_flags="$the_flags `$GTK_CONFIG --cflags`" ;; gnome) the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -55,12 +56,3 @@ the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gtkxmhtml) -@@ -175,7 +175,7 @@ - the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" - ;; - *) -- cnf_sh=${libdir}/${1}Conf.sh -+ cnf_sh=${sysconfdir}/${1}Conf.sh - if test -f ${cnf_sh}; then - . ${cnf_sh} - up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/gnome-libs/files/patch-ad b/x11/gnome-libs/files/patch-ad index 0a91398..32e6568 100644 --- a/x11/gnome-libs/files/patch-ad +++ b/x11/gnome-libs/files/patch-ad @@ -1,11 +1,20 @@ ---- libgnome/gnome-help.c.orig Wed Jan 13 07:43:11 1999 -+++ libgnome/gnome-help.c Thu Jan 14 19:13:33 1999 -@@ -57,7 +57,7 @@ +--- libgnome/gnome-help.c.orig Thu Apr 8 15:01:21 1999 ++++ libgnome/gnome-help.c Mon Jul 12 10:29:11 1999 +@@ -69,7 +69,7 @@ lang= language_list->data; buf= g_string_new (NULL); - g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path); + g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path); res= (gchar *)gnome_unconditional_datadir_file (buf->str); - p = strrchr(res, '#'); - if (p) + p = strrchr (res, '#'); + if (p) { +@@ -118,7 +118,7 @@ + if (!res) + { + buf = g_string_new(NULL); +- g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path); ++ g_string_sprintf(buf, "help/%s/C/%s", app, path); + res = (gchar *)gnome_unconditional_datadir_file(buf->str); + g_string_free(buf, TRUE); + } diff --git a/x11/gnome-libs/files/patch-ag b/x11/gnome-libs/files/patch-ag index cb33047..8778bc2 100644 --- a/x11/gnome-libs/files/patch-ag +++ b/x11/gnome-libs/files/patch-ag @@ -1,6 +1,6 @@ ---- libgnome/gnome-util.c.orig Wed Dec 16 14:48:43 1998 -+++ libgnome/gnome-util.c Thu Dec 24 03:49:23 1998 -@@ -340,8 +340,9 @@ +--- libgnome/gnome-util.c.orig Fri Apr 23 16:14:08 1999 ++++ libgnome/gnome-util.c Mon Jul 12 10:31:19 1999 +@@ -371,8 +371,9 @@ int i; char *shell; static char *shells [] = { @@ -8,7 +8,7 @@ - "/bin/csh", "/bin/sh", 0 + "/bin/csh", "/bin/sh", "/usr/local/bin/tcsh", + "/usr/local/bin/bash", "/usr/local/bin/ksh", -+ "/usr/local/bin/zsh", "/usr/local/bin/scsh", 0 ++ "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0 }; if ((shell = getenv ("SHELL"))){ diff --git a/x11/gnome-libs/files/patch-ba b/x11/gnome-libs/files/patch-ba index ab4a059..2d36fba 100644 --- a/x11/gnome-libs/files/patch-ba +++ b/x11/gnome-libs/files/patch-ba @@ -1,15 +1,15 @@ ---- Makefile.in.orig Wed May 5 19:03:43 1999 -+++ Makefile.in Wed May 5 19:04:38 1999 -@@ -162,7 +162,7 @@ - # just distribute it, since we can - @FALSE_TRUE@libvfs = libvfs +--- Makefile.in.orig Fri Jul 23 21:06:26 1999 ++++ Makefile.in Wed Aug 18 10:15:43 1999 +@@ -156,7 +156,7 @@ + @COMPILE_TEST_GNOME_TRUE@test_gnome = test-gnome test-suite + @COMPILE_TEST_GNOME_FALSE@test_gnome = --SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man gnome-faq -+SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) man +-SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) devel-docs gnome-data man gnome-faq ++SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data man include_HEADERS = gnome.h -@@ -170,7 +170,7 @@ +@@ -164,7 +164,7 @@ EXTRA_DIST = HACKING gnomeConf.sh.in gnome-bug.in gnome-config.in gnome-libs.spec.in diff --git a/x11/gnome-libs/files/patch-bc b/x11/gnome-libs/files/patch-bc index d77e125..227404a 100644 --- a/x11/gnome-libs/files/patch-bc +++ b/x11/gnome-libs/files/patch-bc @@ -1,10 +1,10 @@ ---- libgnome/Makefile.in.orig Wed Apr 7 21:33:54 1999 -+++ libgnome/Makefile.in Fri Apr 30 17:35:08 1999 -@@ -172,7 +172,7 @@ +--- libgnome/Makefile.in.orig Fri Aug 20 15:01:42 1999 ++++ libgnome/Makefile.in Fri Aug 20 16:29:13 1999 +@@ -171,7 +171,7 @@ EXTRA_DIST = parse-path.cP --libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir) +-libgnome_la_LDFLAGS = -version-info 35:5:3 #-rpath $(libdir) +libgnome_la_LDFLAGS = -version-info 2:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) diff --git a/x11/gnome-libs/files/patch-bd b/x11/gnome-libs/files/patch-bd index dc9615a..5bbb0a9 100644 --- a/x11/gnome-libs/files/patch-bd +++ b/x11/gnome-libs/files/patch-bd @@ -1,16 +1,16 @@ ---- libgnomeui/Makefile.in.orig Wed Apr 7 21:34:11 1999 -+++ libgnomeui/Makefile.in Fri Apr 30 17:30:51 1999 +--- libgnomeui/Makefile.in.orig Fri Aug 20 15:01:47 1999 ++++ libgnomeui/Makefile.in Fri Aug 20 16:30:38 1999 @@ -202,7 +202,7 @@ EXTRA_DIST = $(SGML) $(gtkrc_DATA) AUTHORS gnome.defs maketypes.awk makeenums.pl gnome-boxed.defs gnometypebuiltins_vars.c gnometypebuiltins_ids.c gnometypebuiltins_evals.c --libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir) +-libgnomeui_la_LDFLAGS = -version-info 42:1:10 -rpath $(libdir) +libgnomeui_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) -@@ -258,7 +258,7 @@ - gnome-startup.lo gnome-stock.lo gnome-winhints.lo \ +@@ -260,7 +260,7 @@ + gnome-spell.lo gnome-startup.lo gnome-stock.lo gnome-winhints.lo \ gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \ gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) diff --git a/x11/gnome-libs/files/patch-be b/x11/gnome-libs/files/patch-be index 478ed9a..b456d32 100644 --- a/x11/gnome-libs/files/patch-be +++ b/x11/gnome-libs/files/patch-be @@ -1,10 +1,10 @@ ---- libgnorba/Makefile.in.orig Wed Apr 7 21:34:31 1999 -+++ libgnorba/Makefile.in Fri Apr 30 17:40:01 1999 -@@ -185,7 +185,7 @@ - libgnorbainclude_HEADERS = gnorba.h gnome-factory.h GnomeObject.h Table.h +--- libgnorba/Makefile.in.orig Fri Aug 20 15:01:58 1999 ++++ libgnorba/Makefile.in Fri Aug 20 16:31:21 1999 +@@ -184,7 +184,7 @@ + libgnorbainclude_HEADERS = gnorba.h gnome-factory.h gnome-unknown.h Table.h --libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir) +-libgnorba_la_LDFLAGS = -version-info 28:7:1 -rpath $(libdir) +libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg index 5a793e0..1148e39 100644 --- a/x11/gnome-libs/files/patch-bg +++ b/x11/gnome-libs/files/patch-bg @@ -1,5 +1,5 @@ ---- zvt/Makefile.in.orig Wed Apr 28 02:58:32 1999 -+++ zvt/Makefile.in Sat May 8 22:50:50 1999 +--- zvt/Makefile.in.orig Fri Aug 20 15:01:56 1999 ++++ zvt/Makefile.in Fri Aug 20 16:32:31 1999 @@ -20,7 +20,7 @@ exec_prefix = @exec_prefix@ @@ -9,16 +9,16 @@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ -@@ -160,7 +160,7 @@ +@@ -159,7 +159,7 @@ libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c --libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir) +-libzvt_la_LDFLAGS = -version-info 4:5:2 -rpath $(libdir) +libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h -@@ -200,7 +200,7 @@ +@@ -199,7 +199,7 @@ libzvt_la_LIBADD = libzvt_la_OBJECTS = gnome-login-support.lo lists.lo subshell.lo \ update.lo vt.lo zvtterm.lo -- cgit v1.1