From ae10abab3d9f7fa2123ccfe811d560c1b26ce472 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 2 Oct 2010 09:13:12 +0200 Subject: maemo : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- .../maemo/hildon-control-panel/config-path.patch | 14 ----- recipes/maemo/hildon-control-panel/noWerror.patch | 11 ---- recipes/maemo/libosso-help/help-header-pp.patch | 18 ------ recipes/maemo/libosso-help/no-Werror.patch | 33 ----------- .../fix-buildsystem.patch | 65 ---------------------- .../maemo/hildon-control-panel/config-path.patch | 14 +++++ .../maemo/hildon-control-panel/noWerror.patch | 11 ++++ .../maemo/libosso-help/help-header-pp.patch | 18 ++++++ .../obsolete/maemo/libosso-help/no-Werror.patch | 33 +++++++++++ .../fix-buildsystem.patch | 65 ++++++++++++++++++++++ 10 files changed, 141 insertions(+), 141 deletions(-) delete mode 100644 recipes/maemo/hildon-control-panel/config-path.patch delete mode 100644 recipes/maemo/hildon-control-panel/noWerror.patch delete mode 100644 recipes/maemo/libosso-help/help-header-pp.patch delete mode 100644 recipes/maemo/libosso-help/no-Werror.patch delete mode 100644 recipes/maemo/osso-application-installer/fix-buildsystem.patch create mode 100644 recipes/obsolete/maemo/hildon-control-panel/config-path.patch create mode 100644 recipes/obsolete/maemo/hildon-control-panel/noWerror.patch create mode 100644 recipes/obsolete/maemo/libosso-help/help-header-pp.patch create mode 100644 recipes/obsolete/maemo/libosso-help/no-Werror.patch create mode 100644 recipes/obsolete/maemo/osso-application-installer/fix-buildsystem.patch diff --git a/recipes/maemo/hildon-control-panel/config-path.patch b/recipes/maemo/hildon-control-panel/config-path.patch deleted file mode 100644 index ccee27d9ce..0000000000 --- a/recipes/maemo/hildon-control-panel/config-path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.ac.old 2005-06-09 18:11:18.000000000 +0200 -+++ configure.ac 2005-06-09 18:22:01.000000000 +0200 -@@ -53,9 +53,9 @@ - AC_SUBST(HILDONBASELIB_CFLAGS) - - PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1) --localedir=`pkg-config osso-af-settings --variable=localedir` -+localedir="${prefix}/share/locale" - AC_SUBST(localedir) --hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir` -+hildondesktopentrydir="${prefix}/share/applications/hildon" - AC_SUBST(hildondesktopentrydir) - - PKG_CHECK_MODULES(LIBOSSOHELP, libossohelp >= 0.0.4) diff --git a/recipes/maemo/hildon-control-panel/noWerror.patch b/recipes/maemo/hildon-control-panel/noWerror.patch deleted file mode 100644 index 4cbb744fd4..0000000000 --- a/recipes/maemo/hildon-control-panel/noWerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac~ 2005-07-03 18:54:13.000000000 +0200 -+++ configure.ac 2005-07-03 18:54:13.000000000 +0200 -@@ -33,7 +33,7 @@ - # D-BUS headers do not compile with -pedantic. Once they are fixed, - #return the flag - #CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations -Werror" --CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror -lcrypt" -+CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -lcrypt" - AC_SUBST(CFLAGS) - - PKG_CHECK_MODULES(OSSO,libosso >= 0.0.3) diff --git a/recipes/maemo/libosso-help/help-header-pp.patch b/recipes/maemo/libosso-help/help-header-pp.patch deleted file mode 100644 index d0769911d2..0000000000 --- a/recipes/maemo/libosso-help/help-header-pp.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- helplib/osso-helplib.h.old 2005-06-09 17:47:50.000000000 +0200 -+++ helplib/osso-helplib.h 2005-06-09 17:48:03.000000000 +0200 -@@ -76,7 +76,7 @@ - const gchar *help_id, - guint flags ); - --// Helper macros (deprecated) -+/* Helper macros (deprecated) */ - #define ossohelp_dialog( osso, help_id ) \ - ossohelp_show( (osso), (help_id), OSSO_HELP_SHOW_DIALOG ) - #define ossohelp_exists( help_id ) \ -@@ -86,5 +86,5 @@ - } - #endif - --#endif // OSSO_HELPLIB_H -+#endif /* OSSO_HELPLIB_H */ - diff --git a/recipes/maemo/libosso-help/no-Werror.patch b/recipes/maemo/libosso-help/no-Werror.patch deleted file mode 100644 index b50d50fc51..0000000000 --- a/recipes/maemo/libosso-help/no-Werror.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.ac.old 2005-06-09 17:27:01.000000000 +0200 -+++ configure.ac 2005-06-09 17:27:20.000000000 +0200 -@@ -29,7 +29,7 @@ - # Set compilation flags - - CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations \ -- -pedantic-errors -Wcast-align -std=c99 -Werror" -+ -Wcast-align -std=c99" - - # So says the Coding Spec (doesn't -Wall cover these..?!?) - CFLAGS+="-Wunreachable-code -Wcast-align" ---- helplib/Makefile.am.old 2005-06-09 17:33:08.000000000 +0200 -+++ helplib/Makefile.am 2005-06-09 17:33:47.000000000 +0200 -@@ -21,7 +21,7 @@ - - # Disable this only if system libs give warnings: - # --libossohelp_la_CFLAGS+=-pedantic-errors -Werror -+#libossohelp_la_CFLAGS+=-pedantic-errors - - libossohelp_la_includedir = $(includedir) - libossohelp_la_include_HEADERS = osso-helplib.h ---- helptest/Makefile.am.old 2005-06-09 17:34:44.000000000 +0200 -+++ helptest/Makefile.am 2005-06-09 17:34:55.000000000 +0200 -@@ -23,7 +23,7 @@ - - # Disable this only if system libs give warnings: - # --helptest_CFLAGS+=-pedantic-errors -Werror -+#helptest_CFLAGS+=-pedantic-errors - - helptest_SOURCES = \ - helptest.c diff --git a/recipes/maemo/osso-application-installer/fix-buildsystem.patch b/recipes/maemo/osso-application-installer/fix-buildsystem.patch deleted file mode 100644 index d89522bbb5..0000000000 --- a/recipes/maemo/osso-application-installer/fix-buildsystem.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac ---- osso-application-installer-1.0.03_old/configure.ac 2005-05-22 22:06:52.000000000 +0200 -+++ osso-application-installer-1.0.03/configure.ac 2005-06-30 12:19:24.000000000 +0200 -@@ -38,9 +38,9 @@ - AC_SUBST(CP_CFLAGS) - AC_SUBST(CP_LIBS) - --cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir` -+cp_pluginlibdir=${libdir}/hildon-control-panel - AC_SUBST(cp_pluginlibdir) --cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir` -+cp_plugindesktopdir=${datadir}/applications/hildon-control-panel - AC_SUBST(cp_plugindesktopdir) - - # Localisation-related -@@ -52,12 +52,12 @@ - AM_GLIB_GNU_GETTEXT - - # Mime crap --dnl MIME-type registration check (2.6 / 2.8 version) --AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) --AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) -+#dnl MIME-type registration check (2.6 / 2.8 version) -+#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) -+#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) - --AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) --AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) -+#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) -+#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) - - - applicationinstallerlocaledir=${datadir}/locale -@@ -76,7 +76,7 @@ - AC_SUBST(hildonpixmapdir) - AC_SUBST(hildonstatusbarlibdir) - --dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1` -+dbuslibpathdir=${libdir} - dbusconfdir=/etc/dbus-1/system.d - dbusservdir=${dbuslibpathdir}/dbus-1.0/services - AC_SUBST(dbuslibpathdir) -diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am ---- osso-application-installer-1.0.03_old/mime/Makefile.am 2005-05-22 22:06:52.000000000 +0200 -+++ osso-application-installer-1.0.03/mime/Makefile.am 2005-06-30 12:19:24.000000000 +0200 -@@ -2,19 +2,3 @@ - mime_DATA = osso-application-installer.xml - - EXTRA_DIST = $(mime_DATA) -- --install-data-hook: --if HAVE_26_MIME -- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" --endif --if HAVE_28_MIME -- $(UPDATE_DESKTOP_DATABASE) --endif -- --uninstall-hook: --if HAVE_26_MIME -- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" --endif --if HAVE_28_MIME -- $(UPDATE_DESKTOP_DATABASE) --endif diff --git a/recipes/obsolete/maemo/hildon-control-panel/config-path.patch b/recipes/obsolete/maemo/hildon-control-panel/config-path.patch new file mode 100644 index 0000000000..ccee27d9ce --- /dev/null +++ b/recipes/obsolete/maemo/hildon-control-panel/config-path.patch @@ -0,0 +1,14 @@ +--- configure.ac.old 2005-06-09 18:11:18.000000000 +0200 ++++ configure.ac 2005-06-09 18:22:01.000000000 +0200 +@@ -53,9 +53,9 @@ + AC_SUBST(HILDONBASELIB_CFLAGS) + + PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1) +-localedir=`pkg-config osso-af-settings --variable=localedir` ++localedir="${prefix}/share/locale" + AC_SUBST(localedir) +-hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir` ++hildondesktopentrydir="${prefix}/share/applications/hildon" + AC_SUBST(hildondesktopentrydir) + + PKG_CHECK_MODULES(LIBOSSOHELP, libossohelp >= 0.0.4) diff --git a/recipes/obsolete/maemo/hildon-control-panel/noWerror.patch b/recipes/obsolete/maemo/hildon-control-panel/noWerror.patch new file mode 100644 index 0000000000..4cbb744fd4 --- /dev/null +++ b/recipes/obsolete/maemo/hildon-control-panel/noWerror.patch @@ -0,0 +1,11 @@ +--- configure.ac~ 2005-07-03 18:54:13.000000000 +0200 ++++ configure.ac 2005-07-03 18:54:13.000000000 +0200 +@@ -33,7 +33,7 @@ + # D-BUS headers do not compile with -pedantic. Once they are fixed, + #return the flag + #CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations -Werror" +-CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror -lcrypt" ++CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -lcrypt" + AC_SUBST(CFLAGS) + + PKG_CHECK_MODULES(OSSO,libosso >= 0.0.3) diff --git a/recipes/obsolete/maemo/libosso-help/help-header-pp.patch b/recipes/obsolete/maemo/libosso-help/help-header-pp.patch new file mode 100644 index 0000000000..d0769911d2 --- /dev/null +++ b/recipes/obsolete/maemo/libosso-help/help-header-pp.patch @@ -0,0 +1,18 @@ +--- helplib/osso-helplib.h.old 2005-06-09 17:47:50.000000000 +0200 ++++ helplib/osso-helplib.h 2005-06-09 17:48:03.000000000 +0200 +@@ -76,7 +76,7 @@ + const gchar *help_id, + guint flags ); + +-// Helper macros (deprecated) ++/* Helper macros (deprecated) */ + #define ossohelp_dialog( osso, help_id ) \ + ossohelp_show( (osso), (help_id), OSSO_HELP_SHOW_DIALOG ) + #define ossohelp_exists( help_id ) \ +@@ -86,5 +86,5 @@ + } + #endif + +-#endif // OSSO_HELPLIB_H ++#endif /* OSSO_HELPLIB_H */ + diff --git a/recipes/obsolete/maemo/libosso-help/no-Werror.patch b/recipes/obsolete/maemo/libosso-help/no-Werror.patch new file mode 100644 index 0000000000..b50d50fc51 --- /dev/null +++ b/recipes/obsolete/maemo/libosso-help/no-Werror.patch @@ -0,0 +1,33 @@ +--- configure.ac.old 2005-06-09 17:27:01.000000000 +0200 ++++ configure.ac 2005-06-09 17:27:20.000000000 +0200 +@@ -29,7 +29,7 @@ + # Set compilation flags + + CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations \ +- -pedantic-errors -Wcast-align -std=c99 -Werror" ++ -Wcast-align -std=c99" + + # So says the Coding Spec (doesn't -Wall cover these..?!?) + CFLAGS+="-Wunreachable-code -Wcast-align" +--- helplib/Makefile.am.old 2005-06-09 17:33:08.000000000 +0200 ++++ helplib/Makefile.am 2005-06-09 17:33:47.000000000 +0200 +@@ -21,7 +21,7 @@ + + # Disable this only if system libs give warnings: + # +-libossohelp_la_CFLAGS+=-pedantic-errors -Werror ++#libossohelp_la_CFLAGS+=-pedantic-errors + + libossohelp_la_includedir = $(includedir) + libossohelp_la_include_HEADERS = osso-helplib.h +--- helptest/Makefile.am.old 2005-06-09 17:34:44.000000000 +0200 ++++ helptest/Makefile.am 2005-06-09 17:34:55.000000000 +0200 +@@ -23,7 +23,7 @@ + + # Disable this only if system libs give warnings: + # +-helptest_CFLAGS+=-pedantic-errors -Werror ++#helptest_CFLAGS+=-pedantic-errors + + helptest_SOURCES = \ + helptest.c diff --git a/recipes/obsolete/maemo/osso-application-installer/fix-buildsystem.patch b/recipes/obsolete/maemo/osso-application-installer/fix-buildsystem.patch new file mode 100644 index 0000000000..d89522bbb5 --- /dev/null +++ b/recipes/obsolete/maemo/osso-application-installer/fix-buildsystem.patch @@ -0,0 +1,65 @@ +diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac +--- osso-application-installer-1.0.03_old/configure.ac 2005-05-22 22:06:52.000000000 +0200 ++++ osso-application-installer-1.0.03/configure.ac 2005-06-30 12:19:24.000000000 +0200 +@@ -38,9 +38,9 @@ + AC_SUBST(CP_CFLAGS) + AC_SUBST(CP_LIBS) + +-cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir` ++cp_pluginlibdir=${libdir}/hildon-control-panel + AC_SUBST(cp_pluginlibdir) +-cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir` ++cp_plugindesktopdir=${datadir}/applications/hildon-control-panel + AC_SUBST(cp_plugindesktopdir) + + # Localisation-related +@@ -52,12 +52,12 @@ + AM_GLIB_GNU_GETTEXT + + # Mime crap +-dnl MIME-type registration check (2.6 / 2.8 version) +-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) +-AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) ++#dnl MIME-type registration check (2.6 / 2.8 version) ++#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) ++#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) + +-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) +-AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) ++#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) ++#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) + + + applicationinstallerlocaledir=${datadir}/locale +@@ -76,7 +76,7 @@ + AC_SUBST(hildonpixmapdir) + AC_SUBST(hildonstatusbarlibdir) + +-dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1` ++dbuslibpathdir=${libdir} + dbusconfdir=/etc/dbus-1/system.d + dbusservdir=${dbuslibpathdir}/dbus-1.0/services + AC_SUBST(dbuslibpathdir) +diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am +--- osso-application-installer-1.0.03_old/mime/Makefile.am 2005-05-22 22:06:52.000000000 +0200 ++++ osso-application-installer-1.0.03/mime/Makefile.am 2005-06-30 12:19:24.000000000 +0200 +@@ -2,19 +2,3 @@ + mime_DATA = osso-application-installer.xml + + EXTRA_DIST = $(mime_DATA) +- +-install-data-hook: +-if HAVE_26_MIME +- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" +-endif +-if HAVE_28_MIME +- $(UPDATE_DESKTOP_DATABASE) +-endif +- +-uninstall-hook: +-if HAVE_26_MIME +- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" +-endif +-if HAVE_28_MIME +- $(UPDATE_DESKTOP_DATABASE) +-endif -- cgit 1.2.3-korg