[pkg-java] r6666 - in trunk/libjdic-java/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Fri Jul 11 13:43:34 UTC 2008
Author: varun
Date: 2008-07-11 13:43:33 +0000 (Fri, 11 Jul 2008)
New Revision: 6666
Modified:
trunk/libjdic-java/debian/changelog
trunk/libjdic-java/debian/patches/build.diff
Log:
Enable -fPIC, to fix build on amd64
Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog 2008-07-10 04:46:15 UTC (rev 6665)
+++ trunk/libjdic-java/debian/changelog 2008-07-11 13:43:33 UTC (rev 6666)
@@ -1,3 +1,9 @@
+libjdic-java (0.9.5-2) unstable; urgency=low
+
+ * Enable -fPIC, to fix build on amd64
+
+ -- Varun Hiremath <varun at debian.org> Fri, 11 Jul 2008 18:16:47 +0530
+
libjdic-java (0.9.5-1) unstable; urgency=low
* New upstream release
Modified: trunk/libjdic-java/debian/patches/build.diff
===================================================================
--- trunk/libjdic-java/debian/patches/build.diff 2008-07-10 04:46:15 UTC (rev 6665)
+++ trunk/libjdic-java/debian/patches/build.diff 2008-07-11 13:43:33 UTC (rev 6666)
@@ -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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/packager/build.xml 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/packager/build.xml 2008-07-11 17:58:47.000000000 +0530
@@ -43,7 +43,7 @@
<!-- <property name="dist.dir" value="dist" /> -->
@@ -13,8 +13,8 @@
<!-- which is only used in javadoc target -->
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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2008-07-11 17:58:47.000000000 +0530
@@ -23,6 +23,7 @@
#include <X11/Xlib.h>
#include "WebBrowserUtil.h"
@@ -25,8 +25,8 @@
#include <sys/stat.h>
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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/Makefile 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/Makefile 2008-07-11 17:58:47.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.
@@ -88,8 +88,8 @@
endif
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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/MozEmbed.cpp 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/MozEmbed.cpp 2008-07-11 17:58:47.000000000 +0530
@@ -43,6 +43,7 @@
// These are included from the Gecko SDK
@@ -100,8 +100,8 @@
#include "nsEmbedString.h"
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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2008-07-11 17:58:47.000000000 +0530
@@ -66,7 +66,8 @@
initListeners();
@@ -114,8 +114,8 @@
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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/build.xml 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/build.xml 2008-07-11 17:58:47.000000000 +0530
@@ -282,6 +282,11 @@
<!-- *** Build Unix jar file *** -->
<target name="buildunixjar" depends="init"
@@ -154,8 +154,8 @@
<!-- *** Build BSD native JNI code *** -->
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-10 03:33:00.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProfileInternal.h 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternal.h 2008-07-11 17:58:47.000000000 +0530
@@ -34,7 +34,7 @@
class NS_NO_VTABLE nsIProfileInternal : public nsIProfile {
public:
@@ -176,8 +176,8 @@
NS_IMETHOD StartupWithArgs(nsICmdLineService *cmdLine, PRBool canInteract); \
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-10 03:33:01.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2008-07-11 17:58:47.000000000 +0530
@@ -49,7 +49,7 @@
class NS_NO_VTABLE nsIProfileInternalOld : public nsIProfile {
public:
@@ -198,8 +198,8 @@
NS_IMETHOD StartupWithArgs(nsICmdLineService *cmdLine, PRBool canInteract); \
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-10 03:33:01.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2008-07-11 17:58:47.000000000 +0530
@@ -31,7 +31,7 @@
class NS_NO_VTABLE nsIProxiedProtocolHandler : public nsIProtocolHandler {
public:
@@ -220,8 +220,8 @@
NS_IMETHOD NewProxiedChannel(nsIURI *uri, nsIProxyInfo *proxyInfo, nsIChannel **_retval);
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-10 03:33:01.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2008-07-11 17:58:47.000000000 +0530
@@ -25,7 +25,7 @@
class NS_NO_VTABLE nsIHttpProtocolHandler : public nsIProxiedProtocolHandler {
public:
@@ -242,8 +242,8 @@
NS_IMETHOD GetUserAgent(nsACString & aUserAgent); \
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-10 03:33:01.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/nsIStringStream.h 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIStringStream.h 2008-07-11 17:58:47.000000000 +0530
@@ -31,7 +31,7 @@
class NS_NO_VTABLE nsIStringInputStream : public nsIInputStream {
public:
@@ -264,8 +264,8 @@
NS_IMETHOD SetData(const char *data, PRInt32 dataLen); \
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-10 03:33:01.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2008-07-11 17:47:47.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2008-07-11 17:58:47.000000000 +0530
@@ -35,7 +35,7 @@
class NS_NO_VTABLE nsIWebNavigation : public nsISupports {
public:
@@ -284,3 +284,31 @@
/* Use this macro when declaring classes that implement this interface. */
#define NS_DECL_NSIWEBNAVIGATION \
NS_IMETHOD GetCanGoBack(PRBool *aCanGoBack); \
+Index: libjdic-java-0.9.5/jdic/src/unix/native/jni/Makefile
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/jni/Makefile 2008-07-11 17:58:56.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/jni/Makefile 2008-07-11 17:59:46.000000000 +0530
+@@ -31,20 +31,20 @@
+ PLATFORM = solaris
+ CXX = CC
+ CC = cc
+- CXXFLAGS = -c
++ CXXFLAGS = -c -fPIC
+ LDFLAGS = -G -ldl -lrt -lpthread
+ X11LIB=/usr/openwin/lib
+ else
+ ifeq ($(UNAME), Linux)
+ PLATFORM = linux
+ CXX = g++
+- CXXFLAGS = -c
++ CXXFLAGS = -c -fPIC
+ LDFLAGS = -shared -fPIC -ldl -lrt -lpthread
+ endif
+ ifeq ($(UNAME), FreeBSD)
+ PLATFORM = freebsd
+ CXX = g++
+- CXXFLAGS = -c -I/usr/local/include -I/usr/X11R6/include
++ CXXFLAGS = -c -fPIC -I/usr/local/include -I/usr/X11R6/include
+ LDFLAGS = -shared -fPIC -L/usr/local/lib -L/usr/X11R6/lib
+ endif
+ CC = gcc
More information about the pkg-java-commits
mailing list