[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.8.0_rc2-3-10-gbec5fa4

Jakub Adam jakub.adam at ktknet.cz
Wed Jun 20 20:22:01 UTC 2012


The following commit has been merged in the master branch:
commit 9a18b63290c2aa4d18234ac31486c2cd9ba3f124
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon May 7 00:33:16 2012 +0200

    Updated 01-as-needed.diff patch for new upstream release

diff --git a/debian/changelog b/debian/changelog
index c948adc..d1bd44c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Updated arch64.diff patch for new upstream release.
+  * Updated 01-as-needed.diff patch for new upstream release.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 07 May 2012 00:05:05 +0200
 
diff --git a/debian/patches/common/01-as-needed.diff b/debian/patches/common/01-as-needed.diff
index a5f8bb0..602c4c1 100644
--- a/debian/patches/common/01-as-needed.diff
+++ b/debian/patches/common/01-as-needed.diff
@@ -66,16 +66,16 @@ Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=350346
  
  xpcom.o: xpcom.cpp
  	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -241,7 +241,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
+@@ -242,7 +242,7 @@
  
  $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+ 	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
 -	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
 +	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${XULRUNNER_LIBS}
  
  xpcomxul.o: xpcom.cpp
  	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -261,7 +261,7 @@
+@@ -262,7 +262,7 @@
  make_xpcominit:$(XPCOMINIT_LIB)
  
  $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
@@ -84,7 +84,7 @@ Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=350346
  
  xpcominit.o: xpcominit.cpp
  	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -295,7 +295,7 @@
+@@ -296,7 +296,7 @@
  make_glx: $(GLX_LIB)
  
  $(GLX_LIB): $(GLX_OBJECTS)

-- 
Debian packaging for swt-gtk.



More information about the pkg-java-commits mailing list