Skip to content

Commit

Permalink
Merge pull request #40 from sailfishos-applications/devel
Browse files Browse the repository at this point in the history
`devel`→`master`: Fix building at SFOS-OBS, closes #38
  • Loading branch information
Olf0 authored Feb 4, 2024
2 parents da49053 + 6dc00ad commit 885302c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,10 @@ file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to look
for such a notice.

Additional, accurate notices of copyright ownership:
Accurate notices of copyright ownership:
- (C) 2015-2021 Matias Perez (CepiPerez) <[email protected]>
- (C) 2022-2023 olf (Olf0) <[email protected]>
- (C) 2022-2024 olf (Olf0) <[email protected]>
- (C) 2023-2024 Damien Caliste (dcaliste) <[email protected]>

Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
**FlowPlayer is a music player with lyrics support, online radio and 10-band equalizer.**

Features:
- *<ToDo: A pull request providing a list of features will be very welcome>*
- *<ToDo: A pull request for [the README.md](https://github.com/sailfishos-applications/flowplayer/blob/devel/README.md) which provides a list of features will be much appreciated.>*

<sup>Note that the ability to ... may be broken (this is [known for XXX](https://github.com/sailfishos-applications/flowplayer/issues/) ‒ currently nothing) due to API changes in recent SailfishOS releases.</sup><br />
Pull requests with fixes, improvements and enhancements are welcome!
Expand Down
3 changes: 2 additions & 1 deletion rpm/flowplayer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Version: 0.3.1
# build at GitHub and OBS, when configured accordingly; mind the sorting
# (`adud` < `alpha`). For details and reasons, see
# https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
Release: rc2
Release: rc3
# The Group tag should comprise one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
Group: Applications/Multimedia
Expand All @@ -45,6 +45,7 @@ Requires: qml(org.nemomobile.thumbnailer)
Requires: qml(com.jolla.mediaplayer)
BuildRequires: pkgconfig(sailfishapp) >= 1.0.2
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(gstreamer-1.0)
Expand Down

0 comments on commit 885302c

Please sign in to comment.