Patches apply now.

This commit is contained in:
Manuel Friedli 2023-06-17 02:39:53 +02:00
parent 0e00d48354
commit f5bd8b40d8
Signed by: manuel
GPG Key ID: 41D08ABA75634DA1
4 changed files with 42 additions and 8 deletions

View File

@ -1,7 +1,8 @@
AUX Makefile.patch 387 BLAKE2B c6e9a4dddda6b17e4caa525320cb2d0bb55dead31177efa7160dd2c85feceb689fc4f348ec7e88446ec47ba93dc5cec74c23240e586a8fc472968ebe04adba5c SHA512 d636fe72eb246923bc63d60da414ec4f2cfff9d5e1f1c64cd46b8db3974f7f24b6d83dcbfabfc8196aebdf01f3c281da003011098b28ebc8852793d221c38706
AUX Makefile.patch 516 BLAKE2B caff7a9c13c7e6839c250264a174ae2e543b56c715309f46385f367e3926d85e9cde596c52bb82c42f29ecbe1bcb42026f4b424207f8bf03bd37c4e140ac9e12 SHA512 3419cb3e6de75238fc43b807defb4c22dd079d78955583325ae3510eb881b54351bade9f76c3e4aad03f6336e27bcfb14b292dec2790eacb78319d568acd8a4c
AUX dotnet-framework.patch 66850 BLAKE2B 222a73c9b4b06376ae745a3285fdc5277d79b8bb8595aba749196d2040b28653ef1a051bb6847abefb1ee25f9d944e1b98251ab889c530a3572f85edc4eb842e SHA512 aecca6745895f8d964ae1cfc355e1e93abdf962c0364a167f71dce3d27c8c9ae0732f0abffb6031f0bcf694094040695ede9a230984a012a0b2a37e6219b04ad
AUX dotnet-framework.patch_backup 79633 BLAKE2B be48b86331063a681515a125914a961f4ce4d7e054d6d428dbb9e09748dec3e8cb5108c709fbdb357b195d61fab4e2fbd6cf03f37969e44c20d506c75493a228 SHA512 815e17c55b9c1a2a0586394508fdf991774f49dfcb5ab94a3f808e95ffe1996f62283b70838a6d3c3e11e8d20d13bacb730b85913f30f72006b924068dc033d2
AUX mono-path-override.props 605 BLAKE2B b638932f16e0051edd85bc10b590e5e531f939fe82c6fafc94d236cab950a291df03551fd5d5b69c6a3ab1b9261f7283fe7afd8e6ec357665ed265832a285f5a SHA512 b10a79f2303645c63929e5b1f80deb79dbba722757035c0c8352f68f67e2fa11a4f9386a29749402f4e4c3a60a9c71378f0e71e1a45a82bc99d54fb8ca02299b
AUX guifix.patch 1804 BLAKE2B 60f1714bc5e9981799e0e14da2951e15409dbc6e9730952e6e84688f1ade082066dc68d6c9f23c735c6384615414e4e303fc19fd7133ddef6726ed42c0b9912a SHA512 cac370dae0874cd65b842dfa378dc32fc63be1d7ac75d1275d6303c30fcc6df713feaa21f776b253f6250a5a88ae971f2b2b382dfb4a1bafd3fb34185f6ee26d
AUX mono-path-override.props 692 BLAKE2B ee395d852583a0d11d3ef4c037ddf5ee09bdd824d7c99484f858c0ec413713ac19d31963b6be18cc2656108ec57e4a622687529cf55f511f214ee301e43d2d5a SHA512 cf390920f5048346f77225e78ed982da6b9a33428afdcb100367a44505fe03d306b11ded7fd4b4b3d3d406cb3755f277b7bdc66972399248841486412c9b203a
AUX netstandard.patch 2640 BLAKE2B 87f6c0f5ffba2139207842935780769eb746b24c25fd3466d668df10b96ed8081d278f87de680e9d3077bcb399b90971b36d0111e8721cb6be70198a2006b630 SHA512 4c7f8a7264c408d67bdb2163ec299e22684a958a1d4959c2710f55e58b665a69ff57852ef20a16088a15ba648a3fdaf6b05ec3676983a420b039d2a615b2cd6c
DIST duplicati-2.0.7.1_beta20230525.tar.gz 44134279 BLAKE2B 6bd8216457588e4441a0449a221535a64e61aec7abd0649eb0452a767ea60e81fad4e10d897c8b286fe1a4df189746294bd72244ffb62455227ea05421e61471 SHA512 047a70348806af98a3e0b8d8e644b2ec752e1bf21ae47a884491d2cbb4b4f00f26a1b9d0dca97295192534c53a0d80aede891cbef685d5f074bcb812bcfd0db8
EBUILD duplicati-2.0.7.1_beta20230525.ebuild 1143 BLAKE2B c21ce4db3fa394993ddf1c844b7e55adda733b5ad5b17572410df7b2d1ae41a2b3fd607628ef32c666860ec9ec6b3cce0ac57c4949495d6a56e99d3ac1e846f4 SHA512 39f9cb939bd6534f9aba716cad328825bb18ca1355ac623dd9f6d8280ec13aa55943ceef5f3981670e262147a841b3265be9fa48a38a6cd1ce5e475cc3d8e5bc
EBUILD duplicati-2.0.7.1_beta20230525.ebuild 1171 BLAKE2B d2f45d8425f21750823e9f08a41da98f494522b32d52f812df1798839e1922e522594d19c57f242e37cde48635cc8f6f922c5d2be4789d57c59689f0fe2af5d4 SHA512 c684b4f5630b7671f40d2101566c27693d1b11d65e7f788402277aa3f52fa343ac0f02fcc8a2fa68d2ee1298cab1d5ebc532539e7ca5ca684d2179166b993d1b

