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.patch14
1 files changed, 6 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 9c4e70e..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 @@
1From c7fb1d599ba66116fb132537b4696092e9c48331 Mon Sep 17 00:00:00 2001 1From ce26d6cbb550039516432993894d65660b7c9e06 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/2009] jdk: Allow using a system-installed libpng 4Subject: [PATCH] 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
@@ -18,13 +18,14 @@ Issues fixed on top of debian patch:
18Upstream-Status: Backport 18Upstream-Status: Backport
19Signed-off-by: André Draszik <andre.draszik@jci.com> 19Signed-off-by: André Draszik <andre.draszik@jci.com>
20Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 20Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
21
21--- 22---
22 make/lib/Awt2dLibraries.gmk | 12 +++++++++--- 23 jdk/make/lib/Awt2dLibraries.gmk | 12 +++++++++---
23 .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- 24 .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +--
24 2 files changed, 10 insertions(+), 5 deletions(-) 25 2 files changed, 10 insertions(+), 5 deletions(-)
25 26
26diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk 27diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
27index 7fffcafc70..7f42e09ce4 100644 28index 7fffcafc..7f42e09c 100644
28--- a/jdk/make/lib/Awt2dLibraries.gmk 29--- a/jdk/make/lib/Awt2dLibraries.gmk
29+++ b/jdk/make/lib/Awt2dLibraries.gmk 30+++ b/jdk/make/lib/Awt2dLibraries.gmk
30@@ -1155,7 +1155,6 @@ endif 31@@ -1155,7 +1155,6 @@ endif
@@ -65,7 +66,7 @@ index 7fffcafc70..7f42e09ce4 100644
65 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ 66 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
66 RC_FLAGS := $(RC_FLAGS) \ 67 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 68diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
68index 3599433e42..5bf002ea17 100644 69index 3599433e..5bf002ea 100644
69--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 70--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
70+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 71+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
71@@ -25,8 +25,7 @@ 72@@ -25,8 +25,7 @@
@@ -78,6 +79,3 @@ index 3599433e42..5bf002ea17 100644
78 #include <setjmp.h> 79 #include <setjmp.h>
79 80
80 #define SIG_BYTES 8 81 #define SIG_BYTES 8
81--
822.26.2
83