~ubuntu-branches/ubuntu/gutsy/icedtea-java7/gutsy

« back to all changes in this revision

Viewing changes to patches/icedtea-xinerama.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-10-07 23:43:28 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071007234328-uy4k67jor6a3eftl
Tags: 7~b21-1.4+20071007-0ubuntu1
* Update icedtea to vcs 20071007.
* Update java-access-bridge to 1.20.0.
* Add build-dependency on libxinerama-dev.
* Add Xb-Npp-xxx tags for the -plugin package.
* Name the plugin "GCJ Web Browser Plugin (using IcedTea)", GCJ now
  "Great Cool Java" (according to Michael Koch).
* Compress binary-indep packages using bzip2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -up openjdk/j2se/make/sun/xawt/Makefile.jx openjdk/j2se/make/sun/xawt/Makefile
 
2
--- openjdk/j2se/make/sun/xawt/Makefile.jx      2007-08-30 03:19:44.000000000 -0400
 
3
+++ openjdk/j2se/make/sun/xawt/Makefile 2007-10-03 14:49:11.000000000 -0400
 
4
@@ -49,8 +49,7 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java
 
5
 LDFLAGS += -L$(OPENWIN_LIB)
 
6
 
 
7
 ifeq ($(PLATFORM), linux)
 
8
-FILES_c += Xinerama.c
 
9
-LDFLAGS += -lpthread
 
10
+LDFLAGS += -lXinerama -lpthread
 
11
 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
 
12
 endif