Merge branch 'master' into f28

3 files changed, 33 insertions, 1 deletions

diff --git a/firefox-debug-build.patch b/firefox-debug-build.patch
new file mode 100644
index 0000000..1b8ac54
--- /dev/null
+++ b/firefox-debug-build.patch
@@ -0,0 +1,14 @@
+diff -up firefox-63.0.1/browser/installer/package-manifest.in.old firefox-63.0.1/browser/installer/package-manifest.in
+--- firefox-63.0.1/browser/installer/package-manifest.in.old	2018-11-14 11:01:54.326071733 +0100
++++ firefox-63.0.1/browser/installer/package-manifest.in	2018-11-14 11:02:04.402045863 +0100
+@@ -512,8 +512,8 @@
+ 
+ ; [Layout Debugger]
+ #ifdef MOZ_DEBUG
+-@RESPATH@/chrome/layoutdebug@JAREXT@
+-@RESPATH@/chrome/layoutdebug.manifest
++#@RESPATH@/chrome/layoutdebug@JAREXT@
++#@RESPATH@/chrome/layoutdebug.manifest
+ #endif
+ 
+ ; [Personal Security Manager]
diff --git a/firefox-init-wayland-clipboard.patch b/firefox-init-wayland-clipboard.patch
new file mode 100644
index 0000000..91bdbe5
--- /dev/null
+++ b/firefox-init-wayland-clipboard.patch
@@ -0,0 +1,12 @@
+diff -up firefox-63.0.1/widget/gtk/nsClipboardWayland.cpp.old firefox-63.0.1/widget/gtk/nsClipboardWayland.cpp
+--- firefox-63.0.1/widget/gtk/nsClipboardWayland.cpp.old	2018-11-14 10:26:47.602412372 +0100
++++ firefox-63.0.1/widget/gtk/nsClipboardWayland.cpp	2018-11-14 10:27:27.847245617 +0100
+@@ -153,7 +153,7 @@ DataOffer::GetData(wl_display* aDisplay,
+ 
+     GIOChannel *channel = g_io_channel_unix_new(pipe_fd[0]);
+     GError* error = nullptr;
+-    char* clipboardData;
++    char* clipboardData = nullptr;
+ 
+     g_io_channel_set_encoding(channel, nullptr, &error);
+     if (!error) {
diff --git a/firefox.spec b/firefox.spec
index 31997c1..588844d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -128,6 +128,7 @@ Patch42:        prio-nss-build.patch
 Patch43:        mozilla-1500366.patch
 Patch44:        mozilla-1494037.patch
 Patch45:        mozilla-1498938.patch
+Patch46:        firefox-debug-build.patch
 
 # Fedora specific patches
 Patch215:        firefox-enable-addons.patch
@@ -155,6 +156,7 @@ Patch573:        mozilla-1415078.patch
 Patch574:        firefox-pipewire.patch
 Patch581:        mozilla-1493081.patch
 Patch582:        mozilla-1504689.patch
+Patch583:        firefox-init-wayland-clipboard.patch
 
 # Debian patches
 Patch500:        mozilla-440908.patch
@@ -340,6 +342,7 @@ This package contains results of tests executed during build.
 %patch43 -p1 -b .1500366
 %patch44 -p1 -b .1494037
 %patch45 -p1 -b .1498938
+%patch46 -p1 -b .debug
 
 # Fedora patches
 %patch215 -p1 -b .addons
@@ -370,6 +373,7 @@ This package contains results of tests executed during build.
 %endif
 %patch581 -p1 -b .mozilla-1493081
 %patch582 -p1 -b .mozilla-1504689
+%patch583 -p1 -b .init-wayland-clipboard
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -568,7 +572,7 @@ export LLVM_PROFDATA="llvm-profdata"
 export AR="llvm-ar"
 export NM="llvm-nm"
 export RANLIB="llvm-ranlib"
-echo "ac_add_options --enable-linker=lld" >> .mozconfig
+#echo "ac_add_options --enable-linker=lld" >> .mozconfig
 %endif
 
 MOZ_SMP_FLAGS=-j1
@@ -928,6 +932,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Tue Nov 13 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-6
 - Added an option to build with clang/llvm.
+- Fixed debug builds.
+- Fixed warnings at Wayland clipboard code.
 
 * Tue Nov 6 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-5
 - Added fix for mozbz#1502457- disable Contextual Feature