View File

@ -1,10 +1,12 @@
diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile
index 550e7b9..0cb537f 100755
index 550e7b9..48bc8fc 100755
--- a/Installer/Makefile/Makefile
+++ b/Installer/Makefile/Makefile
@@ -1,4 +1,4 @@
@@ -1,5 +1,5 @@
-BUILD_TOOL=msbuild
-BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release
+BUILD_TOOL=dotnet msbuild
BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release
+BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release /property:DefineConstants=ENABLE_GTK
BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug
NUGET_TOOL=nuget

View File

@ -0,0 +1,31 @@
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
index 57c296c..b89e1a4 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
@@ -95,20 +95,12 @@
<HintPath>..\..\..\thirdparty\appindicator-sharp\appindicator-sharp.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <HintPath>..\..\..\thirdparty\appindicator-sharp\gdk-sharp.dll</HintPath>
- <Package>gtk-sharp-2.0</Package>
- </Reference>
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <HintPath>..\..\..\thirdparty\appindicator-sharp\gtk-sharp.dll</HintPath>
- <Package>gtk-sharp-2.0</Package>
- </Reference>
- <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <Package>glib-sharp-2.0</Package>
- </Reference>
- <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <Package>gtk-sharp-2.0</Package>
- </Reference>
+ <Reference Include="atk-sharp" />
+ <Reference Include="cairo-sharp" />
+ <Reference Include="gdk-sharp" />
+ <Reference Include="gio-sharp" />
+ <Reference Include="glib-sharp" />
+ <Reference Include="gtk-sharp" />
<Reference Include="Xamarin.Mac" Condition="Exists('\Library\Frameworks\Xamarin.Mac.framework')">
<HintPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\64bits\full\Xamarin.Mac.dll</HintPath>
</Reference>

View File

@ -2,9 +2,9 @@
<PropertyGroup>
<FrameworkPathOverride>/usr/lib/mono/4.7.1-api</FrameworkPathOverride>
<EnableFrameworkPathOverride>true</EnableFrameworkPathOverride>
<GtkSharpPaths>/usr/lib/mono/atk-sharp;/usr/lib/mono/cairo-sharp;/usr/lib/mono/gdk-sharp;/usr/lib/mono/gio-sharp;/usr/lib/mono/glib-sharp;/usr/lib/mono/gtk-sharp</GtkSharpPaths>
<!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
<!-- <AssemblySearchPaths>$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths> -->
<ReferencePath>$(FrameworkPathOverride)/Facades;$(ReferencePath)</ReferencePath>
<ReferencePath>$(FrameworkPathOverride)/Facades;$(GtkSharpPaths);$(ReferencePath)</ReferencePath>
</PropertyGroup>
</Project>