← Back to branch summary

~ubuntu-branches/debian/sid/swt-gtk/sid

« back to all changes in this revision

Viewing changes to debian/patches/common/01-make_linux.patch

  • Committer: Bazaar Package Importer
  • Author(s): Adrian Perez
  • Date: 2009-12-07 10:22:24 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091207102224-70w2tax575mcks1w
Tags: 3.5.1-1
http://bugs.debian.org/558663
* New upstream release. Closes: #558663.
* debian/control: 
  - Add Vcs-* fields for Git repository.
  - Allow DM-Uploads.
  - Remove "Conflicts", package should live with eclipse.
* debian/rules: Fix default-java path around AWT_LIB_PATH.
* debian/copyright: Minor update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/common/01-make_linux.patch
1
 
--- swt-gtk-3.4.2.orig/make_linux.mak
2
 
+++ swt-gtk-3.4.2/make_linux.mak
3
 
@@ -64,6 +65,7 @@
 
1
diff -Nur -x '*.orig' -x '*~' swt-gtk/make_linux.mak swt-gtk.new/make_linux.mak
 
2
--- swt-gtk/make_linux.mak      2011-12-06 19:13:57.054148957 -0500
 
3
+++ swt-gtk.new/make_linux.mak  2011-12-06 20:07:00.554197279 -0500
 
4
@@ -64,6 +64,7 @@
4
5
 # Uncomment for Native Stats tool
5
6
 #NATIVE_STATS = -DNATIVE_STATS
6
7
 
8
9
 MOZILLACFLAGS = -O \
9
10
        -DSWT_VERSION=$(SWT_VERSION) \
10
11
        $(NATIVE_STATS) \
11
 
@@ -76,8 +78,10 @@
 
12
@@ -76,8 +77,10 @@
12
13
        -I. \
13
14
        -I$(JAVA_HOME)/include \
14
15
        -I$(JAVA_HOME)/include/linux \
16
17
        ${SWT_PTR_CFLAGS}
17
18
-MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
18
19
+MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \
19
 
+       `pkg-config --libs libxul-embedding`
20
 
 MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
21
 
        
22
 
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
23
 
@@ -92,7 +96,7 @@
 
20
+       `pkg-config --libs libxul-embedding`
 
21
 MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
 
22
        -DNO__1XPCOMGlueStartup \
 
23
        -DNO__1XPCOMGlueLoadXULFunctions \
 
24
@@ -101,7 +104,7 @@
24
25
 XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
25
26
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
26
27
 
29
30
                -DSWT_VERSION=$(SWT_VERSION) \
30
31
                $(NATIVE_STATS) \
31
32
                -DLINUX -DGTK \
32
 
@@ -102,6 +106,7 @@
 
33
@@ -111,6 +114,7 @@
33
34
                ${SWT_PTR_CFLAGS}
34
35
 LIBS = -shared -fPIC
35
36