[libnb-platform-java] 05/22: Drop all patches
Markus Koschany
apo at moszumanska.debian.org
Sat Oct 29 13:12:04 UTC 2016
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 e76e2c2bc66c4d1b0ea94773f53234de59889409
Author: Markus Koschany <apo at debian.org>
Date: Sun Oct 23 19:20:27 2016 +0200
Drop all patches
---
...etbeans-platform-disable-net.java-modules.patch | 60 ----
debian/patches/netbeans-platform-jemmy.patch | 26 --
debian/patches/netbeans-platform-junitlib.patch | 26 --
debian/patches/netbeans-platform-nbi.patch | 23 --
.../patches/netbeans-platform-nojnabinaries.patch | 69 ----
.../patches/netbeans-platform-o.n.html.ko4j.patch | 31 --
debian/patches/netbeans-platform-properties.patch | 39 ---
.../netbeans-platform-windowslauncher.patch | 379 ---------------------
debian/patches/osgi-update.patch | 52 ---
debian/patches/series | 9 -
10 files changed, 714 deletions(-)
diff --git a/debian/patches/netbeans-platform-disable-net.java-modules.patch b/debian/patches/netbeans-platform-disable-net.java-modules.patch
deleted file mode 100644
index 9c0543b..0000000
--- a/debian/patches/netbeans-platform-disable-net.java-modules.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 16:54:49 +0100
-Subject: netbeans platform disable net.java modules
-
-Disable the net.java.module because it is not available in Debian.
-
-Forwarded: not-needed
----
- 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 8e3826a..3c780eb 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 fce0fcb..776c7d4 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -201,7 +201,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,\
-@@ -249,13 +248,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 9d4bc83..28f236f 100644
---- a/net.java.html/build.xml
-+++ b/net.java.html/build.xml
-@@ -3,3 +3,4 @@
- <import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar"/>
- </project>
-+
diff --git a/debian/patches/netbeans-platform-jemmy.patch b/debian/patches/netbeans-platform-jemmy.patch
deleted file mode 100644
index 92a41c6..0000000
--- a/debian/patches/netbeans-platform-jemmy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 2 Jun 2015 13:48:04 +0200
-Subject: netbeans platform jemmy
-
-We don't include zips of the jemmy doc or src. Otherwise this would cause a
-FTBFS.
-
-Forwarded: not-needed
----
- jemmy/nbproject/project.properties | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/jemmy/nbproject/project.properties b/jemmy/nbproject/project.properties
-index ab73fe9..f15365d 100644
---- a/jemmy/nbproject/project.properties
-+++ b/jemmy/nbproject/project.properties
-@@ -43,7 +43,7 @@ is.autoload=true
- javac.compilerargs=-Xlint -Xlint:-serial
- javac.source=1.6
- release.external/jemmy-2.3.1.1.jar=modules/ext/jemmy-2.3.1.1.jar
--release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
--release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
-+#release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
-+#release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
- sigtest.gen.fail.on.error=false
-
diff --git a/debian/patches/netbeans-platform-junitlib.patch b/debian/patches/netbeans-platform-junitlib.patch
deleted file mode 100644
index df95cf1..0000000
--- a/debian/patches/netbeans-platform-junitlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 18:21:48 +0100
-Subject: netbeans platform junitlib
-
-We don't include source or javadoc jars of junit4. This is to prevent a FTBFS.
-
-Forwarded: not-needed
----
- 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 e6f478f..d7ba938 100644
---- a/junitlib/nbproject/project.properties
-+++ b/junitlib/nbproject/project.properties
-@@ -1,8 +1,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
deleted file mode 100644
index cfd41d1..0000000
--- a/debian/patches/netbeans-platform-nbi.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 13:42:24 +0200
-Subject: netbeans platform nbi
-
-Don't build the Netbeans Installer modules.
-Forwarded: not-needed
----
- nbbuild/cluster.properties | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 9b1177a..fce0fcb 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -883,8 +883,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-nojnabinaries.patch b/debian/patches/netbeans-platform-nojnabinaries.patch
deleted file mode 100644
index 7644cee..0000000
--- a/debian/patches/netbeans-platform-nojnabinaries.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 14:21:49 +0200
-Subject: netbeans platform nojnabinaries
-
-We don't need to install any JNA binaries, since they're already installed.
-Forwarded: not-needed
----
- libs.jna.platform/nbproject/project.properties | 2 +-
- libs.jna/nbproject/project.properties | 24 +++++++++++------------
- libs.jna/src/org/netbeans/libs/jna/Installer.java | 2 +-
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
-index b8afdb4..608ea2b 100644
---- a/libs.jna.platform/nbproject/project.properties
-+++ b/libs.jna.platform/nbproject/project.properties
-@@ -42,5 +42,5 @@
-
- is.autoload=true
- javac.source=1.6
--release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
-+#release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
- sigtest.gen.fail.on.error=false
-diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
-index c6de368..0a8e520 100644
---- a/libs.jna/nbproject/project.properties
-+++ b/libs.jna/nbproject/project.properties
-@@ -41,17 +41,17 @@
- # made subject to such option by the copyright holder.
-
- javac.source=1.6
--release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
-+#release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
- # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
--release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
--release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
--release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
--release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
--release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
--jnlp.verify.excludes=\
-- modules/lib/amd64/jnidispatch-410.dll,\
-- modules/lib/amd64/linux/libjnidispatch-410.so,\
-- modules/lib/i386/linux/libjnidispatch-410.so,\
-- modules/lib/x86/jnidispatch-410.dll,\
-- modules/lib/libjnidispatch-410.jnilib
-+#release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
-+#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
-+#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
-+#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
-+#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
-+#jnlp.verify.excludes=\
-+# modules/lib/amd64/jnidispatch-410.dll,\
-+# modules/lib/amd64/linux/libjnidispatch-410.so,\
-+# modules/lib/i386/linux/libjnidispatch-410.so,\
-+# modules/lib/x86/jnidispatch-410.dll,\
-+# modules/lib/libjnidispatch-410.jnilib
- sigtest.gen.fail.on.error=false
-diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
-index cf306a7..fa3201f 100644
---- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
-+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
-@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
- public void validate() {
- super.validate();
- //#211655
-- System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
-+ System.setProperty( "jna.boot.library.name", "jnidispatch" ); //NOI18N
- }
- }
diff --git a/debian/patches/netbeans-platform-o.n.html.ko4j.patch b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
deleted file mode 100644
index 15467a3..0000000
--- a/debian/patches/netbeans-platform-o.n.html.ko4j.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 19:21:45 +0100
-Subject: netbeans platform o.n.html.ko4j
-
-Disable the o.n.html.ko4j module similar to net.java.html.
-
-Forwarded: not-needed
----
- nbbuild/cluster.properties | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 776c7d4..4d3337a 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -251,7 +251,6 @@ nb.cluster.platform=\
- netbinox,\
- o.jdesktop.layout,\
- o.n.core,\
-- o.n.html.ko4j,\
- o.n.swing.outline,\
- o.n.swing.plaf,\
- o.n.swing.tabcontrol,\
-@@ -282,7 +281,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-properties.patch b/debian/patches/netbeans-platform-properties.patch
deleted file mode 100644
index d635e02..0000000
--- a/debian/patches/netbeans-platform-properties.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 19:35:45 +0200
-Subject: netbeans platform properties
-
-We don't include the swing layout source zip. Otherwise this would cause a
-FTBFS.
-
-Forwarded: not-needed
----
- libs.testng/nbproject/project.properties | 2 +-
- o.jdesktop.layout/nbproject/project.properties | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libs.testng/nbproject/project.properties b/libs.testng/nbproject/project.properties
-index 4d3caca..9d9f860 100644
---- a/libs.testng/nbproject/project.properties
-+++ b/libs.testng/nbproject/project.properties
-@@ -42,7 +42,7 @@
-
- is.autoload=true
- release.external/testng-6.8.1-dist.jar=modules/ext/testng-6.8.1-dist.jar
--release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
-+#release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
- sigtest.skip.check=true
- sigtest.fail.on.error=false
- jnlp.indirect.jars=\
-diff --git a/o.jdesktop.layout/nbproject/project.properties b/o.jdesktop.layout/nbproject/project.properties
-index bf2a43b..015c254 100644
---- a/o.jdesktop.layout/nbproject/project.properties
-+++ b/o.jdesktop.layout/nbproject/project.properties
-@@ -42,6 +42,6 @@
-
- is.autoload=true
- release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
--release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
--release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
-+#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-+#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
- jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
deleted file mode 100644
index 9ee464f..0000000
--- a/debian/patches/netbeans-platform-windowslauncher.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 01:23:09 +0100
-Subject: netbeans platform windowslauncher
-
-Use mingw32 to build the windows launchers. These are useful if the Netbeans
-platform is used to build another application on Debian which you want to be
-able to run on a Windows system.
-
-Forwarded: not-needed
----
- apisupport.harness/windows-launcher-src/Makefile | 7 ++---
- .../nbproject/Makefile-app.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, 61 insertions(+), 62 deletions(-)
-
-diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
-index c7d6f5e..f5499dc 100644
---- a/apisupport.harness/windows-launcher-src/Makefile
-+++ b/apisupport.harness/windows-launcher-src/Makefile
-@@ -17,7 +17,7 @@
- MKDIR=mkdir
- CP=cp
- CCADMIN=CCadmin
--RANLIB=ranlib
-+RANLIB=i686-w64-mingw32-ranlib
-
-
-
-@@ -28,10 +28,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...
-@@ -40,6 +40,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/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
-index c96635b..3859387 100644
---- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
-+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=gcc.exe
--CCC=g++.exe
--CXX=g++.exe
--FC=gfortran
--AS=as.exe
-+RANLIB=i686-w64-mingw32-ranlib
-+CC=
-+CCC=i686-w64-mingw32-g++
-+CXX=i686-w64-mingw32-g++
-+FC=
-+AS=i686-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin-Windows
-@@ -45,8 +45,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m32 -mno-cygwin
--CXXFLAGS=-m32 -mno-cygwin
-+CCFLAGS=-m32
-+CXXFLAGS=-m32
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app.res
- ${OBJECTDIR}/applauncher.o: applauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} $@.d
-- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.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=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.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=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.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=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-
- # 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..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
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=x86_64-w64-mingw32-gcc.exe
--CCC=x86_64-w64-mingw32-g++.exe
--CXX=x86_64-w64-mingw32-g++.exe
--FC=gfortran
--AS=as.exe
-+RANLIB=x86_64-w64-mingw32-ranlib
-+CC=x86_64-w64-mingw32-gcc
-+CCC=x86_64-w64-mingw32-g++
-+CXX=x86_64-w64-mingw32-g++
-+FC=
-+AS=x86_64-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin64-Windows
-@@ -45,8 +45,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
--CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-+CCFLAGS=-m64 -static-libgcc -static-libstdc++
-+CXXFLAGS=-m64 -static-libgcc -static-libstdc++
-
- # Fortran Compiler Flags
- FFLAGS=
-diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
-index 97c15ba..a1a5967 100644
---- a/ide/launcher/windows/nblauncher.cpp
-+++ b/ide/launcher/windows/nblauncher.cpp
-@@ -53,6 +53,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 990aafa..2f78df1 100644
---- a/o.n.bootstrap/launcher/windows/Makefile
-+++ b/o.n.bootstrap/launcher/windows/Makefile
-@@ -15,7 +15,7 @@
- MKDIR=mkdir
- CP=cp
- CCADMIN=CCadmin
--RANLIB=ranlib
-+RANLIB=i686-w64-mingw32-ranlib
-
-
-
-@@ -26,16 +26,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
-
-
-
-@@ -46,7 +42,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/nbproject/Makefile-nbexec.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-index 7b5163b..961e7dc 100644
---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=gcc
--CCC=g++
--CXX=g++
--FC=gfortran
--AS=as
-+RANLIB=i686-w64-mingw32-ranlib
-+CC=
-+CCC=i686-w64-mingw32-g++
-+CXX=i686-w64-mingw32-g++
-+FC=
-+AS=i686-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin-Windows
-@@ -46,8 +46,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m32 -mno-cygwin
--CXXFLAGS=-m32 -mno-cygwin
-+CCFLAGS=-m32
-+CXXFLAGS=-m32
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res
- nbexec.dll: ${OBJECTDIR}/nbexec.res
-
- nbexec.dll: ${OBJECTFILES}
-- ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared
-+ ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -shared
-
- ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-
- ${OBJECTDIR}/nbexec.o: nbexec.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-
- ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
- ${MKDIR} -p ${OBJECTDIR}
- @echo Compiling Resource files...
-- windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
-+ i686-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
-
- : nbexec_exe.rc
- @echo
-@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
- ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-
- ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-
- ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-
- # Subprojects
- .build-subprojects:
-diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-index 7fb819e..485127e 100644
---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=x86_64-w64-mingw32-gcc
-+RANLIB=x86_64-w64-mingw32-ranlib
-+CC=
- CCC=x86_64-w64-mingw32-g++
- CXX=x86_64-w64-mingw32-g++
--FC=gfortran
--AS=as
-+FC=
-+AS=x86_64-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin64-Windows
-@@ -46,8 +46,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
--CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-+CCFLAGS=-m64 -static-libgcc -static-libstdc++
-+CXXFLAGS=-m64 -static-libgcc -static-libstdc++
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res
- nbexec64.dll: ${OBJECTDIR}/nbexec64.res
-
- nbexec64.dll: ${OBJECTFILES}
-- ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared
-+ ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -shared
-
- ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-
- ${OBJECTDIR}/nbexec.o: nbexec.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-
- ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
- ${MKDIR} -p ${OBJECTDIR}
- @echo Compiling Resource files...
-- x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
-+ x86_64-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
-
- : nbexec_exe.rc
- @echo
-@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
- ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-
- ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-
- ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-
- # Subprojects
- .build-subprojects:
-diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-index 21f947f..0193220 100644
---- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-@@ -52,6 +52,7 @@
- #include "argnames.h"
- #include <tlhelp32.h>
- #include <windows.h>
-+#include <stdio.h>
-
- using namespace std;
-
diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch
deleted file mode 100644
index d429140..0000000
--- a/debian/patches/osgi-update.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 20:52:04 +0200
-Subject: osgi update
-
-Implement missing methods or correct parameter changes due to the latest OSGi
-upgrade. It may be possible to drop this patch in the future, when upstream
-catches up.
-
-Forwarded: not-needed
----
- netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java | 2 +-
- netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
-index d97a2cd..37846b0 100644
---- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
-+++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
-@@ -128,7 +128,7 @@ final class JarBundleFile extends BundleFile implements BundleContent {
- final File bf = new File(getBaseFile().getPath());
- if (bf.isDirectory()) {
- try {
-- delegate = new DirBundleFile(bf, false);
-+ delegate = new DirBundleFile(bf);
- return false;
- } catch (IOException dirEx) {
- NetbinoxFactory.LOG.log(Level.WARNING,
-diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-index 89c1357..77a70d3 100644
---- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-+++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-@@ -61,6 +61,8 @@ import org.osgi.framework.InvalidSyntaxException;
- import org.osgi.framework.ServiceListener;
- import org.osgi.framework.ServiceReference;
- import org.osgi.framework.ServiceRegistration;
-+import org.osgi.framework.ServiceObjects;
-+import org.osgi.framework.ServiceFactory;
-
- /**
- *
-@@ -239,5 +241,11 @@ class Netbinox extends Equinox {
- public void addBundleListener(BundleListener bl) {
- delegate.addBundleListener(bl);
- }
-+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> refer) {
-+ return null;
-+ }
-+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String,?> dictio) {
-+ return null;
-+ }
- } // end of Context
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7812b42..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,9 +0,0 @@
-netbeans-platform-nbi.patch
-netbeans-platform-nojnabinaries.patch
-netbeans-platform-properties.patch
-osgi-update.patch
-netbeans-platform-jemmy.patch
-netbeans-platform-windowslauncher.patch
-netbeans-platform-disable-net.java-modules.patch
-netbeans-platform-junitlib.patch
-netbeans-platform-o.n.html.ko4j.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git
More information about the pkg-java-commits
mailing list