Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Nov 2016 00:49:28 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r427351 - in branches/2016Q4: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/s...
Message-ID:  <201611290049.uAT0nSrL058330@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Nov 29 00:49:28 2016
New Revision: 427351
URL: https://svnweb.freebsd.org/changeset/ports/427351

Log:
  MFH: r427291
  
  gecko: fix Hunspell ABI mismatch
  
  PR:		214849
  Approved by:	ports-secteam (junovitch)

Added:
  branches/2016Q4/mail/thunderbird/files/patch-bug1320621
     - copied unchanged from r427291, head/mail/thunderbird/files/patch-bug1320621
  branches/2016Q4/www/firefox-esr/files/patch-bug1320621
     - copied unchanged from r427291, head/www/firefox-esr/files/patch-bug1320621
  branches/2016Q4/www/firefox/files/patch-bug1320621
     - copied unchanged from r427291, head/www/firefox/files/patch-bug1320621
  branches/2016Q4/www/libxul/files/patch-bug1320621
     - copied unchanged from r427291, head/www/libxul/files/patch-bug1320621
  branches/2016Q4/www/seamonkey/files/patch-bug1320621
     - copied unchanged from r427291, head/www/seamonkey/files/patch-bug1320621
Modified:
  branches/2016Q4/mail/thunderbird/Makefile
  branches/2016Q4/www/firefox-esr/Makefile
  branches/2016Q4/www/firefox/Makefile
  branches/2016Q4/www/libxul/Makefile
  branches/2016Q4/www/seamonkey/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/mail/thunderbird/Makefile
==============================================================================
--- branches/2016Q4/mail/thunderbird/Makefile	Tue Nov 29 00:40:45 2016	(r427350)
+++ branches/2016Q4/mail/thunderbird/Makefile	Tue Nov 29 00:49:28 2016	(r427351)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	45.5.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

