[Midnightbsd-cvs] mports [22968] trunk/www/libxul: fix several issues with libxul

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 24 15:34:15 EST 2017 

Revision: 22968
          http://svnweb.midnightbsd.org/mports/?rev=22968
Author:   laffer1
Date:     2017-11-24 15:34:14 -0500 (Fri, 24 Nov 2017)
Log Message:
-----------
fix several issues with libxul

Modified Paths:
--------------
    trunk/www/libxul/Makefile
    trunk/www/libxul/files/patch-z-bug517422

Added Paths:
-----------
    trunk/www/libxul/files/patch-toolkit_library_moz.build
    trunk/www/libxul/files/patch-xpcom-base-nsDebugImpl.cpp
    trunk/www/libxul/files/patch-xpcom-base-nsMemoryReporterManager.cpp
    trunk/www/libxul/files/patch-xpcom-reflect-xptcall-genstpubs.pl

Modified: trunk/www/libxul/Makefile
===================================================================
--- trunk/www/libxul/Makefile	2017-11-24 20:20:04 UTC (rev 22967)
+++ trunk/www/libxul/Makefile	2017-11-24 20:34:14 UTC (rev 22968)
@@ -13,7 +13,7 @@
 LICENSE=	mpl
 
 MAKE_JOBS_UNSAFE=	yes
-USE_GCC=	4.8+
+#USE_GCC=	4.8+
 
 BUILD_DEPENDS=	nspr>=4.12:${PORTSDIR}/devel/nspr \
 		nss>=3.21.1:${PORTSDIR}/security/nss \
@@ -44,7 +44,7 @@
 USE_LDCONFIG=	${PREFIX}/lib/${MOZILLA}
 
 MOZ_OPTIONS?=	--enable-application=xulrunner --disable-webrtc \
-		--disable-sandbox
+		--disable-sandbox --disable-pie
 USE_GECKO=	gecko
 CPE_PRODUCT=	firefox_esr
 MOZILLA_EXEC_NAME=xulrunner

Added: trunk/www/libxul/files/patch-toolkit_library_moz.build
===================================================================
--- trunk/www/libxul/files/patch-toolkit_library_moz.build	                        (rev 0)
+++ trunk/www/libxul/files/patch-toolkit_library_moz.build	2017-11-24 20:34:14 UTC (rev 22968)
@@ -0,0 +1,48 @@
+--- toolkit/library/moz.build.orig	2016-10-24 12:10:41.754349729 -0400
++++ toolkit/library/moz.build	2016-10-24 12:28:21.192638115 -0400
+@@ -186,6 +186,11 @@
+         'util',
+     ]
+ 
++if CONFIG['OS_ARCH'] == 'MidnightBSD':
++    OS_LIBS += [
++        'util',
++    ]
++
+ if CONFIG['OS_ARCH'] == 'WINNT':
+     OS_LIBS += [
+         'shell32',
+@@ -223,6 +228,21 @@
+ if CONFIG['MOZ_NATIVE_HUNSPELL']:
+     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
+ 
++if CONFIG['MOZ_NATIVE_OGG']:
++    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
++
++if CONFIG['MOZ_NATIVE_THEORA']:
++    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
++
++if CONFIG['MOZ_NATIVE_VORBIS']:
++    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
++
++if CONFIG['MOZ_NATIVE_TREMOR']:
++    OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
++
++if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++    OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
++
+ if CONFIG['MOZ_NATIVE_LIBEVENT']:
+     OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
+ 
+@@ -337,6 +357,11 @@
+     OS_LIBS += [
+         'util',
+     ]
++
++if CONFIG['OS_ARCH'] == 'MidnightBSD':
++    OS_LIBS += [
++        'util',
++    ]
+ 
+ if CONFIG['OS_ARCH'] == 'WINNT':
+     OS_LIBS += [


Property changes on: trunk/www/libxul/files/patch-toolkit_library_moz.build
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/libxul/files/patch-xpcom-base-nsDebugImpl.cpp
===================================================================
--- trunk/www/libxul/files/patch-xpcom-base-nsDebugImpl.cpp	                        (rev 0)
+++ trunk/www/libxul/files/patch-xpcom-base-nsDebugImpl.cpp	2017-11-24 20:34:14 UTC (rev 22968)
@@ -0,0 +1,38 @@
+--- xpcom/base/nsDebugImpl.cpp.orig	2016-10-24 10:05:15.168349918 -0400
++++ xpcom/base/nsDebugImpl.cpp	2016-10-24 10:06:06.460607384 -0400
+@@ -43,7 +43,7 @@
+ #endif
+ 
+ #if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
+- || defined(__NetBSD__) || defined(__OpenBSD__)
++ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__)
+ #include <stdbool.h>
+ #include <unistd.h>
+ #include <sys/param.h>
+@@ -54,7 +54,7 @@
+ #include <sys/proc.h>
+ #endif
+ 
+-#if defined(__DragonFly__) || defined(__FreeBSD__)
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__MidnightBSD__)
+ #include <sys/user.h>
+ #endif
+ 
+@@ -70,7 +70,7 @@
+ #define KP_FLAGS kp_proc.p_flag
+ #elif defined(__DragonFly__)
+ #define KP_FLAGS kp_flags
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__MidnightBSD__)
+ #define KP_FLAGS ki_flag
+ #elif defined(__OpenBSD__) && !defined(_P_TRACED)
+ #define KP_FLAGS p_psflags
+@@ -173,7 +173,7 @@
+ #if defined(XP_WIN)
+   *aResult = ::IsDebuggerPresent();
+ #elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
+-   || defined(__NetBSD__) || defined(__OpenBSD__)
++   || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__)
+   // Specify the info we're looking for
+   int mib[] = {
+     CTL_KERN,


Property changes on: trunk/www/libxul/files/patch-xpcom-base-nsDebugImpl.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/libxul/files/patch-xpcom-base-nsMemoryReporterManager.cpp
===================================================================
--- trunk/www/libxul/files/patch-xpcom-base-nsMemoryReporterManager.cpp	                        (rev 0)
+++ trunk/www/libxul/files/patch-xpcom-base-nsMemoryReporterManager.cpp	2017-11-24 20:34:14 UTC (rev 22968)
@@ -0,0 +1,34 @@
+--- xpcom/base/nsMemoryReporterManager.cpp.orig	2016-10-24 08:59:36.688374810 -0400
++++ xpcom/base/nsMemoryReporterManager.cpp	2016-10-24 09:01:11.131350056 -0400
+@@ -175,11 +175,11 @@
+ 
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) \
+     || defined(__NetBSD__) || defined(__OpenBSD__) \
+-    || defined(__FreeBSD_kernel__)
++    || defined(__FreeBSD_kernel__) || defined(__MidnightBSD__)
+ 
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__MidnightBSD__)
+ #include <sys/user.h>
+ #endif
+ 
+@@ -196,7 +196,7 @@
+ #if defined(__DragonFly__)
+ #define KP_SIZE(kp) (kp.kp_vm_map_size)
+ #define KP_RSS(kp) (kp.kp_vm_rssize * getpagesize())
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__MidnightBSD__)
+ #define KP_SIZE(kp) (kp.ki_size)
+ #define KP_RSS(kp) (kp.ki_rssize * getpagesize())
+ #elif defined(__NetBSD__)
+@@ -258,7 +258,7 @@
+   return ResidentDistinguishedAmount(aN);
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__MidnightBSD__)
+ #include <libutil.h>
+ #include <algorithm>
+ 


