diff options
Diffstat (limited to 'devel/bonobo/files/patch-ab')
| -rw-r--r-- | devel/bonobo/files/patch-ab | 112 |
1 files changed, 31 insertions, 81 deletions
diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab index b7a388930663..cd32267b62a7 100644 --- a/devel/bonobo/files/patch-ab +++ b/devel/bonobo/files/patch-ab @@ -1,59 +1,31 @@ ---- Makefile.in.orig Mon Sep 27 16:21:48 1999 -+++ Makefile.in Fri Oct 8 13:45:53 1999 -@@ -126,7 +126,7 @@ +--- Makefile.in.orig Wed Jan 26 08:49:25 2000 ++++ Makefile.in Fri Jan 28 10:56:23 2000 +@@ -125,7 +125,7 @@ - SUBDIRS = po intl idl libefs bonobo storage-modules components samples + SUBDIRS = po intl idl libefs bonobo storage-modules components samples gshell tests -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = bonoboConf.sh EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in ---- bonobo/Makefile.in.orig Mon Sep 27 16:22:01 1999 -+++ bonobo/Makefile.in Fri Oct 8 13:46:36 1999 -@@ -128,7 +128,7 @@ - - corba_DATA = sample.gnorba item.gnorba - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTORAGE_LIB=\""$(libdir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -I$(srcdir) -I$(top_srcdir) -I. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) - - - gnome_libs = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- components/application-x-gnomine/Makefile.in.orig Mon Sep 27 16:22:05 1999 -+++ components/application-x-gnomine/Makefile.in Fri Oct 8 13:47:29 1999 -@@ -125,9 +125,9 @@ +--- components/application-x-gnomine/Makefile.in.orig Wed Jan 26 08:49:34 2000 ++++ components/application-x-gnomine/Makefile.in Fri Jan 28 10:59:27 2000 +@@ -124,9 +124,9 @@ l = @l@ scoredir = $(localstatedir)/games -Gamesdir = $(datadir)/gnome/apps/Games +Gamesdir = $(datadir)/apps/Games --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) #bin_PROGRAMS = gnomine bonobo-application-x-mines -@@ -146,7 +146,7 @@ - bonobo_application_x_mines_SOURCES = minefield.h minefield.c bonobo-application-x-mines.c - - --bonobo_application_x_mines_LDADD = $(GNOME_LIBDIR) -lbonobo $(GNOMEGNORBA_LIBS) -+bonobo_application_x_mines_LDADD = $(GNOME_LIBDIR) $(top_builddir)/bonobo/libbonobo.la $(GNOMEGNORBA_LIBS) - - - gnorbadir = $(sysconfdir)/CORBA/servers ---- components/audio-ulaw/Makefile.in.orig Mon Sep 27 16:22:12 1999 -+++ components/audio-ulaw/Makefile.in Fri Oct 8 13:48:17 1999 -@@ -124,14 +124,14 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --SUBDIRS = doc -+SUBDIRS = # doc - - bin_PROGRAMS = bonobo-audio-ulaw - +--- components/audio-ulaw/Makefile.in.orig Wed Jan 26 08:49:38 2000 ++++ components/audio-ulaw/Makefile.in Fri Jan 28 11:00:35 2000 +@@ -130,7 +130,7 @@ bonobo_audio_ulaw_SOURCES = bonobo-audio-ulaw.c bonobo-audio-ulaw.h item-audio.c item-audio.h color.c color.h @@ -62,31 +34,9 @@ bonobo_audio_ulaw_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- components/audio-ulaw/doc/C/Makefile.in.orig Mon Sep 27 16:22:14 1999 -+++ components/audio-ulaw/doc/C/Makefile.in Fri Oct 8 13:49:03 1999 -@@ -128,7 +128,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --audio_ulaw_helpdir = $(datadir)/gnome/bonobo/docs/audio_ulaw/C -+audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C - - # - # Module configuration information ---- components/image-generic/Makefile.in.orig Mon Sep 27 16:22:06 1999 -+++ components/image-generic/Makefile.in Fri Oct 8 13:49:51 1999 -@@ -129,7 +129,7 @@ - bonobo_image_generic_SOURCES = bonobo-image-generic.c - - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) - - - bonobo_image_generic_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) -lgdk_pixbuf ---- components/image-x-png/Makefile.in.orig Mon Sep 27 16:22:07 1999 -+++ components/image-x-png/Makefile.in Fri Oct 8 13:50:29 1999 -@@ -124,14 +124,14 @@ +--- components/image-x-png/Makefile.in.orig Wed Jan 26 08:49:35 2000 ++++ components/image-x-png/Makefile.in Fri Jan 28 11:02:04 2000 +@@ -123,14 +123,14 @@ cxxflags_set = @cxxflags_set@ l = @l@ @@ -103,20 +53,9 @@ bonobo_image_x_png_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) -lpng ---- components/image-x-png/doc/C/Makefile.in.orig Mon Sep 27 16:22:09 1999 -+++ components/image-x-png/doc/C/Makefile.in Fri Oct 8 13:51:01 1999 +--- components/text-plain/Makefile.in.orig Wed Jan 26 08:49:37 2000 ++++ components/text-plain/Makefile.in Fri Jan 28 11:04:17 2000 @@ -128,7 +128,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --image_x_png_helpdir = $(datadir)/gnome/bonobo/docs/image_x_png/C -+image_x_png_helpdir = $(datadir)/bonobo/docs/image_x_png/C - - # - # Module configuration information ---- components/text-plain/Makefile.in.orig Mon Sep 27 16:22:11 1999 -+++ components/text-plain/Makefile.in Fri Oct 8 13:51:48 1999 -@@ -129,7 +129,7 @@ bonobo_text_plain_SOURCES = bonobo-text-plain.c @@ -125,9 +64,9 @@ bonobo_text_plain_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) ---- samples/Makefile.in.orig Mon Sep 27 16:22:16 1999 -+++ samples/Makefile.in Fri Oct 8 13:53:54 1999 -@@ -126,7 +126,7 @@ +--- samples/compound-doc/Makefile.in.orig Wed Jan 26 08:49:40 2000 ++++ samples/compound-doc/Makefile.in Fri Jan 28 11:06:32 2000 +@@ -125,7 +125,7 @@ bin_PROGRAMS = paint-component-simple sample-container @@ -136,6 +75,17 @@ paint_component_simple_SOURCES = paint-component-simple.c +--- samples/controls/Makefile.in.orig Wed Jan 26 08:49:39 2000 ++++ samples/controls/Makefile.in Fri Jan 28 11:07:10 2000 +@@ -125,7 +125,7 @@ + + bin_PROGRAMS = sample-control-factory sample-control-container + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) + + + sample_control_factory_SOURCES = bonobo-clock-control.c bonobo-clock-control.h bonobo-calculator-control.c bonobo-calculator-control.h sample-control-factory.c --- storage-modules/Makefile.in.orig Mon Sep 27 16:22:03 1999 +++ storage-modules/Makefile.in Fri Oct 8 13:54:29 1999 @@ -124,7 +124,7 @@ |