Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10971116
D1253.id3116.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D1253.id3116.diff
View Options
diff --git a/files/config b/files/config
--- a/files/config
+++ b/files/config
@@ -11,7 +11,9 @@
ac_add_options --enable-application=browser
ac_add_options --enable-update-channel=release
ac_add_options --enable-release
-ac_add_options --disable-stylo
+ac_add_options --enable-stylo
+# Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
+ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
ac_add_options --enable-crashreporter
ac_add_options --disable-updater
diff --git a/files/mozilla-1405267.patch b/files/mozilla-1405267.patch
new file mode 100644
--- /dev/null
+++ b/files/mozilla-1405267.patch
@@ -0,0 +1,19 @@
+diff -up firefox-56.0/widget/gtk/mozgtk/mozgtk.c.1405267 firefox-56.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-56.0/widget/gtk/mozgtk/mozgtk.c.1405267 2017-09-14 22:16:02.000000000 +0200
++++ firefox-56.0/widget/gtk/mozgtk/mozgtk.c 2017-10-04 09:16:58.512697973 +0200
+@@ -96,6 +96,7 @@ STUB(gdk_window_get_update_area)
+ STUB(gdk_window_get_user_data)
+ STUB(gdk_window_get_visual)
+ STUB(gdk_window_get_width)
++STUB(gdk_window_get_window_type)
+ STUB(gdk_window_hide)
+ STUB(gdk_window_input_shape_combine_region)
+ STUB(gdk_window_invalidate_rect)
+@@ -520,7 +521,6 @@ STUB(gdk_display_get_device_manager)
+ STUB(gdk_error_trap_pop_ignored)
+ STUB(gdk_event_get_source_device)
+ STUB(gdk_window_get_type)
+-STUB(gdk_window_get_window_type)
+ STUB(gdk_x11_window_get_xid)
+ STUB(gdk_x11_display_get_type)
+ STUB(gdk_wayland_display_get_type)
diff --git a/files/rhbz-1497932.patch b/files/rhbz-1497932.patch
new file mode 100644
--- /dev/null
+++ b/files/rhbz-1497932.patch
@@ -0,0 +1,21 @@
+diff -up firefox-56.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-56.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
+diff -up firefox-56.0/media/webrtc/trunk/Makefile.old firefox-56.0/media/webrtc/trunk/Makefile
+diff -up firefox-56.0/widget/gtk/mozgtk/mozgtk.c.old firefox-56.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-56.0/widget/gtk/mozgtk/mozgtk.c.old 2017-10-04 09:21:56.155553585 +0200
++++ firefox-56.0/widget/gtk/mozgtk/mozgtk.c 2017-10-04 09:22:35.562427061 +0200
+@@ -61,7 +61,6 @@ STUB(gdk_screen_get_height_mm)
+ STUB(gdk_screen_get_n_monitors)
+ STUB(gdk_screen_get_monitor_at_window)
+ STUB(gdk_screen_get_monitor_geometry)
+-STUB(gdk_screen_get_monitor_workarea)
+ STUB(gdk_screen_get_monitor_height_mm)
+ STUB(gdk_screen_get_number)
+ STUB(gdk_screen_get_resolution)
+@@ -550,6 +549,7 @@ STUB(gtk_render_line)
+ STUB(gtk_render_option)
+ STUB(gtk_render_slider)
+ STUB(gtk_scale_new)
++STUB(gdk_screen_get_monitor_workarea)
+ STUB(gtk_scrollbar_new)
+ STUB(gtk_style_context_add_class)
+ STUB(gtk_style_context_add_region)
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,9 @@
name : firefox
-version : 56.0.1
-release : 105
+version : 56.0.2
+release : 106
source :
- - https://ftp.mozilla.org/pub/firefox/releases/56.0.1/source/firefox-56.0.1.source.tar.xz : ece052c9385ac6ccf58edb213b875f4793014c431f7e40de146bcd2dbcb0a3cb
- - https://solus-project.com/sources/mozilla/firefox-56.0.1-langpacks.tar.xz : 9fb7013e980f9fd710556dc58fc34ec8d4935259ef76033066604aac552c69af
+ - https://ftp.mozilla.org/pub/firefox/releases/56.0.2/source/firefox-56.0.2.source.tar.xz : 6f7d284c31383a9860d7b52f05f866526d5a7c31e3ef2959d79122ba074f5ca1
+ - https://solus-project.com/sources/mozilla/firefox-56.0.2-langpacks.tar.xz : d99b3642e8068beb88ce48e1ffba04dd331ca9806ef1088151c35db66b16bae5
license :
- GPL-2.0
- MPL-2.0
@@ -33,6 +33,7 @@
- pkgconfig(xcomposite)
- pkgconfig(xt)
- autoconf213
+ - bzip2-devel
- cargo
- libjpeg-turbo-devel
- llvm-clang
@@ -41,6 +42,10 @@
rundeps :
- ffmpeg
setup : |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1405267
+ patch -p1 < $pkgfiles/mozilla-1405267.patch
+ patch -p1 < $pkgfiles/rhbz-1497932.patch
+
# Fix installation directory woes
%patch -p1 < $pkgfiles/firefox-install-dir.patch
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -173,12 +173,12 @@
</Files>
</Package>
<History>
- <Update release="105">
- <Date>2017-10-06</Date>
- <Version>56.0.1</Version>
+ <Update release="106">
+ <Date>2017-10-26</Date>
+ <Version>56.0.2</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Jul 22, 5:52 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5792811
Default Alt Text
D1253.id3116.diff (4 KB)
Attached To
Mode
D1253: Update firefox to 56.0.2
Attached
Detach File
Event Timeline
Log In to Comment