Copied: branches/2016Q4/mail/thunderbird/files/patch-bug1320621 (from r427291, head/mail/thunderbird/files/patch-bug1320621)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/mail/thunderbird/files/patch-bug1320621	Tue Nov 29 00:49:28 2016	(r427351, copy of r427291, head/mail/thunderbird/files/patch-bug1320621)
@@ -0,0 +1,39 @@
+Make sure --enable-system-hunspell picks up system headers
+
+--- mozilla/extensions/spellcheck/hunspell/glue/moz.build
++++ mozilla/extensions/spellcheck/hunspell/glue/moz.build
+@@ -11,12 +11,14 @@ UNIFIED_SOURCES += [
+     'RemoteSpellCheckEngineParent.cpp',
+ ]
+ 
+-CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+-
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../src']
++
+ LOCAL_INCLUDES += [
+-    '../src',
+     '/dom/base',
+     '/extensions/spellcheck/src',
+ ]
+--- mozilla/extensions/spellcheck/src/moz.build
++++ mozilla/extensions/spellcheck/src/moz.build
+@@ -17,9 +17,13 @@ UNIFIED_SOURCES += [
+ 
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../hunspell/src']
++
+ LOCAL_INCLUDES += [
+     '../hunspell/glue',
+-    '../hunspell/src',
+     '/dom/base',
+ ]
+ EXPORTS.mozilla += [

Modified: branches/2016Q4/www/firefox-esr/Makefile
==============================================================================
--- branches/2016Q4/www/firefox-esr/Makefile	Tue Nov 29 00:40:45 2016	(r427350)
+++ branches/2016Q4/www/firefox-esr/Makefile	Tue Nov 29 00:49:28 2016	(r427351)
@@ -4,6 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	45.5.0
 DISTVERSIONSUFFIX=esr.source
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

Copied: branches/2016Q4/www/firefox-esr/files/patch-bug1320621 (from r427291, head/www/firefox-esr/files/patch-bug1320621)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/www/firefox-esr/files/patch-bug1320621	Tue Nov 29 00:49:28 2016	(r427351, copy of r427291, head/www/firefox-esr/files/patch-bug1320621)
@@ -0,0 +1,39 @@
+Make sure --enable-system-hunspell picks up system headers
+
+--- extensions/spellcheck/hunspell/glue/moz.build
++++ extensions/spellcheck/hunspell/glue/moz.build
+@@ -11,12 +11,14 @@ UNIFIED_SOURCES += [
+     'RemoteSpellCheckEngineParent.cpp',
+ ]
+ 
+-CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+-
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../src']
++
+ LOCAL_INCLUDES += [
+-    '../src',
+     '/dom/base',
+     '/extensions/spellcheck/src',
+ ]
+--- extensions/spellcheck/src/moz.build
++++ extensions/spellcheck/src/moz.build
+@@ -17,9 +17,13 @@ UNIFIED_SOURCES += [
+ 
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../hunspell/src']
++
+ LOCAL_INCLUDES += [
+     '../hunspell/glue',
+-    '../hunspell/src',
+     '/dom/base',
+ ]
+ EXPORTS.mozilla += [

Modified: branches/2016Q4/www/firefox/Makefile
==============================================================================
--- branches/2016Q4/www/firefox/Makefile	Tue Nov 29 00:40:45 2016	(r427350)
+++ branches/2016Q4/www/firefox/Makefile	Tue Nov 29 00:49:28 2016	(r427351)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	50.0
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Copied: branches/2016Q4/www/firefox/files/patch-bug1320621 (from r427291, head/www/firefox/files/patch-bug1320621)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/www/firefox/files/patch-bug1320621	Tue Nov 29 00:49:28 2016	(r427351, copy of r427291, head/www/firefox/files/patch-bug1320621)
@@ -0,0 +1,39 @@
+Make sure --enable-system-hunspell picks up system headers
+
+--- extensions/spellcheck/hunspell/glue/moz.build
++++ extensions/spellcheck/hunspell/glue/moz.build
+@@ -11,12 +11,14 @@ UNIFIED_SOURCES += [
+     'RemoteSpellCheckEngineParent.cpp',
+ ]
+ 
+-CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+-
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_SYSTEM_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../src']
++
+ LOCAL_INCLUDES += [
+-    '../src',
+     '/dom/base',
+     '/extensions/spellcheck/src',
+ ]
+--- extensions/spellcheck/src/moz.build
++++ extensions/spellcheck/src/moz.build
+@@ -17,9 +17,13 @@ UNIFIED_SOURCES += [
+ 
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_SYSTEM_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../hunspell/src']
++
+ LOCAL_INCLUDES += [
+     '../hunspell/glue',
+-    '../hunspell/src',
+     '/dom/base',
+ ]
+ EXPORTS.mozilla += [

Modified: branches/2016Q4/www/libxul/Makefile
==============================================================================
--- branches/2016Q4/www/libxul/Makefile	Tue Nov 29 00:40:45 2016	(r427350)
+++ branches/2016Q4/www/libxul/Makefile	Tue Nov 29 00:49:28 2016	(r427351)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libxul
 DISTVERSION=	45.5.0
+PORTREVISION=	1
 CATEGORIES?=	www devel
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
 		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source

Copied: branches/2016Q4/www/libxul/files/patch-bug1320621 (from r427291, head/www/libxul/files/patch-bug1320621)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/www/libxul/files/patch-bug1320621	Tue Nov 29 00:49:28 2016	(r427351, copy of r427291, head/www/libxul/files/patch-bug1320621)
@@ -0,0 +1,39 @@
+Make sure --enable-system-hunspell picks up system headers
+
+--- extensions/spellcheck/hunspell/glue/moz.build
++++ extensions/spellcheck/hunspell/glue/moz.build
+@@ -11,12 +11,14 @@ UNIFIED_SOURCES += [
+     'RemoteSpellCheckEngineParent.cpp',
+ ]
+ 
+-CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+-
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../src']
++
+ LOCAL_INCLUDES += [
+-    '../src',
+     '/dom/base',
+     '/extensions/spellcheck/src',
+ ]
+--- extensions/spellcheck/src/moz.build
++++ extensions/spellcheck/src/moz.build
+@@ -17,9 +17,13 @@ UNIFIED_SOURCES += [
+ 
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../hunspell/src']
++
+ LOCAL_INCLUDES += [
+     '../hunspell/glue',
+-    '../hunspell/src',
+     '/dom/base',
+ ]
+ EXPORTS.mozilla += [

Modified: branches/2016Q4/www/seamonkey/Makefile
==============================================================================
--- branches/2016Q4/www/seamonkey/Makefile	Tue Nov 29 00:40:45 2016	(r427350)
+++ branches/2016Q4/www/seamonkey/Makefile	Tue Nov 29 00:49:28 2016	(r427351)
@@ -4,7 +4,7 @@
 PORTNAME=	seamonkey
 DISTVERSION=	2.40
 MOZILLA_VER=	43 # above + 3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

Copied: branches/2016Q4/www/seamonkey/files/patch-bug1320621 (from r427291, head/www/seamonkey/files/patch-bug1320621)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1320621	Tue Nov 29 00:49:28 2016	(r427351, copy of r427291, head/www/seamonkey/files/patch-bug1320621)
@@ -0,0 +1,39 @@
+Make sure --enable-system-hunspell picks up system headers
+
+--- mozilla/extensions/spellcheck/hunspell/glue/moz.build
++++ mozilla/extensions/spellcheck/hunspell/glue/moz.build
+@@ -11,12 +11,14 @@ UNIFIED_SOURCES += [
+     'RemoteSpellCheckEngineParent.cpp',
+ ]
+ 
+-CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+-
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../src']
++
+ LOCAL_INCLUDES += [
+-    '../src',
+     '/dom/base',
+     '/extensions/spellcheck/src',
+ ]
+--- mozilla/extensions/spellcheck/src/moz.build
++++ mozilla/extensions/spellcheck/src/moz.build
+@@ -17,9 +17,13 @@ UNIFIED_SOURCES += [
+ 
+ FINAL_LIBRARY = 'xul'
+ 
++if CONFIG['MOZ_NATIVE_HUNSPELL']:
++    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
++else:
++    LOCAL_INCLUDES += ['../hunspell/src']
++
+ LOCAL_INCLUDES += [
+     '../hunspell/glue',
+-    '../hunspell/src',
+     '/dom/base',
+ ]
+ EXPORTS.mozilla += [



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611290049.uAT0nSrL058330>