lomiri.lomiri-docviewer-app: 3.0.4 -> 3.1.0
This commit is contained in:
@@ -21,61 +21,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-docviewer-app";
|
||||
version = "3.0.4";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/apps/lomiri-docviewer-app";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xUBE+eSAfG2yMlE/DI+6JHQx+3HiNwtSTv/P4YOAE7Y=";
|
||||
hash = "sha256-zesBZmaMiMJwHtj3SoaNeHPiM9VNGEa4nTIiG8nskqI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when version > 3.0.4
|
||||
(fetchpatch {
|
||||
name = "0001-lomiri-docviewer-app-Set-gettext-domain.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/8dc2c911817c45451ff341e4ae4b841bcc134945.patch";
|
||||
hash = "sha256-vP6MYl7qhJzkgtnVelMMIbc0ZkHxC1s3abUXJ2zVi4w=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-lomiri-docviewer-app-Install-splash-file.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/ef20bbdd5e80040bf11273a5fc2964400086fdc9.patch";
|
||||
hash = "sha256-ylPFn53PJRyyzhN1SxtmNFMFeDsV9UxyQhAqULA5PJM=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/72 merged & in release
|
||||
(fetchpatch {
|
||||
name = "1001-lomiri-docviewer-app-Stop-using-qt5_use_modules.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/120c81dd71356f2e06ef5c44d114b665236a7382.patch";
|
||||
hash = "sha256-4VCw90qYnQ/o67ndp9o8h+wUl2IUpmVGb9xyY55AMIQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "1002-lomiri-docviewer-app-Move-Qt-find_package-to-top-level.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/43ee96a3a33b7a8f04e95f434982bcc60ba4b257.patch";
|
||||
hash = "sha256-3LggdNo4Yak4SVAD/4/mMCl8PjZy1dIx9i5hKHM5fJU=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/73 merged & in release
|
||||
(fetchpatch {
|
||||
name = "1011-lomiri-docviewer-app-Call-i18n-bindtextdomain.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/67599a841917304f76ffa1167a217718542a8b46.patch";
|
||||
hash = "sha256-nbi3qX14kWtFcXrxAD41IeybDIRTNfUdRgSP1vDI/Hs=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/74 merged & in release
|
||||
(fetchpatch {
|
||||
name = "1021-lomiri-docviewer-app-Use-GNUInstallDirs-more-better.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/40a860a118077c05692002db694be77ea62dc5b3.patch";
|
||||
hash = "sha256-/zhpIdqZ7WsU4tx4/AZs5w8kEopjH2boiHdHaJk5RXk=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/75 merged & in release
|
||||
(fetchpatch {
|
||||
name = "1031-lomiri-docviewer-app-Use-BUILD_TESTING.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/6f1eb739a3e0bf0ba847f94f8ea8411e0a385c2d.patch";
|
||||
hash = "sha256-yVuYG+1JGo/I4TVRZ3UQeO/TJ8GiFO5BJ9Bs7glK7hg=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/76 merged & in release
|
||||
# fetchpatch2 because there's a file rename
|
||||
(fetchpatch2 {
|
||||
@@ -84,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0=";
|
||||
})
|
||||
|
||||
# Remove when version > 3.0.4
|
||||
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/81 merged & in release
|
||||
(fetchpatch {
|
||||
name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/d6731f6d00050b42d561d63ae91751761f7fd278.patch";
|
||||
hash = "sha256-EFuQ+pMI8fwYM0lgapi/XeAagFbXUzLWzAx0bPkEdzA=";
|
||||
name = "1051-lomiri-docviewer-app-XDGify-icon.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/a319e648ba15a7868d9ceb3a77ea15ad196e515b.patch";
|
||||
hash = "sha256-JMSnN8EyWPHhqHzaJxy3JIhNaOvPLYkVDnNCrPGbO4E=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -98,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# We don't want absolute paths in desktop files
|
||||
substituteInPlace data/CMakeLists.txt \
|
||||
--replace-fail 'ICON "''${DATA_DIR}/''${ICON_FILE}"' 'ICON lomiri-docviewer-app' \
|
||||
--replace-fail 'SPLASH "''${DATA_DIR}/''${SPLASH_FILE}"' 'SPLASH "lomiri-app-launch/splash/lomiri-docviewer-app.svg"'
|
||||
'';
|
||||
|
||||
@@ -133,9 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash}
|
||||
mkdir -p $out/share/lomiri-app-launch/splash
|
||||
|
||||
ln -s $out/share/{lomiri-docviewer-app/docviewer-app.svg,icons/hicolor/scalable/apps/lomiri-docviewer-app.svg}
|
||||
ln -s $out/share/{lomiri-docviewer-app/docviewer-app-splash.svg,lomiri-app-launch/splash/lomiri-docviewer-app.svg}
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user