← Back to branch summary

~ubuntu-branches/ubuntu/raring/icedtea-web/raring

« back to all changes in this revision

Viewing changes to debian/patches/java7-defines.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-02-04 18:19:46 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20120204181946-jngobgzz4mlen9yl
Tags: 1.2~pre1-0ubuntu1
* Update to hg 20120203, taken from the icedtea-web-1.2 release branch.
* Build separate plugin packages for OpenJDK 6 and OpenJDK 7, needed
  to provide the path to the runtime and the mime description in the plugin.
* Use icedtea-<jre version>-plugin as the name for both plugin packages.
* Remove icedtea-web-1.1.4-npapi-fix.patch, fixed upstream.
* Pass -n to gzip when compressing manpages to be Multi-Arch: same safe.
* Build multiarch packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/java7-defines.diff
 
1
Index: icedtea-web-1.2~pre1/plugin/icedteanp/IcedTeaNPPlugin.cc
 
2
===================================================================
 
3
--- icedtea-web-1.2~pre1.orig/plugin/icedteanp/IcedTeaNPPlugin.cc       2012-02-04 17:38:59.000000000 +0100
 
4
+++ icedtea-web-1.2~pre1/plugin/icedteanp/IcedTeaNPPlugin.cc    2012-02-04 17:39:02.000000000 +0100
 
5
@@ -90,6 +90,18 @@
 
6
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 
7
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
 
8
 
 
9
+#ifdef BUILD_JAVA7
 
10
+ #define JPI_VERSION "1.7.0_" JDK_UPDATE_VERSION
 
11
+ #define PLUGIN_APPLET_MIME_DESC7 \
 
12
+  "application/x-java-applet;version=1.7:class,jar:IcedTea;"
 
13
+ #define PLUGIN_BEAN_MIME_DESC7 \
 
14
+  "application/x-java-bean;version=1.7:class,jar:IcedTea;"
 
15
+#else
 
16
+ #define JPI_VERSION "1.6.0_" JDK_UPDATE_VERSION
 
17
+ #define PLUGIN_APPLET_MIME_DESC7
 
18
+ #define PLUGIN_BEAN_MIME_DESC7
 
19
+#endif
 
20
+
 
21
 #define PLUGIN_MIME_DESC                                               \
 
22
   "application/x-java-vm:class,jar:IcedTea;"                           \
 
23
   "application/x-java-applet:class,jar:IcedTea;"                       \
 
24
@@ -107,7 +119,8 @@
 
25
   "application/x-java-applet;version=1.4.2:class,jar:IcedTea;"         \
 
26
   "application/x-java-applet;version=1.5:class,jar:IcedTea;"           \
 
27
   "application/x-java-applet;version=1.6:class,jar:IcedTea;"           \
 
28
-  "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"  \
 
29
+  PLUGIN_APPLET_MIME_DESC7 \
 
30
+  "application/x-java-applet;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"  \
 
31
   "application/x-java-bean:class,jar:IcedTea;"                         \
 
32
   "application/x-java-bean;version=1.1:class,jar:IcedTea;"             \
 
33
   "application/x-java-bean;version=1.1.1:class,jar:IcedTea;"           \
 
34
@@ -123,7 +136,8 @@
 
35
   "application/x-java-bean;version=1.4.2:class,jar:IcedTea;"           \
 
36
   "application/x-java-bean;version=1.5:class,jar:IcedTea;"             \
 
37
   "application/x-java-bean;version=1.6:class,jar:IcedTea;"             \
 
38
-  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
 
39
+  PLUGIN_BEAN_MIME_DESC7 \
 
40
+  "application/x-java-bean;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"    \
 
41
   "application/x-java-vm-npruntime::IcedTea;"
 
42
 
 
43
 #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
 
44
Index: icedtea-web-1.2~pre1/Makefile.in
 
45
===================================================================
 
46
--- icedtea-web-1.2~pre1.orig/Makefile.in       2012-02-04 17:38:59.000000000 +0100
 
47
+++ icedtea-web-1.2~pre1/Makefile.in    2012-02-04 17:59:07.827009086 +0100
 
48
@@ -701,6 +701,7 @@
 
49
 @ENABLE_PLUGIN_TRUE@     -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 
50
 @ENABLE_PLUGIN_TRUE@     -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
 
51
 @ENABLE_PLUGIN_TRUE@     -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
 
52
+@ENABLE_PLUGIN_TRUE@      $(DEFS7) \
 
53
 @ENABLE_PLUGIN_TRUE@     $(GLIB_CFLAGS) \
 
54
 @ENABLE_PLUGIN_TRUE@     $(GTK_CFLAGS) \
 
55
 @ENABLE_PLUGIN_TRUE@     $(MOZILLA_CFLAGS) \
 
56
Index: icedtea-web-1.2~pre1/Makefile.am
 
57
===================================================================
 
58
--- icedtea-web-1.2~pre1.orig/Makefile.am       2012-02-04 17:38:59.000000000 +0100
 
59
+++ icedtea-web-1.2~pre1/Makefile.am    2012-02-04 17:58:59.102965826 +0100
 
60
@@ -221,6 +221,7 @@
 
61
          -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 
62
          -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
 
63
          -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
 
64
+          $(DEFS7) \
 
65
          $(GLIB_CFLAGS) \
 
66
          $(GTK_CFLAGS) \
 
67
          $(MOZILLA_CFLAGS) \