diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/neon/configs/config.h | 10 | ||||
| -rw-r--r-- | solenv/README.md | 7 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
5 files changed, 19 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 92aa16f13ef3..d8d336860b29 100644 --- a/configure.ac +++ b/configure.ac @@ -10607,11 +10607,11 @@ serf) neon) AC_MSG_RESULT([neon]) # Check for system neon - libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.1]) + libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.2]) if test "$with_system_neon" = "yes"; then NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" else - NEON_VERSION=0311 + NEON_VERSION=0312 fi AC_SUBST(NEON_VERSION) ;; diff --git a/download.lst b/download.lst index adf73ca23d30..3c3462552d74 100644 --- a/download.lst +++ b/download.lst @@ -191,8 +191,8 @@ export MWAW_VERSION_MICRO := 17 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz -export NEON_SHA256SUM := c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d -export NEON_TARBALL := neon-0.31.1.tar.gz +export NEON_SHA256SUM := cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678 +export NEON_TARBALL := neon-0.31.2.tar.gz export NSS_SHA256SUM := ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45 export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz export ODFGEN_SHA256SUM := 55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625 diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h index 3f93d1e68132..af8408ad9ad3 100644 --- a/external/neon/configs/config.h +++ b/external/neon/configs/config.h @@ -1,4 +1,4 @@ -/* Contents kept in sync with config.h.in from neon 0.31.1 */ +/* Contents kept in sync with config.h.in from neon 0.31.2 */ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -370,7 +370,7 @@ #define NEON_IS_LIBRARY 1 /* Define to be the neon version string */ -#define NEON_VERSION "0.31.1" +#define NEON_VERSION "0.31.2" /* Define to enable debugging */ /* #undef NE_DEBUGGING */ @@ -435,7 +435,7 @@ #define NE_VERSION_MINOR (31) /* Define to be neon library patch version */ -#define NE_VERSION_PATCH (1) +#define NE_VERSION_PATCH (2) /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "neon@webdav.org" @@ -444,13 +444,13 @@ #define PACKAGE_NAME "neon" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "neon 0.31.1" +#define PACKAGE_STRING "neon 0.31.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "neon" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.31.1" +#define PACKAGE_VERSION "0.31.2" /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 diff --git a/solenv/README.md b/solenv/README.md index 68e58e8bc774..b5a730746674 100644 --- a/solenv/README.md +++ b/solenv/README.md @@ -32,3 +32,10 @@ src/ useful standard / re-usable component map files for components which shouldn't export anything more than a few registration symbols. + +flatpak-manifest.in + This file is used by flatpak/build.sh from the LO dev-tools + repository to generate the flatpak package. download.lst is + a Makefile snippet, so there seems to be no easy way to use + download.lst for the manifest generation (build.sh uses sed), + and its information must be kept in sync manually. diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index c86fc663388f..152c3775828f 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -357,10 +357,10 @@ "dest-filename": "external/tarballs/mdds-1.7.0.tar.bz2" }, { - "url": "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz", - "sha256": "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d", + "url": "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz", + "sha256": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678", "type": "file", - "dest-filename": "external/tarballs/neon-0.31.1.tar.gz" + "dest-filename": "external/tarballs/neon-0.31.2.tar.gz" }, { "url": "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz", |