[libnb-platform-java] 11/22: Drop netbeans-platform-windowslauncher.patch.

[Markus Koschany]

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

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

commit a5e025b8286b14bf6433f245371c363bb3a79988
Author: Markus Koschany <apo at debian.org>
Date:   Thu Oct 27 20:05:14 2016 +0200

    Drop netbeans-platform-windowslauncher.patch.
---
 .../netbeans-platform-windowslauncher.patch        | 119 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 120 deletions(-)

diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
deleted file mode 100644
index 99de912..0000000
--- a/debian/patches/netbeans-platform-windowslauncher.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 23 Oct 2016 22:34:27 +0200
-Subject: netbeans platform windowslauncher
-
----
- apisupport.harness/windows-launcher-src/Makefile |  7 ++++---
- ide/launcher/windows/nblauncher.cpp              |  1 +
- o.n.bootstrap/launcher/windows/Makefile          | 20 ++++++++------------
- o.n.bootstrap/launcher/windows/utilsfuncs.cpp    |  1 +
- 4 files changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
-index 8393fb3..ba4394d 100644
---- a/apisupport.harness/windows-launcher-src/Makefile
-+++ b/apisupport.harness/windows-launcher-src/Makefile
-@@ -55,7 +55,7 @@
- MKDIR=mkdir
- CP=cp
- CCADMIN=CCadmin
--RANLIB=ranlib
-+RANLIB=i686-w64-mingw32-ranlib
- 
- 
- 
-@@ -66,10 +66,10 @@ build: .build-post
- # Add your pre 'build' code here...
- 
- .build-pre-app.exe: app.rc
--	windres -oapp.res -Ocoff app.rc
-+	i686-w64-mingw32-windres -oapp.res -Ocoff app.rc
- 
- .build-pre-app64.exe: app.rc
--	x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc
-+	x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc
- 
- .build-post: .build-impl
- # Add your post 'build' code here...	
-@@ -78,6 +78,7 @@ build: .build-post
- 
- # clean
- clean: .clean-post
-+	-rm -f app.res app64.res
- 
- .clean-pre:
- # Add your pre 'clean' code here...
-diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
-index b601ca3..29bd9de 100644
---- a/ide/launcher/windows/nblauncher.cpp
-+++ b/ide/launcher/windows/nblauncher.cpp
-@@ -54,6 +54,7 @@
- #include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
- #include "../../../o.n.bootstrap/launcher/windows/argnames.h"
- #include "../../../o.n.bootstrap/launcher/windows/nbexecloader.h"
-+#include <stdio.h>
- 
- using namespace std;
- 
-diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile
-index d0c66a4..efa4a92 100644
---- a/o.n.bootstrap/launcher/windows/Makefile
-+++ b/o.n.bootstrap/launcher/windows/Makefile
-@@ -53,7 +53,7 @@
- MKDIR=mkdir
- CP=cp
- CCADMIN=CCadmin
--RANLIB=ranlib
-+RANLIB=i686-w64-mingw32-ranlib
- 
- 
- 
-@@ -64,16 +64,12 @@ build: .build-post-$(CONF)
- # Add your pre 'build' code here...
- 
- .build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
--	windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
--	g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
--	cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
--	cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
--	
-+	i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res
-+	i686-w64-mingw32-g++ -s -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-+
- .build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
--	x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res 
--	x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe 
--	cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
--	cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
-+	x86_64-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe64.res
-+	x86_64-w64-mingw32-g++ -m64 -s -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
- 
- 
- 
-@@ -84,7 +80,7 @@ clean: .clean-post-$(CONF)
- # Add your pre 'clean' code here...
- 
- .clean-post-nbexec: .clean-impl
--	rm -f nbexec_exe32.res nbexec32.exe
-+	rm -f nbexec_exe32.res nbexec.exe
- 	
- .clean-post-nbexec64: .clean-impl
- 	rm -f nbexec_exe64.res nbexec64.exe
-@@ -125,4 +121,4 @@ help: .help-post
- 
- 
- # include project implementation makefile
--include nbproject/Makefile-impl.mk
-+#include nbproject/Makefile-impl.mk
-diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-index a43453b..8ade281 100644
---- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-@@ -53,6 +53,7 @@
- #include "argnames.h"
- #include <tlhelp32.h>
- #include <windows.h>
-+#include <stdio.h>
- 
- using namespace std;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 57e0278..8750086 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ netbeans-platform-disable-net.java-modules.patch
 netbeans-platform-junitlib.patch
 netbeans-platform-nbi.patch
 netbeans-platform-o.n.html.ko4j.patch
-netbeans-platform-windowslauncher.patch
 netbeans-platform-jemmy.patch
 netbeans-platform-properties.patch
 osgi-update.patch

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