This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master-4.3 in repository swt-gtk.
commit a01d23ae239c2595bd5f79a0b74b11f3d5e29f77 Author: Ángel Guzmán Maeso <[email protected]> Date: Sat Dec 21 15:31:52 2013 +0100 Refresh 01-make_linux.patch --- debian/changelog | 1 + debian/patches/01-make_linux.patch | 40 ++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index bc0a10b..de3f73a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ swt4-gtk (4.3.1-1) UNRELEASED; urgency=medium * Use sed to patch java sources on 64 bit architectures - no need for debian/patches/64* anymore. * Move d/patches/common to d/patches. + * Refresh d/patches/01-make_linux.patch -- Jakub Adam <[email protected]> Sun, 15 Dec 2013 14:34:25 +0100 diff --git a/debian/patches/01-make_linux.patch b/debian/patches/01-make_linux.patch index df7091f..38031e5 100644 --- a/debian/patches/01-make_linux.patch +++ b/debian/patches/01-make_linux.patch @@ -2,10 +2,10 @@ Description: Ensure the underlying build system gets the right flags and settings. diff --git a/make_linux.mak b/make_linux.mak -index c8cc080..998cfcd 100644 +index 6e12009..ef004d5 100644 --- a/make_linux.mak +++ b/make_linux.mak -@@ -66,6 +66,7 @@ GLXLIBS = -lGL -lGLU -lm +@@ -75,6 +75,7 @@ GLXLIBS = -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -13,19 +13,17 @@ index c8cc080..998cfcd 100644 MOZILLACFLAGS = -O \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -@@ -78,8 +79,10 @@ MOZILLACFLAGS = -O \ - -I. \ +@@ -88,7 +89,8 @@ MOZILLACFLAGS = -O \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/linux \ -+ `pkg-config --cflags libxul-embedding` \ ${SWT_PTR_CFLAGS} --MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic -+MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \ -+ `pkg-config --libs libxul-embedding` +-MOZILLALFLAGS = -shared ${SWT_LFLAGS} -Wl,--version-script=mozilla_exports -Bsymbolic ++MOZILLALFLAGS = -shared ${SWT_LFLAGS} -Wl,--version-script=mozilla_exports -Bsymbolic \ ++ `pkg-config --libs libxul-embedding` MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -DNO__1XPCOMGlueStartup \ -DNO__1XPCOMGlueLoadXULFunctions \ -@@ -106,7 +109,7 @@ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o +@@ -115,7 +117,7 @@ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o @@ -34,7 +32,7 @@ index c8cc080..998cfcd 100644 -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DLINUX -DGTK \ -@@ -114,8 +117,9 @@ CFLAGS = -O -Wall \ +@@ -123,8 +125,9 @@ CFLAGS = -O -Wall \ -I$(JAVA_HOME)/include/linux \ -fPIC \ ${SWT_PTR_CFLAGS} @@ -45,7 +43,7 @@ index c8cc080..998cfcd 100644 ifndef NO_STRIP AWT_LFLAGS := $(AWT_LFLAGS) -s MOZILLALFLAGS := $(MOZILLALFLAGS) -s -@@ -136,7 +140,7 @@ callback.o: callback.c callback.h +@@ -145,7 +148,7 @@ callback.o: callback.c callback.h $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c $(SWTPI_LIB): $(SWTPI_OBJECTS) @@ -54,7 +52,7 @@ index c8cc080..998cfcd 100644 swt.o: swt.c swt.h $(CC) $(CFLAGS) -c swt.c -@@ -155,7 +159,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h +@@ -164,7 +167,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h make_cairo: $(CAIRO_LIB) $(CAIRO_LIB): $(CAIRO_OBJECTS) @@ -63,7 +61,7 @@ index c8cc080..998cfcd 100644 cairo.o: cairo.c cairo.h swt.h $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -171,7 +175,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h +@@ -180,7 +183,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h make_cde: $(CDE_LIB) $(CDE_LIB): $(CDE_OBJECTS) @@ -72,7 +70,7 @@ index c8cc080..998cfcd 100644 # # AWT lib -@@ -179,7 +183,7 @@ $(CDE_LIB): $(CDE_OBJECTS) +@@ -188,7 +191,7 @@ $(CDE_LIB): $(CDE_OBJECTS) make_awt:$(AWT_LIB) $(AWT_LIB): $(AWT_OBJECTS) @@ -81,7 +79,7 @@ index c8cc080..998cfcd 100644 # # Atk lib -@@ -187,7 +191,7 @@ $(AWT_LIB): $(AWT_OBJECTS) +@@ -196,7 +199,7 @@ $(AWT_LIB): $(AWT_OBJECTS) make_atk: $(ATK_LIB) $(ATK_LIB): $(ATK_OBJECTS) @@ -90,7 +88,7 @@ index c8cc080..998cfcd 100644 atk.o: atk.c atk.h $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -204,7 +208,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h +@@ -213,7 +216,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h make_gnome: $(GNOME_LIB) $(GNOME_LIB): $(GNOME_OBJECTS) @@ -99,7 +97,7 @@ index c8cc080..998cfcd 100644 gnome.o: gnome.c $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c -@@ -221,7 +225,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h +@@ -230,7 +233,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h make_mozilla:$(MOZILLA_LIB) $(MOZILLA_LIB): $(MOZILLA_OBJECTS) @@ -108,16 +106,16 @@ index c8cc080..998cfcd 100644 xpcom.o: xpcom.cpp $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp -@@ -242,7 +246,7 @@ make_xulrunner:$(XULRUNNER_LIB) +@@ -251,7 +254,7 @@ make_xulrunner:$(XULRUNNER_LIB) $(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 + echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc $(LFLAGS) $(CFLAGS) -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 -@@ -262,7 +266,7 @@ xpcomxul_stats.o: xpcom_stats.cpp +@@ -271,7 +274,7 @@ xpcomxul_stats.o: xpcom_stats.cpp make_xpcominit:$(XPCOMINIT_LIB) $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) @@ -126,7 +124,7 @@ index c8cc080..998cfcd 100644 xpcominit.o: xpcominit.cpp $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp -@@ -296,7 +300,7 @@ webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h +@@ -305,7 +308,7 @@ webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h make_glx: $(GLX_LIB) $(GLX_LIB): $(GLX_OBJECTS) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/swt-gtk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
