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

Updating the location of localization files #1660

Merged
merged 1 commit into from Mar 16, 2020
Merged

Updating the location of localization files #1660

merged 1 commit into from Mar 16, 2020

Conversation

DeadMozay
Copy link
Contributor

It seems that I didn’t forget anything, I checked appimage and openSUSE, localization works, as in other distributions, packaging also went to fixed directories, I think there should be no problems
https://build.opensuse.org/package/show/home:Dead_Mozay:branches:home:pbek:QOwnNotes/desktop
building everywhere was successful except Arch, but I think this is due to some kind of error on the obs

@DeadMozay DeadMozay mentioned this pull request Mar 15, 2020
Closed
@coveralls
Copy link

Coverage Status

Coverage remained the same at 13.416% when pulling a404f9e on DeadMozay:develop into 26a7acb on pbek:develop.

pbek
pbek reviewed Mar 15, 2020
View reviewed changes
obs/qownnotes.spec
@@ -206,98 +142,15 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc LICENSE README.md CHANGELOG.md shortcuts.md
%{_bindir}/QOwnNotes
%{_datadir}/pixmaps/QOwnNotes.png
Copy link
Owner

Choose a reason for hiding this comment

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

Can that line really go?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The icon itself will be found

pbek
pbek reviewed Mar 15, 2020
View reviewed changes
obs/qownnotes.spec
Comment on lines -120 to -134
# manually install desktop file for Fedora and CentOS 7
%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?centos} >= 7
install -D -m 0644 PBE.QOwnNotes.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/PBE.QOwnNotes.desktop
%endif

install -D -m 0644 images/icons/128x128/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/QOwnNotes.png
install -D -m 0644 images/icons/16x16/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/QOwnNotes.png
install -D -m 0644 images/icons/24x24/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/24x24/apps/QOwnNotes.png
install -D -m 0644 images/icons/32x32/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/QOwnNotes.png
install -D -m 0644 images/icons/48x48/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/QOwnNotes.png
install -D -m 0644 images/icons/64x64/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/QOwnNotes.png
install -D -m 0644 images/icons/96x96/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/apps/QOwnNotes.png
install -D -m 0644 images/icons/128x128/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/128x128/apps/QOwnNotes.png
install -D -m 0644 images/icons/256x256/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/256x256/apps/QOwnNotes.png
install -D -m 0644 images/icons/512x512/apps/QOwnNotes.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/512x512/apps/QOwnNotes.png
Copy link
Owner

Choose a reason for hiding this comment

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

How are those lines substituted?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

these files are automatically installed using a macro %make_install

@pbek
Copy link
Owner

pbek commented Mar 15, 2020

Looks pretty complete (beside my comments).
It will be hard to test all that beforehand... How many distros have you actually tested?

Can you please attempt to build the Arch Packages again, maybe OBS fixed the build already.

And the application will check /usr/share/qt5/translations/ without adding it to main.cpp?

@pbek pbek added the WIP PR that is still being worked on label Mar 15, 2020
@DeadMozay
Copy link
Contributor Author

I checked the finished package for arch before the building broke, at first glance the packaging was completed as expected, but I will check again.
without editing main.cpp, the application will look for translations not where they actually lie, it will search for them along the old path

@pbek
Copy link
Owner

pbek commented Mar 15, 2020

it will search for them along the old path

Which old path do you mean? So do we need to include /usr/share/qt5/translations/ as path to look in?

@DeadMozay
Copy link
Contributor Author

it will search for them along the old path

Which old path do you mean? So do we need to include /usr/share/qt5/translations/ as path to look in?

Checked on openSUSE, Fedora, Arch, Ubuntu, Appimage, everything works

@pbek
Copy link
Owner

pbek commented Mar 16, 2020

Thank you, we'll wait for the feedback from the next release then. 😬

@pbek pbek merged commit b589ee0 into pbek:develop Mar 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbek pbek pbek left review comments

Assignees
No one assigned
Labels
WIP PR that is still being worked on
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@DeadMozay @coveralls @pbek