haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

nspr: fix includes

Browse Source 
This was breaking libpurple build because of redefinition of uint32 and
friends. Just use the same workaround as on BeOS (these types are
scheduled to be removed in nspr, anyways).
This commit is contained in:
Adrien Destugues
2018-05-06 11:56:17 +02:00
parent b524c47f25
commit 075f3a7cfe
2 changed files with 109 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-libs/nspr/nspr-4.12.recipe
View File

@@ -13,7 +13,7 @@ COPYRIGHT="Mozilla Foundation"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz"
CHECKSUM_SHA256="e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de"
REVISION="2"
REVISION="3"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
SOURCE_DIR="nspr-$portVersion/nspr"

110
dev-libs/nspr/patches/nspr-4.12.patchset
View File

@@ -1,4 +1,4 @@
From 0462165bf3b651859b56a2fac78c5ebe1abc46ad Mon Sep 17 00:00:00 2001
From 50f8713d29dea6bca51fb974d8a87ecc2e58187a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 27 Sep 2014 10:57:28 +0000
Subject: Patch from 4.10.6
@@ -336,5 +336,111 @@ index df1f1f2..fd7e7bd 100644
$(OBJDIR)/attach: $(OBJDIR)/attach.o
$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
--
2.2.2
2.16.2
From 563af9c06ef061e025f071fcd323402b156a7c26 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 6 May 2018 09:43:28 +0200
Subject: Fix build of libpurple on Haiku.
Enable the quirk used on BeOS to avoid redefinition of uint32, etc.
types.
diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h
index 2275bce..a6a58ef 100644
--- a/pr/include/obsolete/protypes.h
+++ b/pr/include/obsolete/protypes.h
@@ -31,7 +31,7 @@ typedef PRIntn intn;
* BeOS defines all the int types below in its standard header
* file SupportDefs.h.
*/
-#ifdef XP_BEOS
+#if defined(XP_BEOS) || defined(__HAIKU__)
#include <support/SupportDefs.h>
#endif
@@ -56,7 +56,7 @@ typedef PRIntn intn;
* uint
*/
-#if !defined(XP_BEOS) && !defined(XP_OS2) && !defined(XP_UNIX) || defined(NTO)
+#if !defined(XP_BEOS) && !defined(__HAIKU__) && !defined(XP_OS2) && !defined(XP_UNIX) || defined(NTO)
typedef PRUintn uint;
#endif
@@ -64,7 +64,7 @@ typedef PRUintn uint;
* uint64
*/
-#if !defined(XP_BEOS)
+#if !defined(XP_BEOS) && !defined(__HAIKU__)
typedef PRUint64 uint64;
#endif
@@ -72,7 +72,7 @@ typedef PRUint64 uint64;
* uint32
*/
-#if !defined(XP_BEOS)
+#if !defined(XP_BEOS) && !defined(__HAIKU__)
#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
typedef PRUint32 uint32;
#else
@@ -84,7 +84,7 @@ typedef unsigned long uint32;
* uint16
*/
-#if !defined(XP_BEOS)
+#if !defined(XP_BEOS) && !defined(__HAIKU__)
typedef PRUint16 uint16;
#endif
@@ -92,7 +92,7 @@ typedef PRUint16 uint16;
* uint8
*/
-#if !defined(XP_BEOS)
+#if !defined(XP_BEOS) && !defined(__HAIKU__)
typedef PRUint8 uint8;
#endif
@@ -100,7 +100,7 @@ typedef PRUint8 uint8;
* int64
*/
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
+#if !defined(XP_BEOS) && !defined(__HAIKU__) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
typedef PRInt64 int64;
#endif
@@ -108,7 +108,7 @@ typedef PRInt64 int64;
* int32
*/
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
+#if !defined(XP_BEOS) && !defined(__HAIKU__) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
&& !defined(HPUX)
#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
typedef PRInt32 int32;
@@ -121,7 +121,7 @@ typedef long int32;
* int16
*/
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
+#if !defined(XP_BEOS) && !defined(__HAIKU__) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
&& !defined(HPUX)
typedef PRInt16 int16;
#endif
@@ -130,7 +130,7 @@ typedef PRInt16 int16;
* int8
*/
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
+#if !defined(XP_BEOS) && !defined(__HAIKU__) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
&& !defined(HPUX)
typedef PRInt8 int8;
#endif
--
2.16.2