commit: 4f45a84dfb9212a2561982546a294c3c6a7f88af
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 08:43:51 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 08:43:51 2019 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4f45a84d
dev-libs/nspr: Bump to version 4.23. Removed old
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/files/nspr-4.23-prtime.patch | 26 ++++++++++++++++++++++
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 26 ----------------------
.../nspr/{nspr-4.22.ebuild => nspr-4.23.ebuild} | 6 +++--
4 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 131c8aa..9e0d50f 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.22.tar.gz 1078701 BLAKE2B
8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62
SHA512
d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
+DIST nspr-4.23.tar.gz 1078660 BLAKE2B
4599684e1bb80238e409472f41d0e9ba9bc731b48fb17578c99426b277bbfa9f3c8348570b58f679ad7fa94421a1c6b5972f9218e9d56fb5d1d49d45cf04363c
SHA512
19f964f11a6ae8acf83a6daa0c9ee141c6f2793fd79113f3d283e9590bc2c90bfa4e46814f902f376f15c0668fa9c283cc44f975d88461d8854b87b67c0a21c1
diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch
b/dev-libs/nspr/files/nspr-4.23-prtime.patch
new file mode 100644
index 0000000..087e427
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.23-prtime.patch
@@ -0,0 +1,26 @@
+--- a/pr/src/misc/prtime.c
++++ b/pr/src/misc/prtime.c
+@@ -1621,7 +1621,7 @@
+ case TT_EET: zone_offset = 2 * 60; break;
+ case TT_JST: zone_offset = 9 * 60; break;
+ default:
+- PR_ASSERT (0);
++ return PR_FAILURE;
+ break;
+ }
+ }
+@@ -1677,11 +1677,12 @@
+ struct tm localTime;
+ time_t secs;
+
+- PR_ASSERT(result->tm_month > -1 &&
++ if (!(result->tm_month > -1 &&
+ result->tm_mday > 0 &&
+ result->tm_hour > -1 &&
+ result->tm_min > -1 &&
+- result->tm_sec > -1);
++ result->tm_sec > -1))
++ return PR_FAILURE;
+
+ /*
+ * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
deleted file mode 100644
index 2de3ba3..0000000
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/pr/src/misc/prtime.c
-+++ b/pr/src/misc/prtime.c
-@@ -1536,7 +1536,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1578,11 +1578,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.23.ebuild
similarity index 93%
rename from dev-libs/nspr/nspr-4.22.ebuild
rename to dev-libs/nspr/nspr-4.23.ebuild
index dd4c8f1..1f11ed3 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.23.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz";
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
@@ -21,7 +21,7 @@ MULTILIB_CHOST_TOOLS=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+ "${FILESDIR}"/${PN}-4.23-prtime.patch
"${FILESDIR}"/${PN}-4.7.1-solaris.patch
"${FILESDIR}"/${PN}-4.10.6-solaris.patch
"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
@@ -41,6 +41,8 @@ src_prepare() {
if [[ -e "${S}"/nspr/configure.in ]] ; then
einfo "Renaming configure.in to configure.ac"
mv "${S}"/nspr/configure.{in,ac} || die
+ else
+ elog "configure.in rename logic can be removed from ebuild."
fi
# We must run eautoconf to regenerate configure
