From 5cb3e233dcc756cdc1067f6dbc5d37471e463f72 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 11 Jul 2020 19:50:23 +0200
Subject: [PATCH] nspr, fix build (#5185)

---
 dev-libs/nspr/nspr-4.26.recipe               |  6 +++++-
 dev-libs/nspr/patches/nspr-4.26.patchset     |  3 +--
 dev-libs/nspr/patches/nspr_x86-4.26.patchset | 22 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 dev-libs/nspr/patches/nspr_x86-4.26.patchset

diff --git a/dev-libs/nspr/nspr-4.26.recipe b/dev-libs/nspr/nspr-4.26.recipe
index 65d1fc624..caf0cf5f5 100644
--- a/dev-libs/nspr/nspr-4.26.recipe
+++ b/dev-libs/nspr/nspr-4.26.recipe
@@ -9,11 +9,15 @@ LICENSE="GNU GPL v2
 	GNU LGPL v2.1
 	MPL v2.0
 	"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz"
 CHECKSUM_SHA256="fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d"
 SOURCE_DIR="nspr-$portVersion/nspr"
 PATCHES="nspr-$portVersion.patchset"
+if [ $effectiveTargetArchitecture == 'x86' ]; then
+		PATCHES="$PATCHES
+		nspr_x86-$portVersion.patchset"
+fi
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/dev-libs/nspr/patches/nspr-4.26.patchset b/dev-libs/nspr/patches/nspr-4.26.patchset
index 1c63b7d31..f79c3a979 100644
--- a/dev-libs/nspr/patches/nspr-4.26.patchset
+++ b/dev-libs/nspr/patches/nspr-4.26.patchset
@@ -206,7 +206,7 @@ index 5400afb..65eb0f5 100644
   */
  
 -#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
-+#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) && !defined(__HAIKU__)
++#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) && defined(__HAIKU__)
  typedef PRUint32 uint32;
  #else
  typedef unsigned long uint32;
@@ -369,4 +369,3 @@ index a58a846..c5bd9a7 100644
  	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
 -- 
 2.27.0
-
diff --git a/dev-libs/nspr/patches/nspr_x86-4.26.patchset b/dev-libs/nspr/patches/nspr_x86-4.26.patchset
new file mode 100644
index 000000000..97a7aa8b1
--- /dev/null
+++ b/dev-libs/nspr/patches/nspr_x86-4.26.patchset
@@ -0,0 +1,22 @@
+From 06533440f09845fb4b308b8fff08e127b020b9aa Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 11 Jul 2020 19:15:31 +0000
+Subject: fix build
+
+
+diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h
+index 65eb0f5..295f431 100644
+--- a/pr/include/obsolete/protypes.h
++++ b/pr/include/obsolete/protypes.h
+@@ -67,7 +67,7 @@ typedef PRUint64 uint64;
+  * uint32
+  */
+ 
+-#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) && defined(__HAIKU__)
++#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) && !defined(__HAIKU__)
+ typedef PRUint32 uint32;
+ #else
+ typedef unsigned long uint32;
+-- 
+2.27.0
+