Skip to content

Commit

Permalink
Revert "patterns: meta: Tweak NFC related parts"
Browse files Browse the repository at this point in the history
This actually breaks building with the SFOS 3.4.0 intented versions of
NFC stack, so revert this until the next SFOS upgrade is out.

This reverts commit 06471b5.
  • Loading branch information
JamiKettunen committed Dec 9, 2020
1 parent 6e447a9 commit 0d12d31
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
6 changes: 1 addition & 5 deletions patterns/jolla-configuration-cheeseburger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ Requires:
- sailfish-content-graphics-z@ICON_RES@

# Extended settings functionality
- jolla-settings-system-nfc
- jolla-settings-system-flashlight
- jolla-settings-networking-multisim
- jolla-settings-accounts-extensions-3rd-party-all

# For devices which support NFC
- jolla-settings-system-nfc
- nfcd-dbuslog-plugin
- nfcd-mce-plugin

# Introduced starting Sailfish OS 2.1.1.26
# Required for Jolla Store Access
- patterns-sailfish-consumer-generic
Expand Down
6 changes: 1 addition & 5 deletions rpm/jolla-configuration-cheeseburger.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ Requires: patterns-sailfish-cellular-apps
Requires: sailfish-content-graphics-z1.75

# Extended settings functionality
Requires: jolla-settings-system-nfc
Requires: jolla-settings-system-flashlight
Requires: jolla-settings-networking-multisim
Requires: jolla-settings-accounts-extensions-3rd-party-all

# For devices which support NFC
Requires: jolla-settings-system-nfc
Requires: nfcd-dbuslog-plugin
Requires: nfcd-mce-plugin

# Introduced starting Sailfish OS 2.1.1.26
# Required for Jolla Store Access
Requires: patterns-sailfish-consumer-generic
Expand Down

0 comments on commit 0d12d31

Please sign in to comment.