Attachment 213200 Details for Bug 243454 – Fix mismerged patch for mapfile-bsd

[patch] Fix mismerged patch for mapfile-bsd

openjdk8.diff (text/plain), 1.97 KB, created by Jung-uk Kim on 2020-04-08 20:07:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2020-04-08 20:07:36 UTC

Size: 1.97 KB

patch

obsolete

>Index: java/openjdk8/Makefile
>===================================================================
>--- java/openjdk8/Makefile	(revision 531144)
>+++ java/openjdk8/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	openjdk
> PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	java devel
> MASTER_SITES=	LOCAL/jkim:jtreg
> PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
>Index: java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
>===================================================================
>--- java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd	(nonexistent)
>+++ java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd	(working copy)
>@@ -0,0 +1,17 @@
>+--- jdk/make/mapfiles/libnio/mapfile-bsd.orig	2020-01-16 18:18:12 UTC
>++++ jdk/make/mapfiles/libnio/mapfile-bsd
>+@@ -141,6 +141,14 @@ SUNWprivate_1.1 {
>+ 		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
>+ 		Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
>+ 		Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
>++		Java_sun_nio_fs_LinuxWatchService_configureBlocking;
>++		Java_sun_nio_fs_LinuxWatchService_eventOffsets;
>++		Java_sun_nio_fs_LinuxWatchService_eventSize;
>++		Java_sun_nio_fs_LinuxWatchService_inotifyAddWatch;
>++		Java_sun_nio_fs_LinuxWatchService_inotifyInit;
>++		Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch;
>++		Java_sun_nio_fs_LinuxWatchService_poll;
>++		Java_sun_nio_fs_LinuxWatchService_socketpair;
>+ 		Java_sun_nio_fs_MagicFileTypeDetector_initialize0;
>+ 		Java_sun_nio_fs_MagicFileTypeDetector_probe0;
>+ 		Java_sun_nio_fs_UnixCopyFile_transfer;
>
>Property changes on: java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 243454: 210875 | 210917 | 211358 | 213200