- not needed for gcompris 8.2.2

Changed files:
    gcompris-cleanup.patch -> 1.2
    gcompris-include.patch -> 1.2
    gcompris-python-lib.patch -> 1.2

diff --git a/gcompris-cleanup.patch b/gcompris-cleanup.patch
deleted file mode 100644 (file)
index f43d442..0000000
--- a/gcompris-cleanup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -urN gcompris-6.5.3.orig/src/gcompris/interface.c gcompris-6.5.3.new/src/gcompris/interface.c
---- gcompris-6.5.3.orig/src/gcompris/interface.c       2005-04-11 22:55:37.000000000 +0200
-+++ gcompris-6.5.3.new/src/gcompris/interface.c        2005-05-19 21:30:34.724367240 +0200
-@@ -25,26 +25,6 @@
- #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
-   gtk_object_set_data (GTK_OBJECT (component), name, widget)
- 
--static GnomeUIInfo file1_menu_uiinfo[] =
--{
--  GNOMEUIINFO_MENU_EXIT_ITEM (on_quit1_activate, NULL),
--  GNOMEUIINFO_END
--};
--
--static GnomeUIInfo help1_menu_uiinfo[] =
--{
--  GNOMEUIINFO_HELP ("gcompris-edit"),
--  GNOMEUIINFO_MENU_ABOUT_ITEM (on_about1_activate, NULL),
--  GNOMEUIINFO_END
--};
--
--static GnomeUIInfo menubar1_uiinfo[] =
--{
--  GNOMEUIINFO_MENU_FILE_TREE (file1_menu_uiinfo),
--  GNOMEUIINFO_MENU_HELP_TREE (help1_menu_uiinfo),
--  GNOMEUIINFO_END
--};
--
- GtkWidget*
- create_gcompris_edit (void)
- {
-@@ -106,18 +86,6 @@
-   gtk_widget_set_name (bonobodock1, "bonobodock1");
-   gtk_widget_show (bonobodock1);
- 
--  gnome_app_create_menus (GNOME_APP (gcompris_edit), menubar1_uiinfo);
--
--  gtk_widget_set_name (menubar1_uiinfo[0].widget, "file1");
--
--  gtk_widget_set_name (file1_menu_uiinfo[0].widget, "quit1");
--
--  gtk_widget_set_name (menubar1_uiinfo[1].widget, "edit1");
--
--  gtk_widget_set_name (menubar1_uiinfo[2].widget, "help1");
--
--  gtk_widget_set_name (help1_menu_uiinfo[1].widget, "about1");
--
-   toolbar1 = gtk_toolbar_new ();
-   gtk_widget_set_name (toolbar1, "toolbar1");
-   gtk_widget_show (toolbar1);
-@@ -406,11 +374,6 @@
-   /* Store pointers to all widgets, for use by lookup_widget(). */
-   GLADE_HOOKUP_OBJECT_NO_REF (gcompris_edit, gcompris_edit, "gcompris_edit");
-   GLADE_HOOKUP_OBJECT (gcompris_edit, bonobodock1, "bonobodock1");
--  GLADE_HOOKUP_OBJECT (gcompris_edit, menubar1_uiinfo[0].widget, "file1");
--  GLADE_HOOKUP_OBJECT (gcompris_edit, file1_menu_uiinfo[0].widget, "quit1");
--  GLADE_HOOKUP_OBJECT (gcompris_edit, menubar1_uiinfo[1].widget, "edit1");
--  GLADE_HOOKUP_OBJECT (gcompris_edit, menubar1_uiinfo[2].widget, "help1");
--  GLADE_HOOKUP_OBJECT (gcompris_edit, help1_menu_uiinfo[1].widget, "about1");
-   GLADE_HOOKUP_OBJECT (gcompris_edit, toolbar1, "toolbar1");
-   GLADE_HOOKUP_OBJECT (gcompris_edit, hpaned1, "hpaned1");
-   GLADE_HOOKUP_OBJECT (gcompris_edit, scrolledwindow1, "scrolledwindow1");

diff --git a/gcompris-include.patch b/gcompris-include.patch
deleted file mode 100644 (file)
index c48352d..0000000
--- a/gcompris-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN gcompris-6.5.3.orig/src/gcompris/interface.c gcompris-6.5.3.new/src/gcompris/interface.c
---- gcompris-6.5.3.orig/src/gcompris/interface.c       2005-05-19 21:37:05.000000000 +0200
-+++ gcompris-6.5.3.new/src/gcompris/interface.c        2005-05-20 20:51:20.667441800 +0200
-@@ -15,6 +15,7 @@
- #include <gnome.h>
- 
- #include "callbacks.h"
-+#include "gcompris.h"
- #include "interface.h"
- #include "support.h"
- 
-diff -urN gcompris-6.5.3.orig/src/gcompris/support.c gcompris-6.5.3.new/src/gcompris/support.c
---- gcompris-6.5.3.orig/src/gcompris/support.c 2003-12-07 00:02:32.000000000 +0100
-+++ gcompris-6.5.3.new/src/gcompris/support.c  2005-05-20 20:51:40.599411680 +0200
-@@ -14,6 +14,7 @@
- 
- #include <gnome.h>
- 
-+#include "gcompris.h"
- #include "support.h"
- 
- GtkWidget*

diff --git a/gcompris-python-lib.patch b/gcompris-python-lib.patch
deleted file mode 100644 (file)
index 61bc897..0000000
--- a/gcompris-python-lib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -dur gcompris-5.2.orig/configure.in gcompris-5.2/configure.in
---- gcompris-5.2.orig/configure.in     2004-02-16 22:41:29.000000000 +0100
-+++ gcompris-5.2/configure.in  2004-04-08 09:01:26.155107083 +0200
-@@ -201,7 +201,7 @@
-   if test x$build_python_plugin = xyes; then
-     dnl Search for python's libs
-     dnl Take the needed libraries into the lib/python/config/Makefile... (see dia config)
--    python_makefile="${python_exec_prefix}/lib/python${python_version}/config/Makefile"
-+    python_makefile="${libdir}/python${python_version}/config/Makefile"
-     if test -f "${python_makefile}"; then
-     dnl extra required libs
-       python_localmodlibs=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $python_makefile`
-@@ -211,10 +211,10 @@
-       python_libs="${python_localmodlibs} ${python_basemodlibs} ${python_other_libs}"
- 
-       python_old_ldflags=${LDFLAGS}
--      LDFLAGS="${LDFLAGS} ${python_libs_cflags} -L${python_exec_prefix}/lib/python${python_version}/config ${python_libs}"
-+      LDFLAGS="${LDFLAGS} ${python_libs_cflags} -L${libdir}/python${python_version}/config ${python_libs}"
-       AC_CHECK_LIB(python${python_version}, 
-                    Py_Initialize, 
--                   PYTHON_LIBS="${python_libs_cflags} -L${python_exec_prefix}/lib/python${python_version}/config -lpython${python_version} ${python_libs}",
-+                   PYTHON_LIBS="${python_libs_cflags} -L${libdir}/python${python_version}/config -lpython${python_version} ${python_libs}",
-                    [ AC_MSG_WARN([Couldn't find python library, python plugin disabled.])
-                      build_python_plugin=no ])  
-       LDFLAGS=${python_old_ldflags}
-Only in gcompris-5.2: configure.in~