SOURCES: java-libdbus-make.patch - updated for 1.12

[qboosh]

Author: qboosh                       Date: Fri Dec  1 19:37:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.12

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

---- Diffs:

================================================================
Index: SOURCES/java-libdbus-make.patch
diff -u SOURCES/java-libdbus-make.patch:1.2 SOURCES/java-libdbus-make.patch:1.3
--- SOURCES/java-libdbus-make.patch:1.2	Thu Nov 16 18:35:27 2006
+++ SOURCES/java-libdbus-make.patch	Fri Dec  1 20:37:18 2006
@@ -1,12 +1,14 @@
---- 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 @@
+--- libdbus-java-1.12/Makefile.orig	2006-11-21 15:42:35.000000000 +0100
++++ libdbus-java-1.12/Makefile	2006-12-01 19:30:38.610535000 +0100
+@@ -14,9 +14,9 @@
+ JAVADOC?=javadoc
  JAR?=jar
  INCLUDES?=`pkg-config --cflags dbus-1` -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
- CFLAGS?= -Os -Wall -Werror 
+-CFLAGS?= -Os -Wall -Werror -pedantic -std=c99
 -CFLAGS+=$(INCLUDES)
 -CFLAGS+=$(call cc-option,-fno-stack-protector,)
-+override CFLAGS+=$(INCLUDES)
++CFLAGS?= -Os
++override CFLAGS+= -Wall -Werror -pedantic -std=c99 $(INCLUDES)
 +override CFLAGS+=$(call cc-option,-fno-stack-protector,)
  LIBS?=`pkg-config --libs dbus-1`
  CC?=gcc
@@ -17,5 +19,5 @@
  	$(LD) $(LDFLAGS) -fpic -shared -o $@ $^ $(LIBS)
 -	$(STRIP) $@
  libdbus-java-$(VERSION).jar: .classes
- 	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/Hal/*.class)
+ 	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class)
  dbus-java-test-$(VERSION).jar: .testclasses
================================================================

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