summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-08-13 18:06:11 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-08-13 18:06:11 +0000
commit688bb6d5befd345836da43d998389b7093879ec0 (patch)
treeb04918eeaf758d0fd9c8f7c83aa9a9cbd23fc863 /net-www/gnash/files
parentremove some patches that got applied upstream (diff)
downloadgentoo-2-688bb6d5befd345836da43d998389b7093879ec0.tar.gz
gentoo-2-688bb6d5befd345836da43d998389b7093879ec0.tar.bz2
gentoo-2-688bb6d5befd345836da43d998389b7093879ec0.zip
remove some patches that got applied upstream
(Portage version: 2.1.1_pre5) (Unsigned Manifest commit)
Diffstat (limited to 'net-www/gnash/files')
-rw-r--r--net-www/gnash/files/do-sound.diff11
-rw-r--r--net-www/gnash/files/kdedir.diff11
-rw-r--r--net-www/gnash/files/klash-makefile.diff34
3 files changed, 0 insertions, 56 deletions
diff --git a/net-www/gnash/files/do-sound.diff b/net-www/gnash/files/do-sound.diff
deleted file mode 100644
index ce6b75a8c205..000000000000
--- a/net-www/gnash/files/do-sound.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnash/backend/gnash.cpp.orig 2006-08-13 00:50:40.000000000 +0200
-+++ gnash/backend/gnash.cpp 2006-08-13 00:50:57.000000000 +0200
-@@ -250,7 +250,7 @@
-
- float exit_timeout = 0;
- bool do_render = true;
-- bool do_sound = false;
-+ bool do_sound = true;
- bool do_loop = true;
- bool sdl_abort = true;
- int delay = 31;
diff --git a/net-www/gnash/files/kdedir.diff b/net-www/gnash/files/kdedir.diff
deleted file mode 100644
index cb6df8127c2f..000000000000
--- a/net-www/gnash/files/kdedir.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- macros/kde.m4.orig 2006-08-06 11:52:41.000000000 +0200
-+++ macros/kde.m4 2006-08-06 11:53:03.000000000 +0200
-@@ -1869,7 +1869,7 @@
-
- KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-
--KDE_LDFLAGS=`echo $kde_libraries | sed -e 's:/usr/lib64::;s:/usr/lib::'`
-+KDE_LDFLAGS="-L`echo $kde_libraries | sed -e 's:/usr/lib64::;s:/usr/lib::'`"
-
- if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
- all_libraries="$KDE_LDFLAGS $all_libraries"
diff --git a/net-www/gnash/files/klash-makefile.diff b/net-www/gnash/files/klash-makefile.diff
deleted file mode 100644
index 8367e0453876..000000000000
--- a/net-www/gnash/files/klash-makefile.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.am.orig 2006-08-06 08:43:09.000000000 +0200
-+++ Makefile.am 2006-08-06 08:44:13.000000000 +0200
-@@ -50,11 +50,16 @@
- PLUGIN_DIRS = plugin
- endif
-
-+if KLASH
-+KLASH_DIRS = plugin/klash
-+endif
-+
-+
- if DOCBOOK
- DOC_DIRS = doc
- endif
-
--SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
-+SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(KLASH_DIRS)
-
- # libamf isn't used yet, but we still want it in the distribution
- DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin
---- plugin/Makefile.am.orig 2006-08-06 08:43:00.000000000 +0200
-+++ plugin/Makefile.am 2006-08-06 08:43:21.000000000 +0200
-@@ -38,11 +38,6 @@
-
- AUTOMAKE_OPTIONS = dejagnu
-
--if KLASH
--KLASH = klash
--endif
--SUBDIRS = $(KLASH) # test mozilla-sdk
--
- if MP3
- MP3_CFLAGS = $(MAD_CFLAGS)
- MP3_LIBS = $(MAD_LIBS)