[pkg-java] r6660 - in trunk/libjdic-java/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Wed Jul 9 22:42:56 UTC 2008
Author: varun
Date: 2008-07-09 22:42:55 +0000 (Wed, 09 Jul 2008)
New Revision: 6660
Added:
trunk/libjdic-java/debian/patches/load_native_library.diff
Modified:
trunk/libjdic-java/debian/changelog
trunk/libjdic-java/debian/orig-tar.sh
trunk/libjdic-java/debian/patches/build.diff
trunk/libjdic-java/debian/patches/series
Log:
* Builds fine now (Closes: 478943, 490064)
* Add new load_native_library.diff to fix some bugs in upstream code,
fix native library load path and also make jdic Tray work with both
java 1.5 and 1.6
Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog 2008-07-09 21:34:14 UTC (rev 6659)
+++ trunk/libjdic-java/debian/changelog 2008-07-09 22:42:55 UTC (rev 6660)
@@ -3,12 +3,16 @@
* New upstream release
* Build-Depends: Replace libxul-dev with xulrunner-dev, and
sun-java5-jdk with sun-java6-jdk (Closes: 489498)
+ * Builds fine now (Closes: 478943, 490064)
* Bump Standards-Version to 3.8.0
* Update all the patches
+ * Add new load_native_library.diff to fix some bugs in upstream code,
+ fix native library load path and also make jdic Tray work with both
+ java 1.5 and 1.6
* Update README.Debian-source file
* Update watch, orig-tar.sh and orig.exclude files
- -- Varun Hiremath <varun at debian.org> Wed, 09 Jul 2008 02:46:41 +0530
+ -- Varun Hiremath <varun at debian.org> Thu, 10 Jul 2008 04:04:50 +0530
libjdic-java (0.0.20060613-8) unstable; urgency=low
Modified: trunk/libjdic-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdic-java/debian/orig-tar.sh 2008-07-09 21:34:14 UTC (rev 6659)
+++ trunk/libjdic-java/debian/orig-tar.sh 2008-07-09 22:42:55 UTC (rev 6660)
@@ -11,8 +11,6 @@
# clean up the upstream tarball
unzip $ZIP
mv jdic-$1-src $DIR
-FILE=classes/org/jdesktop/jdic/init/NativeExtractor.java
-cp $DIR/jdic/src/share_applet/$FILE $DIR/jdic/src/share/$FILE
GZIP=--best tar -c -z -f $TAR -X debian/orig.exclude $DIR
rm -rf $DIR $ZIP
Modified: trunk/libjdic-java/debian/patches/build.diff
===================================================================
--- trunk/libjdic-java/debian/patches/build.diff 2008-07-09 21:34:14 UTC (rev 6659)
+++ trunk/libjdic-java/debian/patches/build.diff 2008-07-09 22:42:55 UTC (rev 6660)
@@ -1,7 +1,7 @@
Index: libjdic-java-0.9.5/packager/build.xml
===================================================================
--- libjdic-java-0.9.5.orig/packager/build.xml 2007-07-16 17:02:52.000000000 +0530
-+++ libjdic-java-0.9.5/packager/build.xml 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/packager/build.xml 2008-07-10 03:33:00.000000000 +0530
@@ -43,7 +43,7 @@
<!-- <property name="dist.dir" value="dist" /> -->
@@ -14,7 +14,7 @@
Index: libjdic-java-0.9.5/jdic/src/unix/native/jni/WebBrowserUtil.cpp
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2005-06-14 08:50:08.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2008-07-10 03:33:00.000000000 +0530
@@ -23,6 +23,7 @@
#include <X11/Xlib.h>
#include "WebBrowserUtil.h"
@@ -26,7 +26,7 @@
Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/Makefile
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/Makefile 2005-05-19 14:18:22.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/Makefile 2008-07-08 18:07:07.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/Makefile 2008-07-10 03:33:00.000000000 +0530
@@ -47,8 +47,8 @@
# For Gecko SDK 1.6 or ealier, enable USING_GECKO_SDK_1_4. Or else, enable
# USING_GECKO_SDK_1_7.
@@ -89,7 +89,7 @@
Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/MozEmbed.cpp
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/MozEmbed.cpp 2005-05-19 09:11:22.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/MozEmbed.cpp 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/MozEmbed.cpp 2008-07-10 03:33:00.000000000 +0530
@@ -43,6 +43,7 @@
// These are included from the Gecko SDK
@@ -101,7 +101,7 @@
Index: libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2005-06-01 09:23:40.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2008-07-10 03:33:00.000000000 +0530
@@ -66,7 +66,8 @@
initListeners();
@@ -115,9 +115,34 @@
Index: libjdic-java-0.9.5/jdic/build.xml
===================================================================
--- libjdic-java-0.9.5.orig/jdic/build.xml 2008-03-13 19:59:19.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/build.xml 2008-07-08 18:06:38.000000000 +0530
-@@ -301,8 +301,8 @@
++++ libjdic-java-0.9.5/jdic/build.xml 2008-07-10 03:33:00.000000000 +0530
+@@ -282,6 +282,11 @@
+ <!-- *** Build Unix jar file *** -->
+ <target name="buildunixjar" depends="init"
+ description="build the classes and jar file." >
++
++ <!-- Copy NativeExtractor file -->
++ <copy file="src/share_applet/classes/org/jdesktop/jdic/init/NativeExtractor.java"
++ todir="src/share/classes/org/jdesktop/jdic/init/" />
++
+ <javac debug="${toDebug}" srcdir="${share.classes.dir}:${unix.classes.dir}"
+ destdir="${dist.dir}"
+ classpath="${dist.dir}"
+@@ -289,6 +294,12 @@
+ source="1.4"
+ />
++ <!-- remove NativeExtractor classes -->
++ <delete failonerror="false">
++ <fileset dir="${dist.dir}" includes="org/**/NativeExtractor*.class"/>
++ </delete>
++
++
+ <jar destfile="${dist.dir}/${jar.file}" update="false">
+ <fileset dir="${dist.dir}" includes="org/**/*.class"/>
+ <fileset dir="${unix.classes.dir}" includes="org/**/*.png" />
+@@ -301,8 +312,8 @@
+
<!-- !!! As an additional operation, copy defmailer.properties file
defining the default mailer location to the same location !!! -->
- <copy file="${unix.classes.defmailer.dir}/defmailer.properties"
@@ -130,7 +155,7 @@
Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternal.h
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProfileInternal.h 2004-10-09 08:10:58.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternal.h 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternal.h 2008-07-10 03:33:00.000000000 +0530
@@ -34,7 +34,7 @@
class NS_NO_VTABLE nsIProfileInternal : public nsIProfile {
public:
@@ -152,7 +177,7 @@
Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternalOld.h
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2004-10-09 08:10:59.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2008-07-10 03:33:01.000000000 +0530
@@ -49,7 +49,7 @@
class NS_NO_VTABLE nsIProfileInternalOld : public nsIProfile {
public:
@@ -174,7 +199,7 @@
Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2004-10-09 08:10:59.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2008-07-10 03:33:01.000000000 +0530
@@ -31,7 +31,7 @@
class NS_NO_VTABLE nsIProxiedProtocolHandler : public nsIProtocolHandler {
public:
@@ -196,7 +221,7 @@
Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2004-10-09 08:10:58.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2008-07-10 03:33:01.000000000 +0530
@@ -25,7 +25,7 @@
class NS_NO_VTABLE nsIHttpProtocolHandler : public nsIProxiedProtocolHandler {
public:
@@ -218,7 +243,7 @@
Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIStringStream.h
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/nsIStringStream.h 2004-10-09 08:11:01.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIStringStream.h 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIStringStream.h 2008-07-10 03:33:01.000000000 +0530
@@ -31,7 +31,7 @@
class NS_NO_VTABLE nsIStringInputStream : public nsIInputStream {
public:
@@ -240,7 +265,7 @@
Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIWebNavigation.h
===================================================================
--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2004-10-09 08:11:01.000000000 +0530
-+++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2008-07-08 18:06:38.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2008-07-10 03:33:01.000000000 +0530
@@ -35,7 +35,7 @@
class NS_NO_VTABLE nsIWebNavigation : public nsISupports {
public:
Added: trunk/libjdic-java/debian/patches/load_native_library.diff
===================================================================
--- trunk/libjdic-java/debian/patches/load_native_library.diff (rev 0)
+++ trunk/libjdic-java/debian/patches/load_native_library.diff 2008-07-09 22:42:55 UTC (rev 6660)
@@ -0,0 +1,61 @@
+Index: libjdic-java-0.9.5/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2008-07-10 03:54:49.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2008-07-10 03:54:50.000000000 +0530
+@@ -183,19 +183,8 @@
+ if( null==clNativeExtractor
+ && JdicManager.class.getClassLoader() instanceof URLClassLoader)
+ {
+- //running url of current class
+- nativeLibPath = new File(
+- new URL(JdicManager.class
+- .getProtectionDomain()
+- .getCodeSource()
+- .getLocation(),
+- ".")
+- .openConnection()
+- .getPermission()
+- .getName()
+- ).getCanonicalPath()
+- + File.separator + getPlatform()
+- + File.separator + getArchitecture();
++ // set to java.library.path
++ nativeLibPath = System.getProperty("java.library.path");
+ }
+ }
+ if(null!=clNativeExtractor){
+@@ -311,7 +300,7 @@
+ } else {
+ AccessController.doPrivileged( new PrivilegedExceptionAction() {
+ public Object run() throws IOException {
+- System.load(nativeLibPath + File.separator
++ System.load(nativeLibPath + File.separator + "lib"
+ + libName + getPlatformDLLext());
+ return null;
+ }
+Index: libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeSystemTrayService.java
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeSystemTrayService.java 2008-07-10 03:54:43.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeSystemTrayService.java 2008-07-10 03:54:50.000000000 +0530
+@@ -69,7 +69,7 @@
+ t.sync();
+
+ try{
+- JdicManager.loadLibrary("jdic");
++ JdicManager.loadLibrary("tray");
+ }catch(PrivilegedActionException e){
+ e.printStackTrace();
+ }
+Index: libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayAppletService.java
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayAppletService.java 2008-07-10 03:54:43.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayAppletService.java 2008-07-10 03:56:32.000000000 +0530
+@@ -85,7 +85,7 @@
+ // System.out.println("version = " + version);
+ // System.out.flush();
+
+- if ((version.indexOf("1.5") == -1) || (os.equals("SunOS"))) {
++ if (((version.indexOf("1.6") == -1) && (version.indexOf("1.5") == -1))|| (os.equals("SunOS"))) {
+ // 1.4.2 or older JVM, use MAWT !
+ long w = getWidget(window, 400, 400, 0, 0);
+ // System.out.println("Widget w = " + w);
Modified: trunk/libjdic-java/debian/patches/series
===================================================================
--- trunk/libjdic-java/debian/patches/series 2008-07-09 21:34:14 UTC (rev 6659)
+++ trunk/libjdic-java/debian/patches/series 2008-07-09 22:42:55 UTC (rev 6660)
@@ -1,4 +1,5 @@
jnlp.diff
demos_README.diff
build.diff
+load_native_library.diff
packager.diff
More information about the pkg-java-commits
mailing list