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
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')
-rw-r--r--net-www/gnash/Manifest28
-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
4 files changed, 8 insertions, 76 deletions
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index fe2075864a81..f32a315af06f 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,7 +1,3 @@
-AUX do-sound.diff 347 RMD160 272f7aedc1a2206db40fe958cf6ae5046d03b3a7 SHA1 cb245af8b83418df92ff8abb6eb38b0d5e17a959 SHA256 ea24631c9c8f4e59c0a6b4d80beec161b1fbb3030af91bd71b103e44f47b01aa
-MD5 3c214830e3907f01c66bad3cf720bad8 files/do-sound.diff 347
-RMD160 272f7aedc1a2206db40fe958cf6ae5046d03b3a7 files/do-sound.diff 347
-SHA256 ea24631c9c8f4e59c0a6b4d80beec161b1fbb3030af91bd71b103e44f47b01aa files/do-sound.diff 347
AUX gnash-0.7.1_p20060704-opengl.diff 829 RMD160 68dae8f130e6dfbd2051007c7f819b47e1889334 SHA1 ef7603ec759d628404e97aab7f2b73d70f6daeb2 SHA256 ff88cbac28c3465f8f7ea46f0bc61cfa2e016dade9b56ce729a44734d2798729
MD5 4a1d412f7aab9b5b69ed4e6bba4780c2 files/gnash-0.7.1_p20060704-opengl.diff 829
RMD160 68dae8f130e6dfbd2051007c7f819b47e1889334 files/gnash-0.7.1_p20060704-opengl.diff 829
@@ -10,27 +6,19 @@ AUX gnash-fix-cxxflags-rpath.patch 2189 RMD160 b092e04727a686bd971c77e3619a418a5
MD5 9e955f27087ffa5ef139acfa2c05b7d1 files/gnash-fix-cxxflags-rpath.patch 2189
RMD160 b092e04727a686bd971c77e3619a418a5dbcc37f files/gnash-fix-cxxflags-rpath.patch 2189
SHA256 553fcad662bec090d2739bb3d69becb05b3d4f299cb79108f9cfd1969a4af418 files/gnash-fix-cxxflags-rpath.patch 2189
-AUX kdedir.diff 549 RMD160 50c3e78b0f2eeb6df8227ba7e8a7821d92557569 SHA1 d229740e3c2a4486ba4b1adcff663765d9d95c64 SHA256 5ff50d54853527ff4f6b94f90c16a31fa4a5d62ffa3f84c53bec6e4dcfc25876
-MD5 a62b476b9e36250b99438667ff08de02 files/kdedir.diff 549
-RMD160 50c3e78b0f2eeb6df8227ba7e8a7821d92557569 files/kdedir.diff 549
-SHA256 5ff50d54853527ff4f6b94f90c16a31fa4a5d62ffa3f84c53bec6e4dcfc25876 files/kdedir.diff 549
-AUX klash-makefile.diff 801 RMD160 81104db2821cf5353e4296b5a59ef39c61bc1ee6 SHA1 4d246981990683b6ec9363959fb549419f7f1d7e SHA256 4ee71a2d625847b833d135eb1c301cda3f877b9e540d2cefbb93b873dab566f0
-MD5 0f00152a4872e504338791a5aa0eccd3 files/klash-makefile.diff 801
-RMD160 81104db2821cf5353e4296b5a59ef39c61bc1ee6 files/klash-makefile.diff 801
-SHA256 4ee71a2d625847b833d135eb1c301cda3f877b9e540d2cefbb93b873dab566f0 files/klash-makefile.diff 801
DIST gnash-0.7.1_p20060704.tar.bz2 3287215 RMD160 708ebf8a2a4d26c8a1ba14465ab12662e00a5f11 SHA1 48bff4683b48611874844c406baca7f12cf64a4c SHA256 e236556ab800adad5dfd37aa55bb1b12ba2a8ecb4d0de277505e7a7eb7446d88
EBUILD gnash-0.7.1_p20060704.ebuild 2686 RMD160 9fd1fb570d7d2962f795f5973882c2c4e33a27e8 SHA1 2954d70b1644a96d3f2f13ac0c2e580c102f523f SHA256 8399cc3786b6473d2c7b56280df9e7aab66aa299fc972099903b2b017b540492
MD5 bf738eb32b77f43f125d8341e9a7b58e gnash-0.7.1_p20060704.ebuild 2686
RMD160 9fd1fb570d7d2962f795f5973882c2c4e33a27e8 gnash-0.7.1_p20060704.ebuild 2686
SHA256 8399cc3786b6473d2c7b56280df9e7aab66aa299fc972099903b2b017b540492 gnash-0.7.1_p20060704.ebuild 2686
-EBUILD gnash-0.7.1_p20090909.ebuild 2905 RMD160 97c3bcb63faa1b607d8c79ab6914dfd5e7341ead SHA1 91d7c33941cc9b012e7e81dac03d9b02f3610d69 SHA256 564ce26d68d9ca4a6ab92f6ce2a0c20f60de974c9b8f513cd1cf6744f2e9495d
-MD5 e364fef78d77ea31f8a05647d8ec8286 gnash-0.7.1_p20090909.ebuild 2905
-RMD160 97c3bcb63faa1b607d8c79ab6914dfd5e7341ead gnash-0.7.1_p20090909.ebuild 2905
-SHA256 564ce26d68d9ca4a6ab92f6ce2a0c20f60de974c9b8f513cd1cf6744f2e9495d gnash-0.7.1_p20090909.ebuild 2905
-MISC ChangeLog 3892 RMD160 4714e431af370a21f872bd16588bad7bc3590430 SHA1 1cd59259167aa19d26afc299ea692392b4533575 SHA256 89fab7751c762b598faefea5ec1238ad25ab8de50689e43eba07f5a06ce7fbb9
-MD5 3ea05498ae979535901c90df1b3d46a4 ChangeLog 3892
-RMD160 4714e431af370a21f872bd16588bad7bc3590430 ChangeLog 3892
-SHA256 89fab7751c762b598faefea5ec1238ad25ab8de50689e43eba07f5a06ce7fbb9 ChangeLog 3892
+EBUILD gnash-0.7.1_p20090909.ebuild 2783 RMD160 0ad0aa072bf23e63260436093e06170321f41bf8 SHA1 53af296087f03f1f8a7aa7e44ba6a6d97e1ccb50 SHA256 3158b54767a394ac3cf120822870fe35376edcbf41b71c7ae928ffd3f813aac5
+MD5 781e40736e7fe13194c04bce3da8eb6f gnash-0.7.1_p20090909.ebuild 2783
+RMD160 0ad0aa072bf23e63260436093e06170321f41bf8 gnash-0.7.1_p20090909.ebuild 2783
+SHA256 3158b54767a394ac3cf120822870fe35376edcbf41b71c7ae928ffd3f813aac5 gnash-0.7.1_p20090909.ebuild 2783
+MISC ChangeLog 4098 RMD160 8c61f70a1d72cfef012462a22f15d5cb5f763dbb SHA1 48f2a06e70afe3da7b8dbec80c59ed5d3c5285c8 SHA256 8a12ef6d25f1c10bb23e1b480b49921bd794a74193dc2b2634c69e424be721c8
+MD5 204c37b84ed8ac5446e8f051d1eaa98f ChangeLog 4098
+RMD160 8c61f70a1d72cfef012462a22f15d5cb5f763dbb ChangeLog 4098
+SHA256 8a12ef6d25f1c10bb23e1b480b49921bd794a74193dc2b2634c69e424be721c8 ChangeLog 4098
MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
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)