Merge ~vpa1977/ubuntu/+source/openjdk-lts:lp2011653-drop-patches into ubuntu/+source/openjdk-lts:ubuntu/devel

[Vladimir Petko]

Please do not merge, this merge proposal is a part of a series [1][2][3].

Summary of changes:
  * d/p: drop obsolete patches (LP: #2011653).
    - workaround_expand_exec_shield_cs_limit.diff: obsoleted by
      hotspot-disable-exec-shield-workaround.diff.
    - generated-headers.patch: include is already added by openjdk makefile.
    - parallel-build-fix.diff: include is not necessary.

PPA: ppa:vpa1977/openjdk-new-repack [4]

Testing:
 No functional changes in this MP:
       - workaround_expand_exec_shield_cs_limit.diff is obsoleted by another patch applied later in the series
       - generated-headers.patch/parallel-build-fix.patch provide an include directory. If something relies on files in those directories, compilation will be broken.
       - parallel-build-fix.diff: provides a duplicate include path.

  Compilation must succeed [5]

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/439014
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/439016
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/439029
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-new-repack
[5] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-new-repack/+sourcepub/14560391/+listing-archive-extra

[Dan Bungert (dbungert)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 4ced2ad..b4cabb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openjdk-lts (11.0.18+10-0ubuntu4) UNRELEASED; urgency=medium
+
+  * d/p: drop obsolete patches (LP: #2011653).
+    - workaround_expand_exec_shield_cs_limit.diff: obsoleted by
+      hotspot-disable-exec-shield-workaround.diff.
+    - generated-headers.patch: include is already added by openjdk makefile.
+    - parallel-build-fix.diff: include is not necessary.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 16 Mar 2023 08:39:50 +1300
+
 openjdk-lts (11.0.18+10-0ubuntu3) lunar; urgency=medium
 
   * debian/JB-jre-headless.postinst.in: trigger ca-certificates-java after jre
diff --git a/debian/patches/generated-headers.patch b/debian/patches/generated-headers.patch
deleted file mode 100644
index f9aa947..0000000
--- a/debian/patches/generated-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/make/lib/Awt2dLibraries.gmk
-+++ b/make/lib/Awt2dLibraries.gmk
-@@ -383,7 +383,7 @@
-     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(LCMS_CFLAGS_JDKLIB) \
--        $(LCMS_CFLAGS), \
-+        $(LCMS_CFLAGS) -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-     CFLAGS_solaris := -xc99=no_lib, \
-     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
-     EXTRA_HEADER_DIRS := \
-@@ -432,7 +432,7 @@
-     NAME := javajpeg, \
-     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
-     OPTIMIZATION := HIGHEST, \
--    CFLAGS := $(CFLAGS_JDKLIB), \
-+    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-     HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
-     DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value array-bounds, \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
diff --git a/debian/patches/hotspot-disable-exec-shield-workaround.diff b/debian/patches/hotspot-disable-exec-shield-workaround.diff
index 34c6e14..d8c1235 100644
--- a/debian/patches/hotspot-disable-exec-shield-workaround.diff
+++ b/debian/patches/hotspot-disable-exec-shield-workaround.diff
@@ -4,7 +4,7 @@
   * updates (JDK-8023956).
   */
  void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32) && !defined(ZERO)
+-#if defined(IA32)
 +#if 0
    assert(Linux::initial_thread_stack_bottom() != NULL, "sanity");
    size_t page_size = os::vm_page_size();
diff --git a/debian/patches/parallel-build-fix.diff b/debian/patches/parallel-build-fix.diff
deleted file mode 100644
index c414eb2..0000000
--- a/debian/patches/parallel-build-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: b/make/hotspot/gensrc/GensrcJfr.gmk
-===================================================================
---- a/make/hotspot/gensrc/GensrcJfr.gmk
-+++ b/make/hotspot/gensrc/GensrcJfr.gmk
-@@ -41,6 +41,7 @@ $(eval $(call SetupJavaCompilation, BUIL
-     SETUP := GENERATE_JFRBYTECODE, \
-     SRC := $(JFR_TOOLS_SRCDIR), \
-     BIN := $(JFR_TOOLS_OUTPUTDIR), \
-+    INCLUDES := build/tools/jfr, \
- ))
- 
- TARGETS += $(BUILD_JFR_TOOLS)
diff --git a/debian/patches/series b/debian/patches/series
index 27795ee..b82a5bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ icedtea-override-redirect-compiz.diff
 libpcsclite-dlopen.diff
 jexec.diff
 default-jvm-cfg.diff
-workaround_expand_exec_shield_cs_limit.diff
 adlc-parser.diff
 multiple-pkcs11-library-init.diff
 s390x-thread-stack-size.diff
@@ -21,8 +20,6 @@ hotspot-disable-exec-shield-workaround.diff
 atk-wrapper-security.diff
 dnd-files.diff
 hotspot-libpath.diff
-generated-headers.patch
-parallel-build-fix.diff
 #m68k-support.diff
 reproducible-properties-timestamp.diff
 reproducible-javadoc-timestamp.diff
diff --git a/debian/patches/workaround_expand_exec_shield_cs_limit.diff b/debian/patches/workaround_expand_exec_shield_cs_limit.diff
deleted file mode 100644
index fc635ec..0000000
--- a/debian/patches/workaround_expand_exec_shield_cs_limit.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
-+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
-@@ -874,7 +874,7 @@
-  * updates (JDK-8023956).
-  */
- void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   assert(Linux::initial_thread_stack_bottom() != NULL, "sanity");
-   size_t page_size = os::vm_page_size();
-