[packages/icedtea7: 86/103] - rel 6; xul build fix

jajcus jajcus at pld-linux.org
Fri Apr 19 13:15:02 CEST 2013


commit 117d25a1b0c41cfb2b9fb0c3a55fce31e0462b29
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Feb 11 08:41:54 2012 +0000

    - rel 6; xul build fix
    
    Changed files:
        icedtea6-xul.patch -> 1.1
        icedtea6.spec -> 1.78

 icedtea6-xul.patch | 11 +++++++++++
 icedtea6.spec      |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 66d4de3..141d986 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -21,7 +21,7 @@ Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea6
 Version:	1.8.3
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
@@ -41,6 +41,7 @@ Patch2:		%{name}-no_dtdtype_patch.patch
 Patch3:		%{name}-rpath.patch
 Patch4:		%{name}-libpath.patch
 Patch5:		%{name}-system_tray.patch
+Patch6:		%{name}-xul.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 BuildRequires:	ant-nodeps
@@ -412,6 +413,8 @@ Wtyczka z obsługą Javy dla przeglądarek WWW.
 mkdir -p pld-patches
 cp "%{PATCH5}" pld-patches
 
+%patch6 -p1
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
diff --git a/icedtea6-xul.patch b/icedtea6-xul.patch
new file mode 100644
index 0000000..f6e00b7
--- /dev/null
+++ b/icedtea6-xul.patch
@@ -0,0 +1,11 @@
+--- icedtea6-1.8.3/plugin/icedteanp/IcedTeaNPPlugin.cc~	2010-10-04 17:58:58.000000000 +0200
++++ icedtea6-1.8.3/plugin/icedteanp/IcedTeaNPPlugin.cc	2012-02-11 09:40:25.624246257 +0100
+@@ -2234,7 +2234,7 @@
+ 
+ // Returns a string describing the MIME type that this plugin
+ // handles.
+-char*
++const char*
+ NP_GetMIMEDescription ()
+ {
+   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf



More information about the pld-cvs-commit mailing list