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

[Vladimir Petko]

Please do not merge, this MP is part of the series[1][2]

Summary of changes:
  * d/p: drop obsolete patches (LP: #2011653).
    - generated-headers.patch: include is already added by openjdk makefile.

PPA: ppa:vpa1977/openjdk-drop-patches [3]

Testing:
 No functional changes in this MP:
       - generated-headers.patch/parallel-build-fix.patch provide an include directory. If something relies on files in those directories, compilation will be broken.

  Compilation must succeed [4].

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/439107
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/439108
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-drop-patches
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-drop-patches/+sourcepub/14557322/+listing-archive-extra

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 76208fe..6dc0e92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjdk-20 (20~36ea~us1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/p: drop obsolete patches (LP: #2011653).
+    - generated-headers.patch: include is already added by openjdk makefile.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 16 Mar 2023 16:59:11 +1300
+
 openjdk-20 (20~36ea~us1-0ubuntu1) lunar; urgency=medium
 
   * OpenJDK 20 snapshot, build 36 (LP: #2009116).
diff --git a/debian/patches/generated-headers.patch b/debian/patches/generated-headers.patch
 deleted file mode 100644
index c2d2753..0000000
--- a/debian/patches/generated-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-@@ -299,7 +299,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
-     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB) \
--        $(LCMS_CFLAGS), \
-+        $(LCMS_CFLAGS) -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
-     EXTRA_HEADER_DIRS := \
-         common/awt/debug \
-@@ -345,7 +345,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
-     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_imageioJPEG.c := clobbered array-bounds, \
-     DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
diff --git a/debian/patches/series b/debian/patches/series
index 9439323..6c9f10d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,6 @@ atk-wrapper-security.diff
 # java-access-bridge-security.diff
 # jdk-pulseaudio.diff
 dnd-files.diff
-generated-headers.patch
 m68k-support.diff
 # reproducible-javadoc-timestamp.diff
 make-debug-print.diff