successfull RPM build
authorWolfgang Rosenauer <wr@rosenauer.org>
Sun, 10 Jun 2018 16:57:31 +0200
changeset 1057 b70ce330958c
parent 1056 90e1f32cf034
child 1058 0eaac248c728
successfull RPM build
- fixed build issues in existing patchset and new non-return functions
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/mozilla-no-return.patch
firefox-kde.patch
mozilla-no-return.patch
series
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Jun 09 09:37:05 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Jun 10 16:57:31 2018 +0200
@@ -8,6 +8,7 @@
   mozilla-i586-domPrefs.patch
   mozilla-fix-skia-aarch64.patch
   mozilla-bmo1375074.patch
+- patch for new no-return warnings (mozilla-no-return.patch)
 
 -------------------------------------------------------------------
 Fri Jun  8 10:52:13 UTC 2018 - bjorn.lie@gmail.com
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Jun 09 09:37:05 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Jun 10 16:57:31 2018 +0200
@@ -158,7 +158,8 @@
 Patch6:         mozilla-reduce-files-per-UnifiedBindings.patch
 Patch7:         mozilla-aarch64-startup-crash.patch
 Patch8:         mozilla-bmo256180.patch
-Patch11:        mozilla-enable-csd.patch
+Patch9:         mozilla-enable-csd.patch
+Patch10:        mozilla-no-return.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -268,7 +269,8 @@
 %endif
 %patch7 -p1
 %patch8 -p1
-#%patch11 -p1
+#%patch9 -p1
+%patch10 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -594,7 +596,6 @@
 %{progdir}/application.ini
 %{progdir}/chrome.manifest
 %{progdir}/dependentlibs.list
-#%{progdir}/icudt*.dat
 %{progdir}/*.so
 %{progdir}/omni.ja
 %{progdir}/fonts/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-no-return.patch	Sun Jun 10 16:57:31 2018 +0200
@@ -0,0 +1,1 @@
+../mozilla-no-return.patch
\ No newline at end of file
--- a/firefox-kde.patch	Sat Jun 09 09:37:05 2018 +0200
+++ b/firefox-kde.patch	Sun Jun 10 16:57:31 2018 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  a01c6385626ce90528d02e5127de5c1444c07efc
+# Parent  242712e5a1879111d1a93a5d55dfae3fd5d47abc
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
@@ -1439,25 +1439,25 @@
 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
 --- a/browser/components/shell/moz.build
 +++ b/browser/components/shell/moz.build
-@@ -21,16 +21,18 @@ XPIDL_SOURCES += [
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-     XPIDL_SOURCES += [
-         'nsIMacShellService.idl',
+@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+     ]
+ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+     SOURCES += [
+         'nsMacShellService.cpp',
      ]
  elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-     XPIDL_SOURCES += [
-         'nsIGNOMEShellService.idl',
+     SOURCES += [
+         'nsGNOMEShellService.cpp',
 +        'nsKDEShellService.cpp',
 +        'nsUnixShellService.cpp',
      ]
  
- XPIDL_MODULE = 'shellservice'
+ if SOURCES:
+     FINAL_LIBRARY = 'browsercomps'
  
- if CONFIG['OS_ARCH'] == 'WINNT':
-     SOURCES += [
-         'nsWindowsShellService.cpp',
-     ]
+ EXTRA_JS_MODULES += [
+     'HeadlessShell.jsm',
+     'ShellService.jsm',
 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
 new file mode 100644
 --- /dev/null
@@ -1550,7 +1550,7 @@
 +}
 +
 +NS_IMETHODIMP
-+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement,
++nsKDEShellService::SetDesktopBackground(dom::Element* aElement,
 +                                        int32_t aPosition,
 +                                        const nsACString& aImageName)
 +{
@@ -1690,8 +1690,8 @@
 +  nsKDEShellService() : mCheckedThisSession(false) { }
 +
 +  NS_DECL_ISUPPORTS
++  NS_DECL_NSISHELLSERVICE
 +  NS_DECL_NSIGNOMESHELLSERVICE
-+  NS_DECL_NSISHELLSERVICE
 +
 +  nsresult Init();
 +
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-no-return.patch	Sun Jun 10 16:57:31 2018 +0200
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent  242712e5a1879111d1a93a5d55dfae3fd5d47abc
+
+diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp
+--- a/intl/icu/source/i18n/number_grouping.cpp
++++ b/intl/icu/source/i18n/number_grouping.cpp
+@@ -43,16 +43,17 @@ Grouper Grouper::forStrategy(UGroupingSt
+     case UNUM_GROUPING_MIN2:
+         return {-2, -2, -3};
+     case UNUM_GROUPING_ON_ALIGNED:
+         return {-4, -4, 1};
+     case UNUM_GROUPING_THOUSANDS:
+         return {3, 3, 1};
+     default:
+         U_ASSERT(FALSE);
++        return {0, 0, 0};
+     }
+ }
+ 
+ void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) {
+     if (fGrouping1 != -2 && fGrouping2 != -4) {
+         return;
+     }
+     auto grouping1 = static_cast<int16_t> (patternInfo.positive.groupingSizes & 0xffff);
+diff --git a/media/libcubeb/src/cubeb_utils.cpp b/media/libcubeb/src/cubeb_utils.cpp
+--- a/media/libcubeb/src/cubeb_utils.cpp
++++ b/media/libcubeb/src/cubeb_utils.cpp
+@@ -14,10 +14,11 @@ size_t cubeb_sample_size(cubeb_sample_fo
+     case CUBEB_SAMPLE_S16BE:
+       return sizeof(int16_t);
+     case CUBEB_SAMPLE_FLOAT32LE:
+     case CUBEB_SAMPLE_FLOAT32BE:
+       return sizeof(float);
+     default:
+       // should never happen as all cases are handled above.
+       assert(false);
++      return sizeof(float);
+   }
+ }
--- a/series	Sat Jun 09 09:37:05 2018 +0200
+++ b/series	Sun Jun 10 16:57:31 2018 +0200
@@ -7,6 +7,7 @@
 mozilla-reduce-files-per-UnifiedBindings.patch
 mozilla-aarch64-startup-crash.patch
 mozilla-bmo256180.patch
+mozilla-no-return.patch
 #mozilla-enable-csd.patch
 
 # Firefox patches