Property changes on: trunk/www/libxul/files/patch-xpcom-base-nsMemoryReporterManager.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/libxul/files/patch-xpcom-reflect-xptcall-genstpubs.pl
===================================================================
--- trunk/www/libxul/files/patch-xpcom-reflect-xptcall-genstpubs.pl	                        (rev 0)
+++ trunk/www/libxul/files/patch-xpcom-reflect-xptcall-genstpubs.pl	2017-11-24 20:34:14 UTC (rev 22968)
@@ -0,0 +1,11 @@
+--- xpcom/reflect/xptcall/genstubs.pl.orig	2016-10-24 12:00:03.928349888 -0400
++++ xpcom/reflect/xptcall/genstubs.pl	2016-10-24 12:08:51.386352099 -0400
+@@ -44,7 +44,7 @@
+ print OUTFILE "*  1 is AddRef\n";
+ print OUTFILE "*  2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__MidnightBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+     print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }


Property changes on: trunk/www/libxul/files/patch-xpcom-reflect-xptcall-genstpubs.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/www/libxul/files/patch-z-bug517422
===================================================================
--- trunk/www/libxul/files/patch-z-bug517422	2017-11-24 20:20:04 UTC (rev 22967)
+++ trunk/www/libxul/files/patch-z-bug517422	2017-11-24 20:34:14 UTC (rev 22968)
@@ -388,34 +388,7 @@
 +
 +if CONFIG['MOZ_NATIVE_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
-diff --git toolkit/library/moz.build toolkit/library/moz.build
-index d42137a..695e75a8 100644
---- toolkit/library/moz.build
-+++ toolkit/library/moz.build
-@@ -178,6 +178,21 @@ if CONFIG['MOZ_NATIVE_PNG']:
- if CONFIG['MOZ_NATIVE_HUNSPELL']:
-     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  
-+if CONFIG['MOZ_NATIVE_OGG']:
-+    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_THEORA']:
-+    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_VORBIS']:
-+    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_TREMOR']:
-+    OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
-+    OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
-+
- if CONFIG['MOZ_NATIVE_LIBEVENT']:
-     OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
- 
-diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp
-index 2cf281e..6d7af0e 100644
 --- xpcom/build/XPCOMInit.cpp
 +++ xpcom/build/XPCOMInit.cpp
 @@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);

More information about the Midnightbsd-cvs mailing list