From 6a174662beb5dab6fd4acf6137125113e87c8f77aec90187002fdc033b663bee Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 16 Mar 2013 12:10:52 +0000 Subject: [PATCH] - update to version 4.9.6 * aarch64 support (removed obsolete aarch64-support.patch) * added PL_SizeOfArenaPoolExcludingPool function (bmo#807883) * Auto detect android api version for x86 (bmo#782214) * Initialize Windows CRITICAL_SECTIONs without debug info and with nonzero spin count (bmo#812085) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nspr?expand=0&rev=51 --- aarch64-support.patch | 94 ------------------------------------------- mozilla-nspr.changes | 11 +++++ mozilla-nspr.spec | 7 +--- nspr-4.9.5.tar.bz2 | 3 -- nspr-4.9.6.tar.bz2 | 3 ++ 5 files changed, 15 insertions(+), 103 deletions(-) delete mode 100644 aarch64-support.patch delete mode 100644 nspr-4.9.5.tar.bz2 create mode 100644 nspr-4.9.6.tar.bz2 diff --git a/aarch64-support.patch b/aarch64-support.patch deleted file mode 100644 index a506b1e..0000000 --- a/aarch64-support.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -861,6 +861,59 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__aarch64__) -+ -+#ifdef __AARCH64EB__ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#elif defined(__AARCH64EL__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#else -+#error "Unknown Aarch64 endianness." -+#endif -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" ---- a/pr/include/md/_linux.h -+++ b/pr/include/md/_linux.h -@@ -53,6 +53,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__aarch64__) -+#define _PR_SI_ARCHITECTURE "aarch64" - #else - #error "Unknown CPU architecture" - #endif -@@ -186,7 +188,7 @@ - }) - #endif - --#if defined(__arm__) -+#if defined(__arm__) || defined(__aarch64__) - #if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - /* Use GCC built-in functions */ - #define _PR_HAVE_ATOMIC_OPS -@@ -242,6 +244,10 @@ - #endif - #endif /* __arm__ */ - -+#if defined(__aarch64__) -+#define _MD_MINIMUM_STACK_SIZE 0x20000 -+#endif -+ - #define USE_SETJMP - #if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) - #define _PR_POLL_AVAILABLE - diff --git a/mozilla-nspr.changes b/mozilla-nspr.changes index 70ac48f..7125942 100644 --- a/mozilla-nspr.changes +++ b/mozilla-nspr.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Mar 16 12:00:38 UTC 2013 - wr@rosenauer.org + +- update to version 4.9.6 + * aarch64 support + (removed obsolete aarch64-support.patch) + * added PL_SizeOfArenaPoolExcludingPool function (bmo#807883) + * Auto detect android api version for x86 (bmo#782214) + * Initialize Windows CRITICAL_SECTIONs without debug info and + with nonzero spin count (bmo#812085) + ------------------------------------------------------------------- Thu Feb 28 22:56:59 UTC 2013 - wr@rosenauer.org diff --git a/mozilla-nspr.spec b/mozilla-nspr.spec index a8d9f77..d05d6a2 100644 --- a/mozilla-nspr.spec +++ b/mozilla-nspr.spec @@ -18,7 +18,7 @@ Name: mozilla-nspr -Version: 4.9.5 +Version: 4.9.6 Release: 0 Summary: Netscape Portable Runtime License: MPL-2.0 @@ -34,7 +34,6 @@ Obsoletes: mozilla-nspr-64bit Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar.bz2 Source1: baselibs.conf Patch0: config-guess-sub-update.diff -Patch1: aarch64-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,10 +63,6 @@ memory management (malloc and free), and shared library linking. %prep %setup -n nspr-%{version} -q %patch0 -cd mozilla/nsprpub -%patch1 -p1 -cd - -cd mozilla %build # set buildtime to "last-modification-time" diff --git a/nspr-4.9.5.tar.bz2 b/nspr-4.9.5.tar.bz2 deleted file mode 100644 index 4b5e653..0000000 --- a/nspr-4.9.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c6bd116bbae656eb1439126d2fab87257bf477e54a099842218944993bd33b6 -size 886651 diff --git a/nspr-4.9.6.tar.bz2 b/nspr-4.9.6.tar.bz2 new file mode 100644 index 0000000..1b08018 --- /dev/null +++ b/nspr-4.9.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6808e0ab9b1bad1b6336bb13de2192c142dda9274f6f8bfe397a458b0ae5cfc +size 889319