4 files changed, 8 insertions, 59 deletions

diff --git a/x11-toolkits/bakery/files/patch-bakery::App::App.h b/x11-toolkits/bakery/files/patch-bakery::App::App.h
deleted file mode 100644
index d64c2714ca29..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery::App::App.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- bakery/App/App.h.orig	Thu Jan  2 08:46:33 2003
-+++ bakery/App/App.h	Wed Aug 18 15:50:32 2004
-@@ -93,6 +93,7 @@
- //  virtual void bring_to_front() = 0;
-   //Signal handlers:
- 
-+public:
-   //Menus:
-   virtual void on_menu_file_new();
-   virtual void on_menu_file_close();
-@@ -109,7 +110,7 @@
- 
-   virtual void on_about_close();
- 
--
-+protected:
-   //GUI abstractions:
-   virtual void ui_hide() = 0;
-   virtual void ui_bring_to_front() = 0;
diff --git a/x11-toolkits/bakery/files/patch-bakery::App::App_WithDoc.h b/x11-toolkits/bakery/files/patch-bakery::App::App_WithDoc.h
deleted file mode 100644
index b9d54c0bb660..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery::App::App_WithDoc.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- bakery/App/App_WithDoc.h.orig	Wed Aug 18 15:44:34 2004
-+++ bakery/App/App_WithDoc.h	Wed Aug 18 15:45:06 2004
-@@ -90,7 +90,7 @@
-   static void session_save_document_history();
- 
-   //Signal handlers:
--
-+public:
-   //Menu items:
-   virtual void on_menu_file_open();
-   virtual void on_menu_file_open_recent(guint index); //use with SigC::bind.
-@@ -102,7 +102,8 @@
-   virtual void on_menu_edit_copy();
-   virtual void on_menu_edit_paste();
-   virtual void on_menu_edit_clear();
--  
-+
-+protected:  
-   //Document:
-   ///Update visual status.
-   virtual void on_document_modified();
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index f683cc5219e1..2c45e2083d2e 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -1,11 +1,11 @@
---- bakery/Makefile.in.orig	Fri Nov 28 11:44:02 2003
-+++ bakery/Makefile.in	Fri Nov 28 11:44:17 2003
-@@ -192,7 +192,7 @@
+--- bakery/Makefile.in.orig	Fri Nov 12 01:48:47 2004
++++ bakery/Makefile.in	Fri Nov 12 01:49:10 2004
+@@ -251,7 +251,7 @@
                        View/libbakery_view.la \
                        $(BAKERY_LIBS)
  
--libbakery_2_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-+libbakery_2_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
- subdir = bakery
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-libbakery_2_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libbakery_2_3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/x11-toolkits/bakery/files/patch-bakery::View::View_Composite.h b/x11-toolkits/bakery/files/patch-bakery::View::View_Composite.h
deleted file mode 100644
index cf0636cd8b5b..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery::View::View_Composite.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- bakery/View/View_Composite.h.orig	Wed Aug 18 15:45:34 2004
-+++ bakery/View/View_Composite.h	Wed Aug 18 15:45:52 2004
-@@ -49,7 +49,7 @@
- 	  //This should be unnecessary.
- 	  if(pView)
- 	  {
--  		pView->set_document(get_document());
-+  		pView->set_document(type_view::get_document());
-   		
-   		//Add it to the list of child views:
-   	  m_vecViews.push_back(pView);