diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch')
| -rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch index 13d3045..dbc714e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch @@ -1,7 +1,7 @@ -From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 Mon Sep 17 00:00:00 2001 +From ce26d6cbb550039516432993894d65660b7c9e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> Date: Tue, 27 Feb 2018 13:43:04 +0000 -Subject: [PATCH 2003/2008] jdk: Allow using a system-installed libpng +Subject: [PATCH] jdk: Allow using a system-installed libpng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,16 +18,17 @@ Issues fixed on top of debian patch: Upstream-Status: Backport Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com> + --- - make/lib/Awt2dLibraries.gmk | 12 +++++++++--- + jdk/make/lib/Awt2dLibraries.gmk | 12 +++++++++--- .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index 12b9da11d..cd8b94cd8 100644 +index 7fffcafc..7f42e09c 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -1148,7 +1148,6 @@ endif +@@ -1155,7 +1155,6 @@ endif ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_DIRS := \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ @@ -35,7 +36,7 @@ index 12b9da11d..cd8b94cd8 100644 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen ifeq ($(USE_EXTERNAL_LIBGIF), true) -@@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1172,6 +1171,13 @@ ifndef BUILD_HEADLESS_ONLY LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg endif @@ -49,7 +50,7 @@ index 12b9da11d..cd8b94cd8 100644 ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1229,12 +1235,12 @@ ifndef BUILD_HEADLESS_ONLY LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ @@ -65,7 +66,7 @@ index 12b9da11d..cd8b94cd8 100644 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c -index 3599433e4..5bf002ea1 100644 +index 3599433e..5bf002ea 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c @@ -25,8 +25,7 @@ @@ -78,6 +79,3 @@ index 3599433e4..5bf002ea1 100644 #include <setjmp.h> #define SIG_BYTES 8 --- -2.24.1 - |