summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch
diff options
context:
space:
mode:
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.patch16
1 files changed, 8 insertions, 8 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..eb79183 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 @@
1From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 Mon Sep 17 00:00:00 2001 1From f74002f805b000df6565418d9e8416edbe86be25 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 13:43:04 +0000 3Date: Tue, 27 Feb 2018 13:43:04 +0000
4Subject: [PATCH 2003/2008] jdk: Allow using a system-installed libpng 4Subject: [PATCH 2003/2009] jdk: Allow using a system-installed libpng
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -24,10 +24,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
24 2 files changed, 10 insertions(+), 5 deletions(-) 24 2 files changed, 10 insertions(+), 5 deletions(-)
25 25
26diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk 26diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
27index 12b9da11d..cd8b94cd8 100644 27index 7fffcafc70..7f42e09ce4 100644
28--- a/jdk/make/lib/Awt2dLibraries.gmk 28--- a/jdk/make/lib/Awt2dLibraries.gmk
29+++ b/jdk/make/lib/Awt2dLibraries.gmk 29+++ b/jdk/make/lib/Awt2dLibraries.gmk
30@@ -1148,7 +1148,6 @@ endif 30@@ -1155,7 +1155,6 @@ endif
31 ifndef BUILD_HEADLESS_ONLY 31 ifndef BUILD_HEADLESS_ONLY
32 LIBSPLASHSCREEN_DIRS := \ 32 LIBSPLASHSCREEN_DIRS := \
33 $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ 33 $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
@@ -35,7 +35,7 @@ index 12b9da11d..cd8b94cd8 100644
35 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen 35 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
36 36
37 ifeq ($(USE_EXTERNAL_LIBGIF), true) 37 ifeq ($(USE_EXTERNAL_LIBGIF), true)
38@@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY 38@@ -1172,6 +1171,13 @@ ifndef BUILD_HEADLESS_ONLY
39 LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg 39 LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
40 endif 40 endif
41 41
@@ -49,7 +49,7 @@ index 12b9da11d..cd8b94cd8 100644
49 ifneq ($(OPENJDK_TARGET_OS), macosx) 49 ifneq ($(OPENJDK_TARGET_OS), macosx)
50 LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen 50 LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
51 else 51 else
52@@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY 52@@ -1229,12 +1235,12 @@ ifndef BUILD_HEADLESS_ONLY
53 LANG := C, \ 53 LANG := C, \
54 OPTIMIZATION := LOW, \ 54 OPTIMIZATION := LOW, \
55 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ 55 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
@@ -65,7 +65,7 @@ index 12b9da11d..cd8b94cd8 100644
65 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ 65 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
66 RC_FLAGS := $(RC_FLAGS) \ 66 RC_FLAGS := $(RC_FLAGS) \
67diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 67diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
68index 3599433e4..5bf002ea1 100644 68index 3599433e42..5bf002ea17 100644
69--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 69--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
70+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 70+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
71@@ -25,8 +25,7 @@ 71@@ -25,8 +25,7 @@
@@ -79,5 +79,5 @@ index 3599433e4..5bf002ea1 100644
79 79
80 #define SIG_BYTES 8 80 #define SIG_BYTES 8
81-- 81--
822.24.1 822.26.2
83 83