SOURCES: java-libdbus-make.patch - updated to 1.11

[qboosh]

Author: qboosh                       Date: Thu Nov 16 17:35:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.11

---- Files affected:
SOURCES:
   java-libdbus-make.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/java-libdbus-make.patch
diff -u SOURCES/java-libdbus-make.patch:1.1 SOURCES/java-libdbus-make.patch:1.2
--- SOURCES/java-libdbus-make.patch:1.1	Sat Oct 28 12:42:11 2006
+++ SOURCES/java-libdbus-make.patch	Thu Nov 16 18:35:27 2006
@@ -1,29 +1,21 @@
---- libdbus-java-1.9/Makefile.orig	2006-08-24 23:30:51.000000000 +0200
-+++ libdbus-java-1.9/Makefile	2006-10-28 11:00:45.122874750 +0200
-@@ -12,8 +12,10 @@
- JAVAH?=javah
- JAVADOC?=javadoc
+--- libdbus-java-1.11/Makefile.orig	2006-11-14 17:24:46.000000000 +0100
++++ libdbus-java-1.11/Makefile	2006-11-16 18:24:39.636176750 +0100
+@@ -15,8 +15,8 @@
  JAR?=jar
--CFLAGS?=`pkg-config --cflags dbus-1` -Os -Wall -Werror
--LDFLAGS?=`pkg-config --libs dbus-1`
-+CFLAGS?=-Os -Wall -Werror
-+ALLCFLAGS=$(CFLAGS) `pkg-config --cflags dbus-1`
-+LDFLAGS?=
-+LIBS=`pkg-config --libs dbus-1`
+ INCLUDES?=`pkg-config --cflags dbus-1` -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
+ CFLAGS?= -Os -Wall -Werror 
+-CFLAGS+=$(INCLUDES)
+-CFLAGS+=$(call cc-option,-fno-stack-protector,)
++override CFLAGS+=$(INCLUDES)
++override CFLAGS+=$(call cc-option,-fno-stack-protector,)
+ LIBS?=`pkg-config --libs dbus-1`
  CC?=gcc
  LD?=ld
- STRIP?=strip
-@@ -72,11 +74,10 @@
- 	$(JAVAH) -classpath classes:$(CLASSPATH) -d . org.freedesktop.dbus.MethodCall
- 	touch $@
- dbus-java.o: dbus-java.c org_freedesktop_dbus_DBusConnection.h org_freedesktop_dbus_DBusErrorMessage.h org_freedesktop_dbus_MethodCall.h
--	$(CC) $(CFLAGS) -fpic -c $< -o $@
-+	$(CC) $(ALLCFLAGS) -fpic -c $< -o $@
+@@ -94,7 +94,6 @@
  
  libdbus-java.so: dbus-java.o
--	$(LD) $(LDFLAGS) -fpic -shared -o $@ $^
+ 	$(LD) $(LDFLAGS) -fpic -shared -o $@ $^ $(LIBS)
 -	$(STRIP) $@
-+	$(LD) $(LDFLAGS) -fpic -shared -o $@ $^ $(LIBS)
  libdbus-java-$(VERSION).jar: .classes
  	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/Hal/*.class)
  dbus-java-test-$(VERSION).jar: .testclasses
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/java-libdbus-make.patch?r1=1.1&r2=1.2&f=u