Created attachment 245026 [details] librewolf.diff.gz Hello, this is librewolf update to 117.0.1-1
Your patch does not apply. Please try to submit patches directly against the FreeBSD ports collection, ideally in git-format-patch format. The patch you submitted has something weird going on with an a/librewolf.orig directory vs. a a/librewolf directory. To prepare a correct patch: 1. clone the ports collection and checkout the main branch 2. apply your changes 3. make a commit with the changes 4. execute "git format-patch" to produce a patch
Created attachment 245048 [details] librewolf.diff.gz Thank you for the procedure how to make a patch. I tried to create a diff
(In reply to Martin Filla from comment #2) Well it's not quite in "git format-patch" format, but at least it applies. The output of "git format-patch" has the advantage that it comes with all the meta data that goes into a commit, so it's easier to use. Thank you for the great effort this patch must have taken to produce. Unfortunately, www/librewolf now fails during the patch phase (on arm64): ===> Patching for librewolf-117.0.1.1 ===> Applying distribution patches for librewolf-117.0.1.1 ===> Applying FreeBSD patches for librewolf-117.0.1.1 from /usr/home/ports/main.ports/www/librewolf/files File to patch: ^C===> FAILED Applying FreeBSD patch-bug1504834_comment9 ===> Cleanly applied FreeBSD patch(es) patch-addon-search patch-browser-app-nsBrowserApp.cpp patch-bug1269654_comment5 patch-bug1504834_comment10 patch-bug1504834_comment5 ===> FAILED to apply cleanly FreeBSD patch(es) patch-bug1504834_comment9 The "File to patch: " message is from the patch program and indicates that it cannot figure out which file to patch. Another issue I found is that LICENSE is not defined. Please check if you can define LICENSE and LICENSE file. Perhaps you can copy the whole LICENSE block from www/firefox; it should be identical.
Created attachment 245069 [details] 0001-librewolf-update-version-to-117.0-1.patch.gz Last attempt. Now is patch in git-format.
(In reply to Martin Filla from comment #4) Thank you, "make patch" now succeeds. If a build test passes, this looks like it is ready to commit. As for the committer name and email, should I use the one you use on bugzilla or rather the one in the patch file? Also, is there a changelog for this update?
(In reply to Robert Clausecker from comment #5) Can you please use from Bugzilla Name and email?
Sure, will do.
The build fails on arm64 FreeBSD 13.2: In file included from /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/widget/gtk/nsMenuBar.cpp:10: In file included from /wrkdirs/usr/ports/www/librewolf/work/.build/dist/include/mozilla/dom/Document.h:24: In file included from /wrkdirs/usr/ports/www/librewolf/work/.build/dist/include/mozilla/BasicEvents.h:16: /wrkdirs/usr/ports/www/librewolf/work/.build/dist/include/nsCOMPtr.h:818:3: error: static_assert failed due to requirement 'std::is_same_v<mozilla::dom::Document, nsISupports> || !(std::is_same_v<mozilla::dom::Document, mozilla::dom::Document> || std::is_base_of<mozilla::dom::Document, mozilla::dom::Document>::value)' "don't use do_QueryInterface for compile-time-determinable casts" static_assert( ^ /wrkdirs/usr/ports/www/librewolf/work/.build/dist/include/nsCOMPtr.h:630:5: note: in instantiation of function template specialization 'nsCOMPtr<mozilla::dom::Document>::assign_from_qi<mozilla::dom::Document>' requested here assign_from_qi(aRhs, NS_GET_TEMPLATE_IID(T)); ^ /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/widget/gtk/nsMenuBar.cpp:193:15: note: in instantiation of function template specialization 'nsCOMPtr<mozilla::dom::Document>::operator=<mozilla::dom::Document>' requested here mDocument = do_QueryInterface(ContentNode()->OwnerDoc()); ^ 1 error generated. gmake[4]: *** [/wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/config/rules.mk:661: nsMenuBar.o] Error 1 Other builds, including arm64 FreeBSD 12.3 are currently pending. armv7 cannot be tested as the dependency audio/pulseaudio currently does not build. While it is not required that your port builds on arm64, you may perhaps want to check this problem out.
Same failure on arm64 FreeBSD 12.3. Note that during configure on i386 FreeBSD 13.2, the following error occurs: checking whether removing dead symbols breaks debugging... Traceback (most recent call last): File "/usr/local/lib/python3.9/runpy.py", line 197, in _run_module_as_main return _run_code(code, main_globals, None, File "/usr/local/lib/python3.9/runpy.py", line 87, in _run_code exec(code, run_globals) File "/wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/python/mozbuild/mozbuild/configure/check_debug_ranges.py", line 68, in <module> print(main(*sys.argv[1:])) File "/wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/python/mozbuild/mozbuild/configure/check_debug_ranges.py", line 47, in main p = subprocess.Popen( File "/usr/local/lib/python3.9/subprocess.py", line 951, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/usr/local/lib/python3.9/subprocess.py", line 1837, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: 'objdump' Traceback (most recent call last): File "/usr/local/lib/python3.9/runpy.py", line 197, in _run_module_as_main return _run_code(code, main_globals, None, File "/usr/local/lib/python3.9/runpy.py", line 87, in _run_code exec(code, run_globals) File "/wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/python/mozbuild/mozbuild/configure/check_debug_ranges.py", line 68, in <module> print(main(*sys.argv[1:])) File "/wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/python/mozbuild/mozbuild/configure/check_debug_ranges.py", line 47, in main p = subprocess.Popen( File "/usr/local/lib/python3.9/subprocess.py", line 951, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/usr/local/lib/python3.9/subprocess.py", line 1837, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: 'objdump' You may need to add BUILD_DEPENDS= objdump:devel/binutils to address this one, though I think it's not related to the main failure.
Same error on amd64 and i386 FreeBSD 13.2 and 12.4. In fact, I was unable to build this port anywhere. Please check and resubmit.
Back to open, pending reworked patch by submitter.
Thanks Martin https://people.freebsd.org/~jsm/patch2.diff same work just with two extra patches to the unity_menu patch https://codeberg.org/librewolf/issues/issues/1279 @Robert hope you have the opportunity to test and commit this.. Thanks
(In reply to Jesper Schmitz Mouridsen from comment #12) Currently conducting build tests on your patch. Is it okay if I keep Martin as the author and explain that you contributed two additional patches? @maintainer, please let me know if you approve of jsm's enhanced patch.
(In reply to Robert Clausecker from comment #13) Perfectly fine to keep Martin as author. Thanks
A build test of the jsm's file succeeded. Dear maintainer, are you fine with me committing that patch?
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1069e80ec4d0f4bcc69f27b9341815f03cd167f commit a1069e80ec4d0f4bcc69f27b9341815f03cd167f Author: Martin Filla <freebsd@sysctl.cz> AuthorDate: 2023-10-07 03:00:00 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-10-09 07:40:28 +0000 www/librewolf: update to 117.0.1-1 With two additional patches to the unity_menu patch due to jsm@. Changelog: https://gitlab.com/librewolf-community/browser/bsys6/-/releases PR: 273948 See also: https://codeberg.org/librewolf/issues/issues/1279 Obtained from: https://people.freebsd.org/~jsm/patch2.diff www/librewolf/Makefile | 15 +- www/librewolf/distinfo | 8 +- www/librewolf/files/patch-addon-search | 20 +- www/librewolf/files/patch-bug1504834_comment5 | 10 +- .../files/patch-bug1504834_comment9 (gone) | 49 - www/librewolf/files/patch-bug1559213 | 42 +- www/librewolf/files/patch-bug1640982 (gone) | 17 - www/librewolf/files/patch-bug1659612 | 22 +- .../patch-gfx_skia_skia_src_base_SkEndian.h (new) | 11 + ...gfx_skia_skia_src_core_SkRasterPipeline.h (new) | 11 + .../files/patch-js_public_Utility.h (new) | 35 + www/librewolf/files/patch-libwebrtc-generated | 38943 +++++++++++-------- .../patch-modules_fdlibm_src_math__private.h (new) | 27 + www/librewolf/files/patch-mozglue_misc_SSE.h (new) | 84 + www/librewolf/files/patch-pipewire_init | 82 +- ...patch-python_mozbuild_mozbuild_gn__processor.py | 21 +- www/librewolf/files/patch-rust-1.70.0 (gone) | 33 - ...rd__party_libwebrtc_build_config_BUILDCONFIG.gn | 116 +- ...op__capture_linux_wayland__egl__dmabuf.cc (new) | 26 + ..._compontents_processtools_procinfo__bsd.c (new) | 104 + www/librewolf/files/patch-toolkit_xre_glxtest.cpp | 10 +- .../patch-toolkit_xre_nsXREDirProvider.cpp (gone) | 11 - .../files/patch-widget_gtk_nsMenuBar.cpp (new) | 11 + .../files/patch-widget_gtk_nsMenuObject.cpp (new) | 66 + 24 files changed, 22915 insertions(+), 16859 deletions(-)
Thank you for your contribution.