diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
commit | 3383a1fbd954b78716dd8ff9d9f2097e176d2279 (patch) | |
tree | 68aa3acbd50e6d0d7bdcfa2947d1772f7edb8a0d /community-testing/gnash/xul8.patch | |
parent | 7f3d7e2203a9252280361a1d095528cb056d08dc (diff) | |
parent | 9e9ab642711f2424f828e21d14b98c45cdef2b29 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/liboglappth/PKGBUILD
community/texvc/PKGBUILD
extra/libvdpau/PKGBUILD
extra/minicom/PKGBUILD
extra/muparser/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/normalize/PKGBUILD
Diffstat (limited to 'community-testing/gnash/xul8.patch')
-rw-r--r-- | community-testing/gnash/xul8.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/community-testing/gnash/xul8.patch b/community-testing/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community-testing/gnash/xul8.patch @@ -0,0 +1,44 @@ +diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp +--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 +@@ -238,7 +238,7 @@ + return NS_PluginInitialize(); + } + +-char * ++const char * + NP_GetMIMEDescription(void) + { + return NPP_GetMIMEDescription(); +diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp +--- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 +@@ -128,10 +128,10 @@ + } + + /// \brief Return the MIME Type description for this plugin. +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- return const_cast<char *>(MIME_TYPES_DESCRIPTION); ++ return MIME_TYPES_DESCRIPTION; + } + + static bool waitforgdb = false; +diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp +--- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 +@@ -408,10 +408,10 @@ + { + } + +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- char *x = 0; ++ const char *x = 0; + return x; + } + |