Two compilation fixes for FreeBSD #1173
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Well, wait, it seems that, although it works, the first commit is logically incorrect... |
|
@OlCe2 Thank you. Please ensure commits make sense and are coherently organised. We will review the PR. Unfortunately, we don't have a CI for FreeBSD so it is difficult to keep everything compiling fine. |
|
Yes, sorry, I figured out after pushing the PR that the first commit is not really correct (I mean, it would be better than the current situation, but still logically incorrect for reasons I will explain later). Working on an alternative, will update this PR when done. |
OlCe2
force-pushed
the
main
branch
2 times, most recently
from
d991c2c to
a66fa82
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1173 +/- ##
=======================================
Coverage 41.47% 41.47%
=======================================
Files 59 59
Lines 4272 4272
Branches 2336 2336
=======================================
Hits 1772 1772
+ Misses 1002 999 -3
- Partials 1498 1501 +3 ☔ View full report in Codecov by Sentry. |
|
Ok, this is ready to be reviewed. |
veloman-yunkan
requested changes
Jan 8, 2025
See the added comments for more details. While here, initialize 'extra_deps' once and for all at the top and append to it when needed.
Header <netinet/in.h> should be included (as per POSIX) to get a definition for 'struct sockaddr_in'. Fixes commit "add ipv6 support to HTTP daemon".
|
Thanks! |
|
I hope to be able to dedicate a bit of time to see how to set up a FreeBSD CI in your project in the future, that would help avoiding breakage (although we do workaround it in our ports tree with custom patches). |
freebsd-git
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Jan 10, 2025
Now that devel/libkiwix13 has been created and www/kiwix-tools changed to depend on it, fixing the latter's build and avoiding a bump of PORTEPOCH here, we can reapply the update. This commit is different than the initial update's one, as local patches here match what was upstreamed in the meantime (see kiwix/libkiwix#1173). Selected list of changes: - Support of IPv6 - Better public IP configuration/detection - Fix API errors in catalog searches if Xapian keyword in used - Improve welcome page download buttons - Better handling of external (non-HTTP) links - Fix book illustration size on welcome page to 48x48 pixels - Remove "Multiple Languages" in language filter - Stop transforming tags casing - ZIM file size consistently advertised in MiB - Add accesskeys - Add OpenSearch to head of pages See also: https://github.com/kiwix/libkiwix/releases/tag/14.0.0 This is a maintainer update ([email protected]). PR: 282559 Reported by: [email protected] Reviewed by: jrm Fixes: dafb538 ("devel/libkiwix: Update to 14.0.0") MFH: 2025Q1 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48397
freebsd-git
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Jan 10, 2025
Now that devel/libkiwix13 has been created and www/kiwix-tools changed to depend on it, fixing the latter's build and avoiding a bump of PORTEPOCH here, we can reapply the update. This commit is different than the initial update's one, as local patches here match what was upstreamed in the meantime (see kiwix/libkiwix#1173). Selected list of changes: - Support of IPv6 - Better public IP configuration/detection - Fix API errors in catalog searches if Xapian keyword in used - Improve welcome page download buttons - Better handling of external (non-HTTP) links - Fix book illustration size on welcome page to 48x48 pixels - Remove "Multiple Languages" in language filter - Stop transforming tags casing - ZIM file size consistently advertised in MiB - Add accesskeys - Add OpenSearch to head of pages See also: https://github.com/kiwix/libkiwix/releases/tag/14.0.0 This is a maintainer update ([email protected]). PR: 282559 Reported by: [email protected] Reviewed by: jrm Fixes: dafb538 ("devel/libkiwix: Update to 14.0.0") MFH: 2025Q1 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48397 (cherry picked from commit 0009322)
nanorkyo
pushed a commit
to nanorkyo/freebsd-ports
that referenced
this pull request
Jan 18, 2025
Now that devel/libkiwix13 has been created and www/kiwix-tools changed to depend on it, fixing the latter's build and avoiding a bump of PORTEPOCH here, we can reapply the update. This commit is different than the initial update's one, as local patches here match what was upstreamed in the meantime (see kiwix/libkiwix#1173). Selected list of changes: - Support of IPv6 - Better public IP configuration/detection - Fix API errors in catalog searches if Xapian keyword in used - Improve welcome page download buttons - Better handling of external (non-HTTP) links - Fix book illustration size on welcome page to 48x48 pixels - Remove "Multiple Languages" in language filter - Stop transforming tags casing - ZIM file size consistently advertised in MiB - Add accesskeys - Add OpenSearch to head of pages See also: https://github.com/kiwix/libkiwix/releases/tag/14.0.0 This is a maintainer update ([email protected]). PR: 282559 Reported by: [email protected] Reviewed by: jrm Fixes: dafb538 ("devel/libkiwix: Update to 14.0.0") MFH: 2025Q1 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48397
nanorkyo
pushed a commit
to nanorkyo/freebsd-ports
that referenced
this pull request
Jan 18, 2025
Now that devel/libkiwix13 has been created and www/kiwix-tools changed to depend on it, fixing the latter's build and avoiding a bump of PORTEPOCH here, we can reapply the update. This commit is different than the initial update's one, as local patches here match what was upstreamed in the meantime (see kiwix/libkiwix#1173). Selected list of changes: - Support of IPv6 - Better public IP configuration/detection - Fix API errors in catalog searches if Xapian keyword in used - Improve welcome page download buttons - Better handling of external (non-HTTP) links - Fix book illustration size on welcome page to 48x48 pixels - Remove "Multiple Languages" in language filter - Stop transforming tags casing - ZIM file size consistently advertised in MiB - Add accesskeys - Add OpenSearch to head of pages See also: https://github.com/kiwix/libkiwix/releases/tag/14.0.0 This is a maintainer update ([email protected]). PR: 282559 Reported by: [email protected] Reviewed by: jrm Fixes: dafb538 ("devel/libkiwix: Update to 14.0.0") MFH: 2025Q1 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48397
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that in both cases we are not special-casing FreeBSD, as the first case is in fact Linux-specific, and the second case is just following what POSIX prescribes (the change works on Linux too).