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.

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

420_porting #20403

Merged
merged 42 commits into from
Dec 11, 2023
Merged

420_porting #20403

merged 42 commits into from
Dec 11, 2023

Conversation

RomanPudashkin
Copy link
Contributor

@RomanPudashkin RomanPudashkin commented Dec 11, 2023

Eism and others added 30 commits December 11, 2023 11:44
Decouples the actual Excerpt name (shown in UI, and in the Excerpt itself) from the name under which it is saved in the MSC file. This way, the Excerpt name can be whatever the user wants, but still the excerpt can safely be saved in the file.
…standard"

For example, when opening pre-4.2 files. This also gives us more freedom to easily change the excerpt file name generation algorithm in the future.
…n the same tick when a repeat ends

1. segmentEndTick represents either the last tick of the score (if no repeats) or the last tick of the current repeat

2. If a hairpin starts on the same tick as specified in segmentEndTick (i.e., on the 1st beat after the repeat sign),
findOverlapping will find it (it doesn't belong to the repeat), causing the found hairpin to overlap with other hairpins within the repeat

So, ignore hairpins that start on segmentEndTick by subtracting 1 tick, as they don't belong to that repeat
Swap figure-dash with n-dash character. Set default size to 9pt.
remove pkgconfig manual overrides for appimageupdatetool

unnecessary on focal and newer distros
between the time that the original armhf/arm64 PR was made and now upstream has started building some dependencies for armhf/arm64 in their own CI and publishing releases. unfortunately we cannot use these releases since appimages (even the extraction command) do not run inside of the armhf/arm64 docker container
AppImage/AppImageKit#1027

replace wget with curl (in make_appimage) due to armhf bug

https://bugs.launchpad.net/ubuntu/+source/wget/+bug/2043636
avoids needing gpgme which, in order to build, requires _FILE_OFFSET_BITS=64 which causes issues with linking to system libz.so.1

/usr/bin/ld: libzsync2_standalone.a(zsclient.cpp.o): undefined reference to symbol 'gzopen64@@ZLIB_1.2.3.3'
/usr/bin/ld: /lib/arm-linux-gnueabihf/libz.so.1: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status

AppImageCommunity/AppImageUpdate#230
@RomanPudashkin RomanPudashkin merged commit 57226e1 into musescore:4.2.0 Dec 11, 2023
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.

7 participants