diff --git a/nspr-4.33.tar.gz b/nspr-4.33.tar.gz deleted file mode 100644 index 57d0b25e2d398ac9abc234deb8b733db324e37a8..0000000000000000000000000000000000000000 Binary files a/nspr-4.33.tar.gz and /dev/null differ diff --git a/nspr-4.35.tar.gz b/nspr-4.35.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8fec1f8bc0bf736fa5c8793755bd03f3da5b34b3 Binary files /dev/null and b/nspr-4.35.tar.gz differ diff --git a/nspr-gcc-atomics.patch b/nspr-gcc-atomics.patch index b94e840e7a3fee61f045b58c48df1d2e303dc1f5..20eaefa5ba7d5ef433b44d52b7a3a32b502f69d9 100644 --- a/nspr-gcc-atomics.patch +++ b/nspr-gcc-atomics.patch @@ -1,12 +1,7 @@ -diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h ---- a/pr/include/md/_linux.h -+++ b/pr/include/md/_linux.h -@@ -82,53 +82,73 @@ - #define NO_DLOPEN_NULL - #endif - - #if defined(__FreeBSD_kernel__) || defined(__GNU__) - #define _PR_HAVE_SOCKADDR_LEN +diff -up ./pr/include/md/_linux.h.gcc-atomics ./pr/include/md/_linux.h +--- ./pr/include/md/_linux.h.gcc-atomics 2022-09-20 11:23:22.008942926 -0700 ++++ ./pr/include/md/_linux.h 2022-09-20 11:34:45.536751340 -0700 +@@ -105,6 +105,15 @@ #endif #if defined(__i386__) @@ -22,11 +17,7 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h #define _PR_HAVE_ATOMIC_OPS #define _MD_INIT_ATOMIC() extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val); - #define _MD_ATOMIC_INCREMENT _PR_x86_AtomicIncrement - extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val); - #define _MD_ATOMIC_DECREMENT _PR_x86_AtomicDecrement - extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val); - #define _MD_ATOMIC_ADD _PR_x86_AtomicAdd +@@ -116,6 +125,7 @@ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval); #define _MD_ATOMIC_SET _PR_x86_AtomicSet #endif @@ -34,15 +25,7 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h #if defined(__ia64__) #define _PR_HAVE_ATOMIC_OPS - #define _MD_INIT_ATOMIC() - extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val); - #define _MD_ATOMIC_INCREMENT _PR_ia64_AtomicIncrement - extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val); - #define _MD_ATOMIC_DECREMENT _PR_ia64_AtomicDecrement - extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val); - #define _MD_ATOMIC_ADD _PR_ia64_AtomicAdd - extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval); - #define _MD_ATOMIC_SET _PR_ia64_AtomicSet +@@ -131,6 +141,15 @@ extern PRInt32 _PR_ia64_AtomicSet(PRInt3 #endif #if defined(__x86_64__) @@ -58,20 +41,11 @@ diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h #define _PR_HAVE_ATOMIC_OPS #define _MD_INIT_ATOMIC() extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val); - #define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement - extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val); - #define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement - extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val); - #define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd +@@ -142,6 +161,7 @@ extern PRInt32 _PR_x86_64_AtomicAdd(PRIn extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet #endif +#endif - #if defined(__or1k__) + #if defined(__loongarch__) #if defined(__GNUC__) - /* Use GCC built-in functions */ - #define _PR_HAVE_ATOMIC_OPS - #define _MD_INIT_ATOMIC() - #define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) - #define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) diff --git a/nspr.spec b/nspr.spec index 8c7a2557d5d126ed5147767081dd0611951e2883..5954bda8b0fd084c364118a09cf92c1d5221ada2 100644 --- a/nspr.spec +++ b/nspr.spec @@ -1,19 +1,15 @@ -%define anolis_release 2 -%global nspr_version 4.33 +%define anolis_release 1 Summary: Netscape Portable Runtime Name: nspr -Version: %{nspr_version} +Version: 4.35 Release: %{anolis_release}%{?dist} License: MPLv2.0 -URL: http://ftp.mozilla.org/pub/nspr/releases/v${nspr_version}/src +URL: https://firefox-source-docs.mozilla.org/nspr/index.html Conflicts: filesystem < 3 BuildRequires: gcc -# Sources available at ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/ -# When hg tag based snapshots are being used, refer to hg documentation on -# mozilla.org and check out subdirectory mozilla/nsprpub. -Source0: %{name}-%{nspr_version}.tar.gz +Source0: https://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz Source1: nspr-config.xml #fix dependency @@ -28,7 +24,6 @@ memory management (malloc and free) and shared library linking. %package devel Summary: Development libraries for the Netscape Portable Runtime Requires: nspr = %{version}-%{release} -Requires: pkgconfig BuildRequires: xmlto Conflicts: filesystem < 3 @@ -37,7 +32,7 @@ Header files for doing development with the Netscape Portable Runtime. %prep -%setup -q -n %{name}-%{nspr_version} +%setup -q -n %{name}-%{version} pushd nspr %patch1 -p1 -b .gcc-atomics @@ -80,11 +75,7 @@ fi echo "test suite completed" %install - -%{__rm} -Rf $RPM_BUILD_ROOT - -DESTDIR=$RPM_BUILD_ROOT \ - make install +%make_install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 @@ -107,10 +98,7 @@ for f in nspr-config; do install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1 done -%ldconfig_scriptlets - %files -%{!?_licensedir:%global license %%doc} %license nspr/LICENSE %{_libdir}/libnspr4.so %{_libdir}/libplc4.so @@ -123,6 +111,9 @@ done %{_mandir}/man*/* %changelog +* Thu Dec 8 2022 Funda Wang - 4.35-1 +- New version 4.35 + * Tue Mar 15 2022 mgb01105731 - 4.33-2 - add nspr-gcc-atomics.patch for fix dependency