Skip to content

Commit

Permalink
8283328: Update libxml2 to 2.9.13
Browse files Browse the repository at this point in the history
Backport-of: b0f2521
  • Loading branch information
Johan Vos committed Apr 20, 2022
1 parent 60d76c8 commit 2a1805a
Show file tree
Hide file tree
Showing 105 changed files with 30,664 additions and 49,902 deletions.
2 changes: 1 addition & 1 deletion modules/javafx.web/src/main/legal/libxml2.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## xmlsoft.org: libxml2 v2.9.12
## xmlsoft.org: libxml2 v2.9.13

### libxml2 License
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,36 @@ Updating libxml in OpenJFX:
5. Remove files & directories which are not relevant to JavaFX WebKit.

- For Mac
6. Configure libxml.
6. Prerequisites to compile libxml: libtool, autoconf, automake

7. Configure libxml.
> cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src
> ./configure

6.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\mac\include\libxml\xmlversion.h` and follow same guidelines as Windows to retain changes from our repo.
7.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\mac\include\libxml\xmlversion.h` and follow same guidelines as Windows to retain changes from our repo.

6.2 Copy libxml\src\config.h to libxml\mac\config.h
7.2 Copy libxml\src\config.h to libxml\mac\config.h

- For Linux
7. Configure libxml.
8. Prerequisites to compile libxml: libtool, autoconf, automake

9. Configure libxml.
> cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src
> ./configure

7.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\linux\include\libxml\xmlversion.h` and follow same guidelines as Windows to retain changes from our repo.
9.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\linux\include\libxml\xmlversion.h` and follow same guidelines as Windows to retain changes from our repo.

7.2 Copy libxml\src\config.h to libxml\linux\config.h
9.2 Copy libxml\src\config.h to libxml\linux\config.h

8. Helper commands for removing tabs and trailing whitespaces from source files(.h and .c).
10. Helper commands for removing tabs and trailing whitespaces from source files(.h and .c).

8.1 > cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml
10.1 > cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml

8.2 Remove tabs from source files:
10.2 Remove tabs from source files:
> sudo apt install moreutils
> find src/ -name "*.c" -type f -exec bash -c 'expand -t 4 "$0" | sponge "$0"' {} \;
> find src/ -name "*.h" -type f -exec bash -c 'expand -t 4 "$0" | sponge "$0"' {} \;
> find src/ -name "*.c" -type f -exec bash -c 'expand -t 8 "$0" | sponge "$0"' {} \;
> find src/ -name "*.h" -type f -exec bash -c 'expand -t 8 "$0" | sponge "$0"' {} \;

8.3 Remove trailing whitespaces from source files:
10.3 Remove trailing whitespaces from source files:
> find src/ -name “*.c” -type f -exec sed --in-place 's/[[:space:]]\+$//' {} \+
> find src/ -name “*.h” -type f -exec sed --in-place 's/[[:space:]]\+$//' {} \+
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
/* Define to 1 if you have the <ctype.h> header file. */
#define HAVE_CTYPE_H 1

/* Define to 1 if you have the <dirent.h> header file. */
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#define HAVE_DIRENT_H 1

/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1

/* Have dlopen based dso */
/* #undef HAVE_DLOPEN */
#define HAVE_DLOPEN /**/

/* Define to 1 if you have the <dl.h> header file. */
/* #undef HAVE_DL_H */
Expand Down Expand Up @@ -61,18 +62,9 @@
/* Define to 1 if you have the `isascii' function. */
#define HAVE_ISASCII 1

/* Define if isinf is there */
#define HAVE_ISINF /**/

/* Define if isnan is there */
#define HAVE_ISNAN /**/

/* Define if history library is there (-lhistory) */
/* #undef HAVE_LIBHISTORY */

/* Define if pthread library is there (-lpthread) */
#define HAVE_LIBPTHREAD /**/

/* Define if readline library is there (-lreadline) */
/* #undef HAVE_LIBREADLINE */

Expand Down Expand Up @@ -130,7 +122,7 @@
#define HAVE_RAND 1

/* Define to 1 if you have the `rand_r' function. */
/* #undef HAVE_RAND_R 1 */
#define HAVE_RAND_R 1

/* Define to 1 if you have the <resolv.h> header file. */
#define HAVE_RESOLV_H 1
Expand Down Expand Up @@ -234,7 +226,7 @@
/* #undef HAVE___VA_COPY */

/* Define as const if the declaration of iconv() needs const. */
/* #undef ICONV_CONST */
#define ICONV_CONST

/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
Expand All @@ -246,19 +238,19 @@
#define PACKAGE_BUGREPORT ""

/* Define to the full name of this package. */
#define PACKAGE_NAME ""
#define PACKAGE_NAME "libxml2"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING ""
#define PACKAGE_STRING "libxml2 2.9.13"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
#define PACKAGE_TARNAME "libxml2"

/* Define to the home page for this package. */
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION ""
#define PACKAGE_VERSION "2.9.13"

/* Type cast for the send() function 2nd arg */
#define SEND_ARG2_CAST /**/
Expand All @@ -273,7 +265,7 @@
#define VA_LIST_IS_ARRAY 1

/* Version number of package */
#define VERSION "2.9.12"
#define VERSION "2.9.13"

/* Determine what socket length (socklen_t) data type is */
#define XML_SOCKLEN_T socklen_t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*
* the version string like "1.2.3"
*/
#define LIBXML_DOTTED_VERSION "2.9.12"
#define LIBXML_DOTTED_VERSION "2.9.13"

/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
#define LIBXML_VERSION 20912
#define LIBXML_VERSION 20913

/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "10203"
*/
#define LIBXML_VERSION_STRING "20912"
#define LIBXML_VERSION_STRING "20913"

/**
* LIBXML_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
* extra version information, used to show a git commit description
*/
#define LIBXML_VERSION_EXTRA ""

Expand All @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
#define LIBXML_TEST_VERSION xmlCheckVersion(20912);
#define LIBXML_TEST_VERSION xmlCheckVersion(20913);

#ifndef VMS
#if 0
Expand Down Expand Up @@ -387,7 +387,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*
* the string suffix used by dynamic modules (usually shared libraries)
*/
#define LIBXML_MODULE_EXTENSION ""
#define LIBXML_MODULE_EXTENSION ".so"
#endif

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*
* the version string like "1.2.3"
*/
#define LIBXML_DOTTED_VERSION "2.9.12"
#define LIBXML_DOTTED_VERSION "2.9.13"

/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
#define LIBXML_VERSION 20912
#define LIBXML_VERSION 20913

/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "10203"
*/
#define LIBXML_VERSION_STRING "20912"
#define LIBXML_VERSION_STRING "20913"

/**
* LIBXML_VERSION_EXTRA:
Expand All @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
#define LIBXML_TEST_VERSION xmlCheckVersion(20912);
#define LIBXML_TEST_VERSION xmlCheckVersion(20913);

#ifndef VMS
#if 0
Expand Down

This file was deleted.

1 comment on commit 2a1805a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.