Merge branch 'amedonosova/appimage-enhancement' into 'master'
cc5fb826be11
Actions

Authored by amedonosova on May 3 2020, 8:41 PM.

Description

Merge branch 'amedonosova/appimage-enhancement' into 'master'

Make AppImages updateable

See merge request kde/krita!123

Details

Committed

amedonosova

May 3 2020, 8:41 PM

Parents

R37:78d8377a2482: Make appimages updateable
R37:2b1946c82dee: Update splash for 4.3

Branches

Unknown

Tags

Unknown

References

refs/merge-requests/123/merge

amedonosova committed R37:cc5fb826be11: Merge branch 'amedonosova/appimage-enhancement' into 'master' (authored by amedonosova).May 3 2020, 8:41 PM

Merged Changes

	Commit			Author	Details	Committed
	78d8377a2482			amedonosova	Make appimages updateable	May 3 2020

Changes (117)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
A		config-updaters.h.cmake
M		krita/CMakeLists.txt
M		krita/pics/Breeze-dark/breeze-dark-icons.qrc
A		krita/pics/Breeze-dark/dark_update-medium.svg
M		krita/pics/Breeze-light/breeze-light-icons.qrc
A		krita/pics/Breeze-light/light_update-medium.svg
D		krita/pics/app
D		krita/pics/app/1024-apps-krita.png
D		krita/pics/app/128-apps-krita.png
D		krita/pics/app/16-apps-krita.png
D		krita/pics/app/22-apps-krita.png
D		krita/pics/app/256-apps-krita.png
D		krita/pics/app/32-apps-krita.png
D		krita/pics/app/48-apps-krita.png
D		krita/pics/app/512-apps-krita.png
D		krita/pics/app/64-apps-krita.png
D		krita/pics/app/CMakeLists.txt
V		krita/pics/{app → branding}/krita.ico
V		krita/pics/{app → branding/default}/sc-apps-krita.svgz
A	(dir)	krita/pics/branding/
A	(dir)	krita/pics/branding/Beta/
A		krita/pics/branding/Beta/1024-apps-krita.png
A		krita/pics/branding/Beta/128-apps-krita.png
A		krita/pics/branding/Beta/16-apps-krita.png
A		krita/pics/branding/Beta/22-apps-krita.png
A		krita/pics/branding/Beta/256-apps-krita.png
A		krita/pics/branding/Beta/32-apps-krita.png
A		krita/pics/branding/Beta/48-apps-krita.png
A		krita/pics/branding/Beta/512-apps-krita.png
A		krita/pics/branding/Beta/64-apps-krita.png
A		krita/pics/branding/Beta/CMakeLists.txt
A		krita/pics/branding/Beta/krita.ico
A		krita/pics/branding/Beta/sc-apps-krita.svgz
A	(dir)	krita/pics/branding/Next/
A		krita/pics/branding/Next/1024-apps-krita.png
A		krita/pics/branding/Next/128-apps-krita.png
A		krita/pics/branding/Next/16-apps-krita.png
A		krita/pics/branding/Next/22-apps-krita.png
A		krita/pics/branding/Next/256-apps-krita.png
A		krita/pics/branding/Next/32-apps-krita.png
A		krita/pics/branding/Next/48-apps-krita.png
A		krita/pics/branding/Next/512-apps-krita.png
A		krita/pics/branding/Next/64-apps-krita.png
A		krita/pics/branding/Next/CMakeLists.txt
A		krita/pics/branding/Next/krita.ico
A		krita/pics/branding/Next/sc-apps-krita.svgz
A	(dir)	krita/pics/branding/Plus/
A		krita/pics/branding/Plus/1024-apps-krita.png
A		krita/pics/branding/Plus/128-apps-krita.png
A		krita/pics/branding/Plus/16-apps-krita.png
A		krita/pics/branding/Plus/22-apps-krita.png
A		krita/pics/branding/Plus/256-apps-krita.png
A		krita/pics/branding/Plus/32-apps-krita.png
A		krita/pics/branding/Plus/48-apps-krita.png
A		krita/pics/branding/Plus/512-apps-krita.png
A		krita/pics/branding/Plus/64-apps-krita.png
A		krita/pics/branding/Plus/CMakeLists.txt
A		krita/pics/branding/Plus/krita.ico
A		krita/pics/branding/Plus/sc-apps-krita.svgz
A	(dir)	krita/pics/branding/default/
A		krita/pics/branding/default/1024-apps-krita.png
A		krita/pics/branding/default/128-apps-krita.png
A		krita/pics/branding/default/16-apps-krita.png
A		krita/pics/branding/default/22-apps-krita.png
A		krita/pics/branding/default/256-apps-krita.png
A		krita/pics/branding/default/32-apps-krita.png
A		krita/pics/branding/default/48-apps-krita.png
A		krita/pics/branding/default/512-apps-krita.png
A		krita/pics/branding/default/64-apps-krita.png
A		krita/pics/branding/default/CMakeLists.txt
A		krita/pics/branding/default/krita.ico
V		krita/pics/{branding/default ← app}/sc-apps-krita.svgz
A		krita/pics/branding/generate_icons.sh
V		krita/pics/{branding ← app}/krita.ico
M		libs/ui/CMakeLists.txt
M		libs/ui/KisMultiFeedRSSModel.cpp
P		libs/ui/KisMultiFeedRSSModel.h Copied to libs/ui/KisRssReader.h
M		libs/ui/KisNetworkAccessManager.cpp
A		libs/ui/KisRssReader.cpp
P		libs/ui/KisRssReader.h Copied from libs/ui/KisMultiFeedRSSModel.h
M		libs/ui/KisWelcomePageWidget.cpp
M		libs/ui/KisWelcomePageWidget.h
M		libs/ui/forms/KisWelcomePage.ui
M		libs/ui/tests/CMakeLists.txt
A		libs/ui/tests/KisAppimageUpdaterTest.cpp
A		libs/ui/tests/KisAppimageUpdaterTest.h
A		libs/ui/tests/KisManualUpdaterTest.cpp
A		libs/ui/tests/KisManualUpdaterTest.h
A		libs/ui/tests/KisMultiFeedRssModelTest.cpp
A		libs/ui/tests/KisMultiFeedRssModelTest.h
A		libs/ui/tests/KisRssReaderTest.cpp
A		libs/ui/tests/KisRssReaderTest.h
A		libs/ui/tests/MockMultiFeedRssModel.cpp
A		libs/ui/tests/MockMultiFeedRssModel.h
A		libs/ui/tests/MockNetworkAccessManager.cpp
A		libs/ui/tests/MockNetworkAccessManager.h
A		libs/ui/tests/data/AppImageUpdateDummy
A	(dir)	libs/ui/tests/data/rss_feeds/
A		libs/ui/tests/data/rss_feeds/feed.xml
A		libs/ui/utils/KisAppimageUpdater.cpp
A		libs/ui/utils/KisAppimageUpdater.h
A		libs/ui/utils/KisManualUpdater.cpp
A		libs/ui/utils/KisManualUpdater.h
A		libs/ui/utils/KisUpdaterBase.cpp
A		libs/ui/utils/KisUpdaterBase.h
A		libs/ui/utils/KisUpdaterStatus.cpp
A		libs/ui/utils/KisUpdaterStatus.h
M		libs/ui/widgets/KisNewsWidget.cpp
M		libs/ui/widgets/KisNewsWidget.h
M		packaging/linux/appimage/build-image.sh
M		packaging/linux/appimage/build-krita.sh
A		packaging/linux/appimage/generate_zsync.sh
A		packaging/linux/appimage/rewrite_appimage_updinfo.sh
A		packaging/linux/appimage/sign_appimage.sh
A		packaging/linux/appimage/strip_appimage_signature.sh
A		packaging/linux/appimage/validate_appimage_signature.sh