From 4bdc304d25761c60ec06a23be8d7db85c50cab9b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Oct 2009 12:49:56 +0200 Subject: totem: clean up totem dir --- recipes/totem/files/cflags.patch | 33 ------------------------------- recipes/totem/files/gtkonly.patch | 38 ------------------------------------ recipes/totem/files/include.patch | 11 ----------- recipes/totem/files/intl.patch | 33 ------------------------------- recipes/totem/files/nonautilus.patch | 16 --------------- recipes/totem/files/omf.patch | 13 ------------ 6 files changed, 144 deletions(-) delete mode 100644 recipes/totem/files/cflags.patch delete mode 100644 recipes/totem/files/gtkonly.patch delete mode 100644 recipes/totem/files/include.patch delete mode 100644 recipes/totem/files/intl.patch delete mode 100644 recipes/totem/files/nonautilus.patch delete mode 100644 recipes/totem/files/omf.patch (limited to 'recipes/totem/files') diff --git a/recipes/totem/files/cflags.patch b/recipes/totem/files/cflags.patch deleted file mode 100644 index a03247332f..0000000000 --- a/recipes/totem/files/cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- totem-1.0.4/src/Makefile.am~cflags -+++ totem-1.0.4/src/Makefile.am -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = bvw-test list_v4l test-parser disc-test metadata-test -+#noinst_PROGRAMS = bvw-test list_v4l test-parser disc-test metadata-test - - if TOTEM_VANITY - VANITY=vanity -@@ -179,8 +179,10 @@ - list_v4l_SOURCES = list_v4l.c $(BACON_V4L_SELECTION) - list_v4l_LDADD = $(GTK_LIBS) - -+test_parser_CFLAGS = $(TOTEM_PLPARSER_CFLAGS) - test_parser_SOURCES = test-parser.c - test_parser_LDADD = \ -+ $(TOTEM_PLPARSER_LIBS) - $(EXTRA_GNOME_LIBS) \ - libtotem-plparser.la - -@@ -224,6 +226,8 @@ - totem-disc.h \ - totem-pl-parser.h - -+libtotem_plparser_la_CFLAGS = $(TOTEM_PLPARSER_CFLAGS) -+ - libtotem_plparser_la_LDFLAGS = \ - -version-info $(PLPARSER_LT_VERSION) \ - -no-undefined \ diff --git a/recipes/totem/files/gtkonly.patch b/recipes/totem/files/gtkonly.patch deleted file mode 100644 index 8a7fbd2a0b..0000000000 --- a/recipes/totem/files/gtkonly.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- totem-1.0.4/src/totem.c~gtkonly -+++ totem-1.0.4/src/totem.c -@@ -1667,8 +1667,10 @@ - totem_action_set_mrl_and_play (totem, mrl); - g_free (mrl); - -+#ifndef HAVE_GTK_ONLY - gnome_entry_append_history (GNOME_ENTRY (gentry), - TRUE, uri); -+#endif - } - } - -@@ -3593,7 +3595,9 @@ - /* Properties */ - totem->properties = bacon_video_widget_properties_new (); - -+#ifndef HAVE_GTK_ONLY - totem_session_setup (totem, argv); -+#endif - totem_setup_recent (totem); - totem_callback_connect (totem); - totem_setup_window (totem); -@@ -3617,7 +3621,9 @@ - /* Command-line handling */ - if (totem_options_process_late (totem, &argc, &argv) != FALSE) - { -+#ifndef HAVE_GTK_ONLY - totem_session_restore (totem, argv); -+#endif - } else if (argc >= 1 && totem_action_open_files (totem, argv)) { - totem_action_play_pause (totem); - } else { diff --git a/recipes/totem/files/include.patch b/recipes/totem/files/include.patch deleted file mode 100644 index 6e99c4e21e..0000000000 --- a/recipes/totem/files/include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- totem-0.99.15/src/video-utils.c 2004-07-03 16:54:31.000000000 -0700 -+++ totem-0.99.15.new/src/video-utils.c 2004-08-04 11:03:30.822669856 -0700 -@@ -4,7 +4,7 @@ - #include "video-utils.h" - - #include --#include -+/* #include */ - - #include - #include diff --git a/recipes/totem/files/intl.patch b/recipes/totem/files/intl.patch deleted file mode 100644 index 2a1a32cc2d..0000000000 --- a/recipes/totem/files/intl.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- totem-1.0.4/src/totem.c~intl -+++ totem-1.0.4/src/totem.c -@@ -35,6 +35,25 @@ - #include - #include - #include -+#ifdef ENABLE_NLS -+# include -+# define _(String) dgettext (GETTEXT_PACKAGE, String) -+# ifdef gettext_noop -+# define N_(String) gettext_noop (String) -+# else -+# define N_(String) (String) -+# endif -+#else -+/* Stubs that do something close enough. */ -+# define textdomain(String) (String) -+# define gettext(String) (String) -+# define dgettext(Domain,Message) (Message) -+# define dcgettext(Domain,Message,Type) (Message) -+# define ngettext(Singular, Plural, IsPlural) (Singular) -+# define bindtextdomain(Domain,Directory) (Domain) -+# define _(String) (String) -+# define N_(String) (String) -+#endif - #endif /* !HAVE_GTK_ONLY */ - - #include diff --git a/recipes/totem/files/nonautilus.patch b/recipes/totem/files/nonautilus.patch deleted file mode 100644 index 3cfce7c9aa..0000000000 --- a/recipes/totem/files/nonautilus.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- totem-1.0.4/configure.in~nonautilus -+++ totem-1.0.4/configure.in -@@ -144,7 +144,7 @@ - PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= 2.6.3 gtk+-2.0 >= 2.5.6 libgnomeui-2.0 >= 2.3.3 libglade-2.0 gnome-vfs-2.0 >= 2.1.6 gnome-vfs-module-2.0 >= 2.1.6 gnome-desktop-2.0 >= 2.1.5 $MM) - HAVE_GNOME=yes - else -- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= 2.6.3 gtk+-2.0 >= 2.5.6 libglade-2.0 gnome-vfs-2.0 >= 2.1.6 gnome-vfs-module-2.0 >= 2.1.6 libnautilus-burn >= 2.9.0 $MM) -+ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= 2.6.3 gtk+-2.0 >= 2.5.6 libglade-2.0 gnome-vfs-2.0 >= 2.1.6 gnome-vfs-module-2.0 >= 2.1.6 $MM) - AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME]) - AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used]) - HAVE_GNOME=no diff --git a/recipes/totem/files/omf.patch b/recipes/totem/files/omf.patch deleted file mode 100644 index a889db10ba..0000000000 --- a/recipes/totem/files/omf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- totem-0.99.12/omf.make 2003-11-08 18:04:41.000000000 -0700 -+++ totem-0.99.12.new/omf.make 2004-06-30 09:39:58.765495480 -0700 -@@ -41,7 +41,9 @@ - install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ -- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ if [ -f $$file.out ]; then \ -+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ fi; \ - done - -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir) - -- cgit v1.2.3