-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also fix musl by not trying to temporarily disable stdout by replacing it with a file handle for /dev/null.
- Loading branch information
Showing
3 changed files
with
44 additions
and
4 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
Source: @pullmoll | ||
Upstream: no | ||
Reason: In musl libc stdin, stdout, and stderr are FILE const* | ||
|
||
The unreadCount option may print intialization messages before the | ||
number of unread articles. This _may_ break existing apps relying | ||
on the output being just one number, while I know of no such app. | ||
If someone knows how to temporarily disable stdout with musl libc | ||
please modify this patch and move it to ../patches. | ||
|
||
--- src/FeedReaderMain.vala 2019-07-13 21:09:05.000000000 +0200 | ||
+++ src/FeedReaderMain.vala 2020-04-14 01:26:11.436124423 +0200 | ||
@@ -98,10 +98,7 @@ | ||
|
||
if(unreadCount) | ||
{ | ||
- var old_stdout =(owned)stdout; | ||
- stdout = FileStream.open("/dev/null", "w"); | ||
Logger.init(verbose); | ||
- stdout =(owned)old_stdout; | ||
stdout.printf("%u\n", DataBase.readOnly().get_unread_total()); | ||
return 0; | ||
} |
11 changes: 11 additions & 0 deletions
11
srcpkgs/FeedReader/patches/fix-FeedServer_vala-flags.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- src/Backend/FeedServer.vala 2019-07-13 21:09:05.000000000 +0200 | ||
+++ src/Backend/FeedServer.vala 2020-04-13 21:47:59.911904739 +0200 | ||
@@ -57,7 +57,7 @@ | ||
var secrets = Secret.Collection.for_alias_sync(secret_service, Secret.COLLECTION_DEFAULT, Secret.CollectionFlags.NONE); | ||
if(secrets == null) | ||
{ | ||
- secrets = Secret.Collection.create_sync(secret_service, "Login", Secret.COLLECTION_DEFAULT, Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE); | ||
+ secrets = Secret.Collection.create_sync(secret_service, "Login", Secret.COLLECTION_DEFAULT, Secret.CollectionCreateFlags.NONE); | ||
} | ||
|
||
var settings_backend = null; // FIXME: Why does SettingsBackend.get_default() crash on Arch Linux? |
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