[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

[Jory Pratt]

commit:     17e2d66110c1a1d6e27ab3261e93e897267e4b7a
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep  4 11:50:49 2016 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 22:58:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e2d661

dev-libs/nspr: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2230

Signed-off-by: Jory A. Pratt <anarchy <AT> gentoo.org>

 dev-libs/nspr/files/nspr-4.6.1-lang.patch    | 41 ------------------
 dev-libs/nspr/files/nspr-4.7.4-solaris.patch | 62 ----------------------------
 2 files changed, 103 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch
deleted file mode 100644
index 46fe15b..00000000
--- a/dev-libs/nspr/files/nspr-4.6.1-lang.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.

diff --git a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
deleted file mode 100644
index a0f14d5..00000000
--- a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-* drop Solaris linker stuff
-
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
-@@ -1988,26 +1988,14 @@
-     CPU_ARCH=`uname -p`
-     MDCPUCFG_H=_solaris.cfg
-     PR_MD_CSRCS=solaris.c
--    LD=/usr/ccs/bin/ld
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     RESOLVE_LINK_SYMBOLS=1
--    case "${OS_RELEASE}" in
--    5.8|5.9)
--        ;;
--    *)
--        # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
--        USE_B_DIRECT=1
--        ;;
--    esac
-     if test -n "$GNU_CC"; then
-         DSO_CFLAGS=-fPIC
-         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
-             GCC_USE_GNU_LD=1
-         fi
--        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
--        if test -n "$USE_B_DIRECT"; then
--            DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
--        fi
-+		DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     else
-         DSO_CFLAGS=-KPIC
-         DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
---- nspr-4.7.4/mozilla/nsprpub/configure
-+++ nspr-4.7.4/mozilla/nsprpub/configure
-@@ -4765,26 +4765,14 @@
-     CPU_ARCH=`uname -p`
-     MDCPUCFG_H=_solaris.cfg
-     PR_MD_CSRCS=solaris.c
--    LD=/usr/ccs/bin/ld
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     RESOLVE_LINK_SYMBOLS=1
--    case "${OS_RELEASE}" in
--    5.8|5.9)
--        ;;
--    *)
--        # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
--        USE_B_DIRECT=1
--        ;;
--    esac
-     if test -n "$GNU_CC"; then
-         DSO_CFLAGS=-fPIC
-         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
-             GCC_USE_GNU_LD=1
-         fi
--        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
--        if test -n "$USE_B_DIRECT"; then
--            DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
--        fi
-+		DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     else
-         DSO_CFLAGS=-KPIC
-         DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

[David Seifert]

commit:     4ea56ae57ef9ee9854792a51586cfbea7cb775a7
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov 17 19:18:22 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 18:03:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea56ae5

dev-libs/nspr: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6215

 dev-libs/nspr/files/nspr-4.15-configure_in.patch | 26 ------------------------
 1 file changed, 26 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
deleted file mode 100644
index a33717f41d6..00000000000
--- a/dev-libs/nspr/files/nspr-4.15-configure_in.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Wed, 7 Jun 2017 12:14:46 -0500
-Subject: [PATCH] Close out darwin if statement, will breakage configure.in
- rename to configure.ac
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.in b/configure.in
-index 4b2e46d..dc14ee5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1389,6 +1389,7 @@ case "$target" in
-     changequote([,])
-     if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
-         AC_DEFINE(HAS_CONNECTX)
-+    fi
-     AS='$(CC) -x assembler-with-cpp'
-     CFLAGS="$CFLAGS -Wall -fno-common"
-     case "${target_cpu}" in
--- 
-2.13.1
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

[Joonas Niilola]

commit:     02ab199de0bea884d95f33d0ec5d2a6be6be4e69
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 27 17:15:42 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 17:25:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ab199d

dev-libs/nspr: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27983
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/nspr/files/nspr-4.33-loong.patch | 100 ------------------------------
 1 file changed, 100 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.33-loong.patch b/dev-libs/nspr/files/nspr-4.33-loong.patch
deleted file mode 100644
index 96772a2767c0..000000000000
--- a/dev-libs/nspr/files/nspr-4.33-loong.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-https://phabricator.services.mozilla.com/D142407
-
---- a/pr/include/md/_linux.h
-+++ b/pr/include/md/_linux.h
-@@ -71,10 +71,12 @@
- #define _PR_SI_ARCHITECTURE "microblaze"
- #elif defined(__nds32__)
- #define _PR_SI_ARCHITECTURE "nds32"
- #elif defined(__xtensa__)
- #define _PR_SI_ARCHITECTURE "xtensa"
-+#elif defined(__loongarch64)
-+#define _PR_SI_ARCHITECTURE "loongarch64"
- #else
- #error "Unknown CPU architecture"
- #endif
- #define PR_DLL_SUFFIX       ".so"
- 
-@@ -139,10 +141,22 @@
- #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
- extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
- #endif
- 
-+#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)
-+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
-+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
-+#endif
-+#endif
-+
- #if defined(__or1k__)
- #if defined(__GNUC__)
- /* Use GCC built-in functions */
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
---- a/pr/include/md/_linux.cfg
-+++ b/pr/include/md/_linux.cfg
-@@ -1253,10 +1253,56 @@
- #define PR_ALIGN_OF_WORD    8
- 
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__loongarch64)
-+
-+#undef  IS_BIG_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#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"
- 
- #endif
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/files/

[Joonas Niilola]

commit:     86b6c8fa090b96e4204bd8fc22c7e5d90162ab3a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 07:00:38 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 11 07:01:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b6c8fa

dev-libs/nspr: fix paths in musl patch file

Bug: https://bugs.gentoo.org/905998
Closes: https://bugs.gentoo.org/906093
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch b/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch
index d834c3e0b295..1ec17cd301f5 100644
--- a/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch
+++ b/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch
@@ -1,9 +1,9 @@
 needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
 --
-diff --git a/nspr/pr/include/md/_unixos.h b/nspr/pr/include/md/_unixos.h
+diff --git a/pr/include/md/_unixos.h b/pr/include/md/_unixos.h
 index 7d444cd..0099d2c 100644
---- a/nspr/pr/include/md/_unixos.h
-+++ b/nspr/pr/include/md/_unixos.h
+--- a/pr/include/md/_unixos.h
++++ b/pr/include/md/_unixos.h
 @@ -589,7 +589,7 @@ typedef off64_t _MDOff64_t;
  
  #elif defined(_PR_HAVE_OFF64_T)