Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add fix for pcsc 2.3.0 to flathub-beta #94

Closed
wants to merge 31 commits into from
Closed

Add fix for pcsc 2.3.0 to flathub-beta #94

wants to merge 31 commits into from

Conversation

suntorytimed
Copy link

Submitting changes from #91 to beta branch to release a fix for #90 to flathub-beta

brugr and others added 30 commits November 16, 2022 16:31
@brugr
update to stable 6.0.0
d2c4f32
@Lunarequest
Merge pull request flathub#61 from brugr/update
3bd1265 
update to stable 6.0.0
@flathubbot
Update yubico-authenticator-6.0.0-linux.tar.gz to 6.0.2
3b11846
@Lunarequest
Merge pull request flathub#63 from flathub/update-0093432
546581d 
Update yubico-authenticator-6.0.0-linux.tar.gz to 6.0.2
@flathubbot
Update yubico-authenticator-6.0.2-linux.tar.gz to 6.1.0
ec198de
@Lunarequest
Merge pull request flathub#64 from flathub/update-355573d
5740586 
Update yubico-authenticator-6.0.2-linux.tar.gz to 6.1.0
@austin-ek
Share session bus
e95bcab
@austin-ek
Replace arbitrary dbus permission with more specific permission
9475eda
@Lunarequest
Merge pull request flathub#66 from austin-ek/share-session-bus
1d86282 
Fix "remember password" option
@flathubbot
Update yubico-authenticator-6.1.0-linux.tar.gz to 6.2.0
1b18436
@Lunarequest
Merge pull request flathub#67 from flathub/update-4d7e87b
11587e3 
Update yubico-authenticator-6.1.0-linux.tar.gz to 6.2.0
@evan-a-a
Add libnotify dependency
b894893 
* Required starting with v6.2.0

Fixes flathub#68
@Lunarequest
Merge pull request flathub#69 from evan-a-a/master
7fdae27 
Add libnotify dependency
@flathubbot
Update pcsc-lite-1.9.9.tar.bz2 to 2.0.0
c2afb0f
@Lunarequest
Merge pull request flathub#71 from flathub/update-f87edda
767b22c 
Update pcsc-lite-1.9.9.tar.bz2 to 2.0.0
@slagiewka
chore: update description about pcsc-lite in Fedora
aa9f258 
According to pre-existing issues [^1] and my experience,
Fedora 38 is no longer causing issues.

[^1]: flathub#35 (comment)
@Lunarequest
Merge pull request flathub#72 from slagiewka/patch-1
eda917b 
chore: update description about pcsc-lite in Fedora
@flathubbot
Update yubico-authenticator-6.2.0-linux.tar.gz to 6.3.0
5b7f32c
@Lunarequest
Merge pull request flathub#73 from flathub/update-f1cc800
5958c90 
Update yubico-authenticator-6.2.0-linux.tar.gz to 6.3.0
@flathubbot
Update libnotify-0.8.2.tar.xz to 0.8.3
a33e5e7
@Lunarequest
Merge pull request flathub#74 from flathub/update-e3290a2
26cc330 
Update libnotify-0.8.2.tar.xz to 0.8.3
@Erick555
Move to freedesktop 23.08 runtime
b0c9c1b 
This is latest available runtime.
@Lunarequest
Merge pull request flathub#76 from Erick555/patch-1
404bd51 
Move to freedesktop 23.08 runtime
@flathubbot
Update 2 modules
c367126 
Update pcsc-lite-2.0.0.tar.bz2 to 2.0.1
Update yubico-authenticator-6.3.0-linux.tar.gz to 6.3.1
@Erick555
Disable polkit for pcsc-lite
9dfe417 
This isn't useful in flatpak and breaks the build
@Lunarequest
Merge pull request flathub#80 from Erick555/update631
7d76843 
Update to 6.3.1 and fix pcsc-lite build
@Erick555
Limit build to x86-64
53c3850 
Upstream doesn't publish aarch64 binaries and building flutter from source is very big challenge
@Lunarequest
Merge pull request flathub#82 from Erick555/patch-1
5124eeb 
Limit build to x86-64
@flathubbot
Update yubico-authenticator-6.3.1-linux.tar.gz to 7.0.0
8691307
@Lunarequest
Merge pull request flathub#89 from flathub/update-a9f2393
00a572a 
Update yubico-authenticator-6.3.1-linux.tar.gz to 7.0.0
@suntorytimed
Copy link
Author

suntorytimed commented Aug 22, 2024 •
edited
Loading

I don't know why, but unfortunately only someone with write access to the repo can resolve the merge conflicts. Rebasing the beta branch prior to the request and sending that in resulted in the same conflicts. Personally I would force push the state of https://github.com/hafeoz/com.yubico.yubioath/tree/master to the beta branch instead.

@flathubbot
Copy link
Contributor

Started test build 141623

@flathubbot
Copy link
Contributor

Build 141623 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/124680/com.yubico.yubioath.flatpakref

@Lunarequest
Copy link
Collaborator

the beta branch has diverged to far to get a pr including all the changes from main. I would suggest just cherry picking individual commits

@suntorytimed
Copy link
Author

As said, force pushing https://github.com/hafeoz/com.yubico.yubioath/tree/master to beta would probably be best. The changes in beta are irrelevant for master anyways as far as I can tell. And the beta branch is still at version 6.0.0.

@Lunarequest
Copy link
Collaborator

force pushing is explicitly disabled by the flathub admins for beta and master branches

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@suntorytimed @flathubbot @Lunarequest @brugr @austin-ek @evan-a-a @slagiewka @Erick555 @hafeoz