Skip to content

[Fix Build] Don't care about icon scaling#409

Merged
nephros merged 1 commit intosailfishos-patches:masterfrom
nephros:build-4.5
Feb 3, 2023
Merged

[Fix Build] Don't care about icon scaling#409
nephros merged 1 commit intosailfishos-patches:masterfrom
nephros:build-4.5

Conversation

@nephros
Copy link
Contributor

@nephros nephros commented Feb 3, 2023

SFOS 4.5 introduces z2.5, lets just include any scale

Fixes building on OBS

SFOS 4.5 introduces z2.5, lets just  include any scale
@nephros
Copy link
Contributor Author

nephros commented Feb 3, 2023

As it is purely a build fix not sure this warrants a new tag/release, might as well tag it as a '+git1' version and allow OBS to build.

Therefore I did a 3.2.6-fixes branch based on tag 3.2.6, cherry-picked this, and have taken the liberty to point sailfishos:chum:testing at that: https://build.merproject.org/package/view_file/sailfishos:chum:testing/patchmanager/_service?expand=0&rev=ab03d68477b014ac49ee4a3810871d4c

@nephros nephros changed the base branch from master to 3.2.6-fixes February 3, 2023 07:43
@nephros nephros marked this pull request as draft February 3, 2023 07:43
@nephros nephros changed the base branch from 3.2.6-fixes to master February 3, 2023 07:44
@nephros nephros marked this pull request as ready for review February 3, 2023 07:49
@nephros
Copy link
Contributor Author

nephros commented Feb 3, 2023

@Olf0 if you agree with this, please submit that chum:testing revision to chum.

@nephros nephros changed the title [Fix] Don't care about icon scaling [Fix Build] Don't care about icon scaling Feb 3, 2023
Copy link
Contributor

@Olf0 Olf0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine.

@nephros nephros merged commit 983616f into sailfishos-patches:master Feb 3, 2023
@Olf0
Copy link
Contributor

Olf0 commented Feb 3, 2023

@nephros,

As it is purely a build fix not sure this warrants a new tag/release, might as well tag it as a '+git1' version and allow OBS to build.

actually I am keen on making a new release, because I committed fixes to the CI run triggered by setting a new tag since the last release and would like to test that in "real life" (although I assume it is fine now).

So if you have anything else to add to an Patchmanager 3.2.7 release, please pose another PR. If not, please tell me that.
I plan to create a new release tonight, if this is fine for you.

Cheers!

@nephros
Copy link
Contributor Author

nephros commented Feb 3, 2023 via email

@Olf0
Copy link
Contributor

Olf0 commented Feb 3, 2023

Fine from my PoV.

Just one of my checks&balances questions: The icon for z2.5 is auto-generated by src/icons/icons.pro, correct? I am asking, because I fail to spontaneously see where $${profile} used in this file comes from.

Edit: The build error at the SFOS-OBS answers that:

[  136s] RPM build errors:
[  136s]     Installed (but unpackaged) file(s) found:
[  136s]    /usr/share/themes/sailfish-default/meegotouch/z2.5/icons/icon-m-patchmanager2.png
[  136s] Messages from sb2:
[  136s]  (WARNING)	qmake[3517/-142424256]	Path not found for FD -100, for __fxstatat64()
[  136s] # exit 1 (1)

Hence releasing Patchmanager 3.2.7.

@nephros
Copy link
Contributor Author

nephros commented Feb 5, 2023

Just one of my checks&balances questions: The icon for z2.5 is auto-generated by src/icons/icons.pro, correct? I am asking, because I fail to spontaneously see where $${profile} used in this file comes from.

Yes, that profile variable/list is defined by /usr/share/qt5/mkspecs/features/sailfish-svg2png-sizes.prf which comes from the sailfish-svg2png package. I fail at the moment to find sources for this package on Jolla's repos, but a locally installed version can be checked for this.

@nephros nephros deleted the build-4.5 branch November 15, 2024 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants