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 e0a7925e9d15af553ddf2e3026869a2f6a5cd5c8 Author: Markus Koschany <[email protected]> Date: Sun Oct 23 22:34:44 2016 +0200 Refresh more patches --- ...etbeans-platform-disable-net.java-modules.patch | 57 +++++++++++ debian/patches/netbeans-platform-junitlib.patch | 23 +++++ debian/patches/netbeans-platform-nbi.patch | 21 ++++ .../patches/netbeans-platform-o.n.html.ko4j.patch | 28 +++++ .../netbeans-platform-windowslauncher.patch | 113 +++++++++++++++++++++ debian/patches/series | 5 + 6 files changed, 247 insertions(+) diff --git a/debian/patches/netbeans-platform-disable-net.java-modules.patch b/debian/patches/netbeans-platform-disable-net.java-modules.patch new file mode 100644 index 0000000..408f055 --- /dev/null +++ b/debian/patches/netbeans-platform-disable-net.java-modules.patch @@ -0,0 +1,57 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 23 Oct 2016 21:38:22 +0200 +Subject: netbeans platform disable-net.java modules + +--- + nbbuild/build.properties | 1 - + nbbuild/cluster.properties | 8 -------- + net.java.html/build.xml | 1 + + 3 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/nbbuild/build.properties b/nbbuild/build.properties +index e0180b6..bba3598 100644 +--- a/nbbuild/build.properties ++++ b/nbbuild/build.properties +@@ -99,7 +99,6 @@ javadoc.packages=\ + # List of modules that provide stable javadoc + config.javadoc.stable=\ + api.annotations.common,\ +- api.htmlui,\ + api.intent,\ + api.io,\ + api.knockout,\ +diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties +index 15a22d6..da9364e 100644 +--- a/nbbuild/cluster.properties ++++ b/nbbuild/cluster.properties +@@ -205,7 +205,6 @@ nb.cluster.platform.dir=platform + nb.cluster.platform.depends=nb.cluster.bootstrap + nb.cluster.platform=\ + api.annotations.common,\ +- api.htmlui,\ + api.intent,\ + api.io,\ + api.progress,\ +@@ -253,13 +252,6 @@ nb.cluster.platform=\ + masterfs.nio2,\ + masterfs.ui,\ + masterfs.windows,\ +- net.java.html,\ +- net.java.html.boot,\ +- net.java.html.boot.fx,\ +- net.java.html.boot.script,\ +- net.java.html.geo,\ +- net.java.html.json,\ +- net.java.html.sound,\ + netbinox,\ + o.jdesktop.layout,\ + o.n.core,\ +diff --git a/net.java.html/build.xml b/net.java.html/build.xml +index e9476b1..b152aaf 100644 +--- a/net.java.html/build.xml ++++ b/net.java.html/build.xml +@@ -42,3 +42,4 @@ Contributor(s): + <import file="../nbbuild/templates/projectized.xml"/> + <target name="jar"/> + </project> ++ diff --git a/debian/patches/netbeans-platform-junitlib.patch b/debian/patches/netbeans-platform-junitlib.patch new file mode 100644 index 0000000..c653a1c --- /dev/null +++ b/debian/patches/netbeans-platform-junitlib.patch @@ -0,0 +1,23 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 23 Oct 2016 21:39:15 +0200 +Subject: netbeans platform junitlib + +--- + junitlib/nbproject/project.properties | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties +index 987f66c..34ca737 100644 +--- a/junitlib/nbproject/project.properties ++++ b/junitlib/nbproject/project.properties +@@ -38,8 +38,8 @@ + is.autoload=true + javac.source=1.6 + javac.compilerargs=-Xlint -Xlint:-serial +-release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar +-release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar ++#release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar ++#release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar + nbm.target.cluster=java + nbm.is.global=false + jnlp.indirect.jars=\ diff --git a/debian/patches/netbeans-platform-nbi.patch b/debian/patches/netbeans-platform-nbi.patch new file mode 100644 index 0000000..ed159e4 --- /dev/null +++ b/debian/patches/netbeans-platform-nbi.patch @@ -0,0 +1,21 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 23 Oct 2016 21:39:48 +0200 +Subject: netbeans-platform-nbi + +--- + nbbuild/cluster.properties | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties +index da9364e..e044d59 100644 +--- a/nbbuild/cluster.properties ++++ b/nbbuild/cluster.properties +@@ -880,8 +880,6 @@ nb.cluster.harness=\ + apisupport.harness,\ + jellytools.platform,\ + jemmy,\ +- libs.nbi.ant,\ +- libs.nbi.engine,\ + nbjunit,\ + o.n.insane + diff --git a/debian/patches/netbeans-platform-o.n.html.ko4j.patch b/debian/patches/netbeans-platform-o.n.html.ko4j.patch new file mode 100644 index 0000000..02422ff --- /dev/null +++ b/debian/patches/netbeans-platform-o.n.html.ko4j.patch @@ -0,0 +1,28 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 23 Oct 2016 22:32:41 +0200 +Subject: netbeans platform o.n.html.ko4j + +--- + nbbuild/cluster.properties | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties +index e044d59..05d3f3d 100644 +--- a/nbbuild/cluster.properties ++++ b/nbbuild/cluster.properties +@@ -255,7 +255,6 @@ nb.cluster.platform=\ + netbinox,\ + o.jdesktop.layout,\ + o.n.core,\ +- o.n.html.ko4j,\ + o.n.html.xhr4j,\ + o.n.swing.outline,\ + o.n.swing.plaf,\ +@@ -287,7 +286,6 @@ nb.cluster.platform=\ + spi.actions,\ + spi.quicksearch,\ + templates,\ +- templatesui,\ + uihandler + validation.nb.cluster.platform=\ + o.n.core,\ diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch new file mode 100644 index 0000000..faf00d2 --- /dev/null +++ b/debian/patches/netbeans-platform-windowslauncher.patch @@ -0,0 +1,113 @@ +From: Markus Koschany <[email protected]> +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 | 18 +++++++----------- + o.n.bootstrap/launcher/windows/utilsfuncs.cpp | 1 + + 4 files changed, 13 insertions(+), 14 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..089c946 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 +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 28bcd21..ba0af4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,6 @@ netbeans-platform-empty-binaries-list.patch +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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
