[libnb-platform-java] 03/22: Drop gcc-6-ftbfs.patch. Fixed upstream.

[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 0786fe66b5d6c6eedf795a52a7f81d978be3f3e1
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 23 19:15:41 2016 +0200

    Drop gcc-6-ftbfs.patch. Fixed upstream.
---
 debian/patches/gcc-6-ftbfs.patch | 51 ----------------------------------------
 debian/patches/series            |  1 -
 2 files changed, 52 deletions(-)

diff --git a/debian/patches/gcc-6-ftbfs.patch b/debian/patches/gcc-6-ftbfs.patch
deleted file mode 100644
index b905e7a..0000000
--- a/debian/patches/gcc-6-ftbfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 28 Aug 2016 17:47:09 +0200
-Subject: gcc 6 ftbfs
-
-Fix FTBFS with GCC-6.
-
-Forwarded: no
----
- ide/launcher/windows/nblauncher.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
-index a1a5967..91198f1 100644
---- a/ide/launcher/windows/nblauncher.cpp
-+++ b/ide/launcher/windows/nblauncher.cpp
-@@ -426,7 +426,7 @@ bool NbLauncher::findCacheDir(const char *str) {
- string NbLauncher::getDefaultUserDirRoot() {
-     TCHAR defUserDirRootChar[MAX_PATH];
-     if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, defUserDirRootChar))) {
--        return false;
-+        return 0;
-     }
-     defUserDirRoot = ((string) defUserDirRootChar) + NETBEANS_DIRECTORY;
-     defUserDirRoot.erase(defUserDirRoot.rfind('\\'));
-@@ -437,7 +437,7 @@ string NbLauncher::getDefaultUserDirRoot() {
- string NbLauncher::getDefaultCacheDirRoot() {
-     TCHAR defCacheDirRootChar[MAX_PATH];
-     if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, defCacheDirRootChar))) {
--        return false;
-+        return 0;
-     }
-     defCacheDirRoot = ((string) defCacheDirRootChar) + NETBEANS_CACHES_DIRECTORY;
-     defCacheDirRoot.erase(defCacheDirRoot.rfind('\\'));
-@@ -458,7 +458,7 @@ bool NbLauncher::getOption(char *&str, const char *opt) {
-         logMsg("Option found: %s%s", opt, str);
-         return true;
-     }
--    return false;
-+    return 0;
- }
- 
- bool NbLauncher::parseConfigFile(const char* path) {
-@@ -466,7 +466,7 @@ bool NbLauncher::parseConfigFile(const char* path) {
-     FILE *file = fopen(path, "r");
-     if (!file) {
-         logErr(true, false, "Cannot open file \"%s\" for reading.", path);
--        return false;
-+        return 0;
-     }
-     
-     char line[4096] = "";
diff --git a/debian/patches/series b/debian/patches/series
index 10653d6..6a9af63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ netbeans-platform-windowslauncher.patch
 netbeans-platform-disable-net.java-modules.patch
 netbeans-platform-junitlib.patch
 netbeans-platform-o.n.html.ko4j.patch
-gcc-6-ftbfs.patch

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