dde-file-manager: 6.0.23 -> 6.0.31

rewine f21a5f64 9824e03f

+28 -3
+15 -3
pkgs/desktops/deepin/core/dde-file-manager/default.nix
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 , runtimeShell 5 , dtkwidget 6 , qt5integration ··· 38 , pcre 39 , udisks2 40 , libisoburn 41 }: 42 43 stdenv.mkDerivation rec { 44 pname = "dde-file-manager"; 45 - version = "6.0.23"; 46 47 src = fetchFromGitHub { 48 owner = "linuxdeepin"; 49 repo = pname; 50 rev = version; 51 - hash = "sha256-H+pCWZ1jj5p3gOKXYyLxSmjCMv5/BPIz5A25JGGzrR8="; 52 }; 53 54 nativeBuildInputs = [ ··· 60 ]; 61 dontWrapGApps = true; 62 63 postPatch = '' 64 patchShebangs . 65 ··· 115 pcre 116 udisks2 117 libisoburn 118 ]; 119 120 cmakeFlags = [ 121 "-DVERSION=${version}" 122 - "-DDEEPIN_OS_VERSION=20" 123 ]; 124 125 enableParallelBuilding = true;
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 + , fetchpatch 5 , runtimeShell 6 , dtkwidget 7 , qt5integration ··· 39 , pcre 40 , udisks2 41 , libisoburn 42 + , gsettings-qt 43 }: 44 45 stdenv.mkDerivation rec { 46 pname = "dde-file-manager"; 47 + version = "6.0.31"; 48 49 src = fetchFromGitHub { 50 owner = "linuxdeepin"; 51 repo = pname; 52 rev = version; 53 + hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM="; 54 }; 55 56 nativeBuildInputs = [ ··· 62 ]; 63 dontWrapGApps = true; 64 65 + patches = [ 66 + ./use_v23_dbus_interface.diff 67 + 68 + (fetchpatch { 69 + name = "use-pkgconfig-to-check-mount.patch"; 70 + url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch"; 71 + hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU="; 72 + }) 73 + ]; 74 + 75 postPatch = '' 76 patchShebangs . 77 ··· 127 pcre 128 udisks2 129 libisoburn 130 + gsettings-qt 131 ]; 132 133 cmakeFlags = [ 134 "-DVERSION=${version}" 135 ]; 136 137 enableParallelBuilding = true;
+13
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff
···
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index e93d3ad..94e3eca 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 6 + endif() 7 + 8 + #Indentify the version 9 + -if (${DEEPIN_OS_VERSION} MATCHES "23") 10 + +if (TRUE) 11 + add_definitions(-DCOMPILE_ON_V23) 12 + set(COMPLIE_ON_V23 TRUE) 13 + message("COMPILE ON v23")