[libnb-platform-java] 01/07: Update netbeans-platform-windowslauncher.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository libnb-platform-java.

commit 09a30c94b38d65dba040350fb09cd33707c7ca59
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Jun 3 11:54:01 2015 +0200

    Update netbeans-platform-windowslauncher.patch
---
 .../netbeans-platform-windowslauncher.patch        | 35 +++-------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
index b13eb9f..1befa4b 100644
--- a/debian/patches/netbeans-platform-windowslauncher.patch
+++ b/debian/patches/netbeans-platform-windowslauncher.patch
@@ -5,13 +5,13 @@ Subject: netbeans platform windowslauncher
 ---
  apisupport.harness/windows-launcher-src/Makefile   |  7 ++---
  .../nbproject/Makefile-app.exe.mk                  | 24 ++++++++---------
- .../nbproject/Makefile-app64.exe.mk                | 24 ++++++++---------
+ .../nbproject/Makefile-app64.exe.mk                | 16 ++++++------
  ide/launcher/windows/nblauncher.cpp                |  1 +
  o.n.bootstrap/launcher/windows/Makefile            | 18 +++++--------
  .../launcher/windows/nbproject/Makefile-nbexec.mk  | 30 +++++++++++-----------
  .../windows/nbproject/Makefile-nbexec64.mk         | 26 +++++++++----------
  o.n.bootstrap/launcher/windows/utilsfuncs.cpp      |  1 +
- 8 files changed, 65 insertions(+), 66 deletions(-)
+ 8 files changed, 61 insertions(+), 62 deletions(-)
 
 diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
 index c7d6f5e..f5499dc 100644
@@ -109,7 +109,7 @@ index c96635b..3859387 100644
  # Subprojects
  .build-subprojects:
 diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
-index e35d1ac..c4d073d 100644
+index e35d1ac..2922e6a 100644
 --- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
 +++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
 @@ -13,12 +13,12 @@ CP=cp
@@ -123,7 +123,7 @@ index e35d1ac..c4d073d 100644
 -FC=gfortran
 -AS=as.exe
 +RANLIB=x86_64-w64-mingw32-ranlib
-+CC=
++CC=x86_64-w64-mingw32-gcc
 +CCC=x86_64-w64-mingw32-g++
 +CXX=x86_64-w64-mingw32-g++
 +FC=
@@ -142,33 +142,6 @@ index e35d1ac..c4d073d 100644
  
  # Fortran Compiler Flags
  FFLAGS=
-@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app64.res
- ${OBJECTDIR}/applauncher.o: applauncher.cpp 
- 	${MKDIR} -p ${OBJECTDIR}
- 	${RM} $@.d
--	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
-+	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
- 
- ${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp 
- 	${MKDIR} -p ${OBJECTDIR}/_ext/493252820
- 	${RM} $@.d
--	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-+	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
- 
- ${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp 
- 	${MKDIR} -p ${OBJECTDIR}/_ext/216238457
- 	${RM} $@.d
--	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
-+	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp
- 
- ${OBJECTDIR}/app.o: app.cpp 
- 	${MKDIR} -p ${OBJECTDIR}
- 	${RM} $@.d
--	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-+	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
- 
- # Subprojects
- .build-subprojects:
 diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
 index 97c15ba..a1a5967 100644
 --- a/ide/launcher/windows/nblauncher.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git