|
18 | 18 | fi
|
19 | 19 |
|
20 | 20 | git checkout -f $REV
|
| 21 | +git cherry-pick -n da5d804660a142b2ce96b570ad7a40436e1859c1 |
| 22 | +git apply - <<'EOF' |
| 23 | +diff --git a/platform/libs.jna.platform/external/binaries-list b/platform/libs.jna.platform/external/binaries-list |
| 24 | +index 9acffb010f..0b881e49bd 100644 |
| 25 | +--- a/platform/libs.jna.platform/external/binaries-list |
| 26 | ++++ b/platform/libs.jna.platform/external/binaries-list |
| 27 | +@@ -15,4 +15,4 @@ |
| 28 | + # specific language governing permissions and limitations |
| 29 | + # under the License. |
| 30 | + |
| 31 | +-C535A5BDA553D7D7690356C825010DA74B2671B5 net.java.dev.jna:jna-platform:5.9.0 |
| 32 | ++FBED7D9669DBA47714AD0D4F4454290A997AEE69 net.java.dev.jna:jna-platform:5.10.0 |
| 33 | +diff --git a/platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt b/platform/libs.jna.platform/external/jna-platform-5.10.0-license.txt |
| 34 | +similarity index 99% |
| 35 | +rename from platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt |
| 36 | +rename to platform/libs.jna.platform/external/jna-platform-5.10.0-license.txt |
| 37 | +index 7ab5d5838b..93f6f38469 100644 |
| 38 | +--- a/platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt |
| 39 | ++++ b/platform/libs.jna.platform/external/jna-platform-5.10.0-license.txt |
| 40 | +@@ -1,5 +1,5 @@ |
| 41 | + Name: Java Native Access |
| 42 | +-Version: 5.9.0 |
| 43 | ++Version: 5.10.0 |
| 44 | + License: Apache-2.0 |
| 45 | + Description: Dynamically access native libraries from Java without JNI. |
| 46 | + Origin: Java Native Access |
| 47 | +diff --git a/platform/libs.jna.platform/nbproject/project.properties b/platform/libs.jna.platform/nbproject/project.properties |
| 48 | +index b86335082c..247f130b0b 100644 |
| 49 | +--- a/platform/libs.jna.platform/nbproject/project.properties |
| 50 | ++++ b/platform/libs.jna.platform/nbproject/project.properties |
| 51 | +@@ -17,5 +17,5 @@ |
| 52 | + |
| 53 | + is.autoload=true |
| 54 | + javac.source=1.6 |
| 55 | +-release.external/jna-platform-5.9.0.jar=modules/ext/jna-platform-5.9.0.jar |
| 56 | ++release.external/jna-platform-5.10.0.jar=modules/ext/jna-platform-5.10.0.jar |
| 57 | + sigtest.gen.fail.on.error=false |
| 58 | +diff --git a/platform/libs.jna.platform/nbproject/project.xml b/platform/libs.jna.platform/nbproject/project.xml |
| 59 | +index c7fc274277..07d114bf37 100644 |
| 60 | +--- a/platform/libs.jna.platform/nbproject/project.xml |
| 61 | ++++ b/platform/libs.jna.platform/nbproject/project.xml |
| 62 | +@@ -47,8 +47,8 @@ |
| 63 | + <package>com.sun.jna.platform.wince</package> |
| 64 | + </public-packages> |
| 65 | + <class-path-extension> |
| 66 | +- <runtime-relative-path>ext/jna-platform-5.9.0.jar</runtime-relative-path> |
| 67 | +- <binary-origin>external/jna-platform-5.9.0.jar</binary-origin> |
| 68 | ++ <runtime-relative-path>ext/jna-platform-5.10.0.jar</runtime-relative-path> |
| 69 | ++ <binary-origin>external/jna-platform-5.10.0.jar</binary-origin> |
| 70 | + </class-path-extension> |
| 71 | + </data> |
| 72 | + </configuration> |
| 73 | +diff --git a/platform/libs.jna/external/binaries-list b/platform/libs.jna/external/binaries-list |
| 74 | +index ab565afa1b..47981ab434 100644 |
| 75 | +--- a/platform/libs.jna/external/binaries-list |
| 76 | ++++ b/platform/libs.jna/external/binaries-list |
| 77 | +@@ -15,4 +15,4 @@ |
| 78 | + # specific language governing permissions and limitations |
| 79 | + # under the License. |
| 80 | + |
| 81 | +-8F503E6D9B500CEFF299052D6BE75B38C7257758 net.java.dev.jna:jna:5.9.0 |
| 82 | ++7CF4C87DD802DB50721DB66947AA237D7AD09418 net.java.dev.jna:jna:5.10.0 |
| 83 | +diff --git a/platform/libs.jna/external/jna-5.9.0-license.txt b/platform/libs.jna/external/jna-5.10.0-license.txt |
| 84 | +similarity index 99% |
| 85 | +rename from platform/libs.jna/external/jna-5.9.0-license.txt |
| 86 | +rename to platform/libs.jna/external/jna-5.10.0-license.txt |
| 87 | +index 7ab5d5838b..93f6f38469 100644 |
| 88 | +--- a/platform/libs.jna/external/jna-5.9.0-license.txt |
| 89 | ++++ b/platform/libs.jna/external/jna-5.10.0-license.txt |
| 90 | +@@ -1,5 +1,5 @@ |
| 91 | + Name: Java Native Access |
| 92 | +-Version: 5.9.0 |
| 93 | ++Version: 5.10.0 |
| 94 | + License: Apache-2.0 |
| 95 | + Description: Dynamically access native libraries from Java without JNI. |
| 96 | + Origin: Java Native Access |
| 97 | +diff --git a/platform/libs.jna/manifest.mf b/platform/libs.jna/manifest.mf |
| 98 | +index 268c326a7f..dfc5d87c52 100644 |
| 99 | +--- a/platform/libs.jna/manifest.mf |
| 100 | ++++ b/platform/libs.jna/manifest.mf |
| 101 | +@@ -4,4 +4,4 @@ OpenIDE-Module: org.netbeans.libs.jna/2 |
| 102 | + OpenIDE-Module-Install: org/netbeans/libs/jna/Installer.class |
| 103 | + OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jna/Bundle.properties |
| 104 | + AutoUpdate-Essential-Module: true |
| 105 | +-OpenIDE-Module-Specification-Version: 2.7 |
| 106 | ++OpenIDE-Module-Specification-Version: 2.9 |
| 107 | +diff --git a/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig b/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig |
| 108 | +index 2fda185287..a5ad4f21b8 100644 |
| 109 | +--- a/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig |
| 110 | ++++ b/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig |
| 111 | +@@ -269,7 +269,7 @@ fld public final static int POINTER_SIZE |
| 112 | + fld public final static int SIZE_T_SIZE |
| 113 | + fld public final static int WCHAR_SIZE |
| 114 | + fld public final static java.lang.String DEFAULT_ENCODING |
| 115 | +-fld public final static java.lang.String VERSION = "5.9.0" |
| 116 | ++fld public final static java.lang.String VERSION = "5.10.0" |
| 117 | + fld public final static java.lang.String VERSION_NATIVE = "6.1.1" |
| 118 | + fld public final static java.nio.charset.Charset DEFAULT_CHARSET |
| 119 | + innr public abstract interface static ffi_callback |
| 120 | +diff --git a/platform/libs.jna/nbproject/project.properties b/platform/libs.jna/nbproject/project.properties |
| 121 | +index a7efb245d5..4d01926a66 100644 |
| 122 | +--- a/platform/libs.jna/nbproject/project.properties |
| 123 | ++++ b/platform/libs.jna/nbproject/project.properties |
| 124 | +@@ -16,16 +16,16 @@ |
| 125 | + # under the License. |
| 126 | + |
| 127 | + javac.source=1.6 |
| 128 | +-release.external/jna-5.9.0.jar=modules/ext/jna-5.9.0.jar |
| 129 | ++release.external/jna-5.10.0.jar=modules/ext/jna-5.10.0.jar |
| 130 | + # 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. |
| 131 | +-release.external/jna-5.9.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib |
| 132 | +-release.external/jna-5.9.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib |
| 133 | +-release.external/jna-5.9.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so |
| 134 | +-release.external/jna-5.9.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so |
| 135 | +-release.external/jna-5.9.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so |
| 136 | +-release.external/jna-5.9.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll |
| 137 | +-release.external/jna-5.9.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll |
| 138 | +-release.external/jna-5.9.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll |
| 139 | ++release.external/jna-5.10.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib |
| 140 | ++release.external/jna-5.10.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib |
| 141 | ++release.external/jna-5.10.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so |
| 142 | ++release.external/jna-5.10.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so |
| 143 | ++release.external/jna-5.10.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so |
| 144 | ++release.external/jna-5.10.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll |
| 145 | ++release.external/jna-5.10.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll |
| 146 | ++release.external/jna-5.10.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll |
| 147 | + jnlp.verify.excludes=\ |
| 148 | + modules/lib/amd64/jnidispatch-nb.dll,\ |
| 149 | + modules/lib/x86/jnidispatch-nb.dll,\ |
| 150 | +diff --git a/platform/libs.jna/nbproject/project.xml b/platform/libs.jna/nbproject/project.xml |
| 151 | +index b72dff6ae4..20f5f4e84f 100644 |
| 152 | +--- a/platform/libs.jna/nbproject/project.xml |
| 153 | ++++ b/platform/libs.jna/nbproject/project.xml |
| 154 | +@@ -48,8 +48,8 @@ |
| 155 | + <package>com.sun.jna.win32</package> |
| 156 | + </public-packages> |
| 157 | + <class-path-extension> |
| 158 | +- <runtime-relative-path>ext/jna-5.9.0.jar</runtime-relative-path> |
| 159 | +- <binary-origin>external/jna-5.9.0.jar</binary-origin> |
| 160 | ++ <runtime-relative-path>ext/jna-5.10.0.jar</runtime-relative-path> |
| 161 | ++ <binary-origin>external/jna-5.10.0.jar</binary-origin> |
| 162 | + </class-path-extension> |
| 163 | + </data> |
| 164 | + </configuration> |
| 165 | +EOF |
21 | 166 | patch -p1 <<'EOF'
|
22 | 167 | diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
|
23 | 168 | index 4d1dbb762b..8f2630e25e 100644
|
|
0 commit comments