diff options
author | Kenneth Skovhede <kenneth@hexad.dk> | 2014-03-26 17:34:50 +0400 |
---|---|---|
committer | Kenneth Skovhede <kenneth@hexad.dk> | 2014-03-26 17:34:50 +0400 |
commit | 362b498437a06f9b28ee03819f7bf7b8344adcba (patch) | |
tree | 3f1a9fdbf85622dc640c11a82b38a634b5411fa7 /Installer | |
parent | d70d554c1395f81d55b8187bd13199d5bf98b8d9 (diff) |
More work on fedora patch
Diffstat (limited to 'Installer')
-rw-r--r-- | Installer/fedora/duplicati-0003-remove-monomac.patch | 255 | ||||
-rw-r--r-- | Installer/fedora/duplicati.spec | 12 |
2 files changed, 127 insertions, 140 deletions
diff --git a/Installer/fedora/duplicati-0003-remove-monomac.patch b/Installer/fedora/duplicati-0003-remove-monomac.patch index 10ba3a590..54d3594c4 100644 --- a/Installer/fedora/duplicati-0003-remove-monomac.patch +++ b/Installer/fedora/duplicati-0003-remove-monomac.patch @@ -3,150 +3,150 @@ index 83f4a23..86738f8 100644 --- a/Duplicati.sln +++ b/Duplicati.sln @@ -49,8 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.GUI.TrayIcon", "D - EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Server.Serialization", "Duplicati\Server\Duplicati.Server.Serialization\Duplicati.Server.Serialization.csproj", "{33FD1D24-C28F-4C71-933F-98F1586EA76C}"
- EndProject
--Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.GUI.MacTrayIcon", "Duplicati\GUI\Duplicati.GUI.MacTrayIcon\Duplicati.GUI.MacTrayIcon.csproj", "{9E9675C7-1198-44CD-85E0-FD582E9EEAFF}"
--EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.CommandLine.BackendTool", "Duplicati\CommandLine\BackendTool\Duplicati.CommandLine.BackendTool.csproj", "{2AF960C0-357D-4D44-A3D5-8B6E89DB0F11}"
- EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.GoogleDocs", "Duplicati\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj", "{42C91180-11EB-4590-82EA-80FE9D4DEBEC}"
+ EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Server.Serialization", "Duplicati\Server\Duplicati.Server.Serialization\Duplicati.Server.Serialization.csproj", "{33FD1D24-C28F-4C71-933F-98F1586EA76C}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.GUI.MacTrayIcon", "Duplicati\GUI\Duplicati.GUI.MacTrayIcon\Duplicati.GUI.MacTrayIcon.csproj", "{9E9675C7-1198-44CD-85E0-FD582E9EEAFF}" +-EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.CommandLine.BackendTool", "Duplicati\CommandLine\BackendTool\Duplicati.CommandLine.BackendTool.csproj", "{2AF960C0-357D-4D44-A3D5-8B6E89DB0F11}" + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.GoogleDocs", "Duplicati\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj", "{42C91180-11EB-4590-82EA-80FE9D4DEBEC}" @@ -140,12 +138,6 @@ Global - {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Release|Any CPU.Build.0 = Release|Any CPU
- {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Test|Any CPU.ActiveCfg = Debug|Any CPU
- {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Test|Any CPU.Build.0 = Debug|Any CPU
-- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Release|Any CPU.Build.0 = Release|Any CPU
-- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Test|Any CPU.ActiveCfg = Debug|Any CPU
-- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Test|Any CPU.Build.0 = Debug|Any CPU
- {BAE27510-8B5D-44B2-B33E-372A98908041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BAE27510-8B5D-44B2-B33E-372A98908041}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BAE27510-8B5D-44B2-B33E-372A98908041}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Release|Any CPU.Build.0 = Release|Any CPU + {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Test|Any CPU.Build.0 = Debug|Any CPU +- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Release|Any CPU.Build.0 = Release|Any CPU +- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Test|Any CPU.ActiveCfg = Debug|Any CPU +- {9E9675C7-1198-44CD-85E0-FD582E9EEAFF}.Test|Any CPU.Build.0 = Debug|Any CPU + {BAE27510-8B5D-44B2-B33E-372A98908041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BAE27510-8B5D-44B2-B33E-372A98908041}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BAE27510-8B5D-44B2-B33E-372A98908041}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index e79581e..7a20176 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -130,7 +130,6 @@ - <Compile Include="WindowsImplementation\CallbackShim.cs" />
- <Compile Include="WindowsImplementation\WinFormsRunner.cs" />
- <Compile Include="AppIndicatorRunner.cs" />
-- <Compile Include="CocoaRunner.cs" />
- <None Include="SVGIcons\dark\duplicati-logo.svg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
+ <Compile Include="WindowsImplementation\CallbackShim.cs" /> + <Compile Include="WindowsImplementation\WinFormsRunner.cs" /> + <Compile Include="AppIndicatorRunner.cs" /> +- <Compile Include="CocoaRunner.cs" /> + <None Include="SVGIcons\dark\duplicati-logo.svg"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs index 67a23b3..0d8f3dc 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs @@ -14,7 +14,6 @@ namespace Duplicati.GUI.TrayIcon - private const string TOOLKIT_WINDOWS_FORMS = "winforms";
- private const string TOOLKIT_GTK = "gtk";
- private const string TOOLKIT_GTK_APP_INDICATOR = "gtk-appindicator";
-- private const string TOOLKIT_COCOA = "cocoa";
-
- private const string HOSTURL_OPTION = "hosturl";
- private const string NOHOSTEDSERVER_OPTION = "no-hosted-server";
+ private const string TOOLKIT_WINDOWS_FORMS = "winforms"; + private const string TOOLKIT_GTK = "gtk"; + private const string TOOLKIT_GTK_APP_INDICATOR = "gtk-appindicator"; +- private const string TOOLKIT_COCOA = "cocoa"; + + private const string HOSTURL_OPTION = "hosturl"; + private const string NOHOSTEDSERVER_OPTION = "no-hosted-server"; @@ -24,21 +23,6 @@ namespace Duplicati.GUI.TrayIcon -
- private static string GetDefaultToolKit()
- {
--#if __MonoCS__
-- if (Duplicati.Library.Utility.Utility.IsClientOSX && SupportsCocoaStatusIcon)
-- {
-- //Determine if we are running in an app bundle, otherwise we cannot run Cocoa
-- //The Duplicat.GUI.TrayIcon project, does not create the app bundle,
-- // so this ensures that we can run the normal project when debugging on mac,
-- // and it will just fall-back to Gtk. If we need to debug something Cocoa specific,
-- // we can load the Duplicati.GUI.MacTrayIcon project and use that as start project
-- string basefolder = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-- string plist = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(basefolder), "Info.plist");
-- if (System.IO.File.Exists(plist))
-- return TOOLKIT_COCOA;
-- }
--#endif
--
- #if __MonoCS__ || __WindowsGTK__
- if (Duplicati.Library.Utility.Utility.IsClientLinux)
- {
+ + private static string GetDefaultToolKit() + { +-#if __MonoCS__ +- if (Duplicati.Library.Utility.Utility.IsClientOSX && SupportsCocoaStatusIcon) +- { +- //Determine if we are running in an app bundle, otherwise we cannot run Cocoa +- //The Duplicat.GUI.TrayIcon project, does not create the app bundle, +- // so this ensures that we can run the normal project when debugging on mac, +- // and it will just fall-back to Gtk. If we need to debug something Cocoa specific, +- // we can load the Duplicati.GUI.MacTrayIcon project and use that as start project +- string basefolder = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); +- string plist = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(basefolder), "Info.plist"); +- if (System.IO.File.Exists(plist)) +- return TOOLKIT_COCOA; +- } +-#endif +- + #if __MonoCS__ || __WindowsGTK__ + if (Duplicati.Library.Utility.Utility.IsClientLinux) + { @@ -76,8 +60,6 @@ namespace Duplicati.GUI.TrayIcon - toolkit = TOOLKIT_GTK;
- else if (TOOLKIT_GTK_APP_INDICATOR.Equals(toolkit, StringComparison.InvariantCultureIgnoreCase))
- toolkit = TOOLKIT_GTK_APP_INDICATOR;
-- else if (TOOLKIT_COCOA.Equals(toolkit, StringComparison.InvariantCultureIgnoreCase))
-- toolkit = TOOLKIT_COCOA;
- #endif
- else
- toolkit = DEFAULT_TOOLKIT;
+ toolkit = TOOLKIT_GTK; + else if (TOOLKIT_GTK_APP_INDICATOR.Equals(toolkit, StringComparison.InvariantCultureIgnoreCase)) + toolkit = TOOLKIT_GTK_APP_INDICATOR; +- else if (TOOLKIT_COCOA.Equals(toolkit, StringComparison.InvariantCultureIgnoreCase)) +- toolkit = TOOLKIT_COCOA; + #endif + else + toolkit = DEFAULT_TOOLKIT; @@ -133,8 +115,6 @@ namespace Duplicati.GUI.TrayIcon - return GetGtkInstance();
- else if (toolkit == TOOLKIT_GTK_APP_INDICATOR)
- return GetAppIndicatorInstance();
-- else if (toolkit == TOOLKIT_COCOA)
-- return GetCocoaRunnerInstance();
- #endif
- else
- throw new Exception(string.Format("The selected toolkit '{0}' is invalid", toolkit));
+ return GetGtkInstance(); + else if (toolkit == TOOLKIT_GTK_APP_INDICATOR) + return GetAppIndicatorInstance(); +- else if (toolkit == TOOLKIT_COCOA) +- return GetCocoaRunnerInstance(); + #endif + else + throw new Exception(string.Format("The selected toolkit '{0}' is invalid", toolkit)); @@ -146,7 +126,6 @@ namespace Duplicati.GUI.TrayIcon - #if __MonoCS__ || __WindowsGTK__
- private static TrayIconBase GetGtkInstance() { return new GtkRunner(); }
- private static TrayIconBase GetAppIndicatorInstance() { return new AppIndicatorRunner(); }
-- private static TrayIconBase GetCocoaRunnerInstance() { return new CocoaRunner(); }
- #endif
-
- //The functions below simply load the requested type,
+ #if __MonoCS__ || __WindowsGTK__ + private static TrayIconBase GetGtkInstance() { return new GtkRunner(); } + private static TrayIconBase GetAppIndicatorInstance() { return new AppIndicatorRunner(); } +- private static TrayIconBase GetCocoaRunnerInstance() { return new CocoaRunner(); } + #endif + + //The functions below simply load the requested type, @@ -180,11 +159,7 @@ namespace Duplicati.GUI.TrayIcon -
- private static bool TryGetMonoMac()
- {
--#if __MonoCS__
-- return typeof(MonoMac.AppKit.NSStatusItem) != null;
--#else
- return false;
--#endif
- }
-
- //The functions below here, simply wrap the call to the above functions,
+ + private static bool TryGetMonoMac() + { +-#if __MonoCS__ +- return typeof(MonoMac.AppKit.NSStatusItem) != null; +-#else + return false; +-#endif + } + + //The functions below here, simply wrap the call to the above functions, @@ -245,9 +220,6 @@ namespace Duplicati.GUI.TrayIcon - #if __MonoCS__ || __WindowsGTK__
- TOOLKIT_GTK, TOOLKIT_GTK_APP_INDICATOR,
- #endif
--#if __MonoCS__
-- TOOLKIT_COCOA
--#endif
- }),
- new Duplicati.Library.Interface.CommandLineArgument(HOSTURL_OPTION, CommandLineArgument.ArgumentType.String, "Selects the url to connect to", "Supply the url that the TrayIcon will connect to and show status for", DEFAULT_HOSTURL),
- new Duplicati.Library.Interface.CommandLineArgument(NOHOSTEDSERVER_OPTION, CommandLineArgument.ArgumentType.String, "Disables local server", "Set this option to not spawn a local service, use if the TrayIcon should connect to a running service"),
+ #if __MonoCS__ || __WindowsGTK__ + TOOLKIT_GTK, TOOLKIT_GTK_APP_INDICATOR, + #endif +-#if __MonoCS__ +- TOOLKIT_COCOA +-#endif + }), + new Duplicati.Library.Interface.CommandLineArgument(HOSTURL_OPTION, CommandLineArgument.ArgumentType.String, "Selects the url to connect to", "Supply the url that the TrayIcon will connect to and show status for", DEFAULT_HOSTURL), + new Duplicati.Library.Interface.CommandLineArgument(NOHOSTEDSERVER_OPTION, CommandLineArgument.ArgumentType.String, "Disables local server", "Set this option to not spawn a local service, use if the TrayIcon should connect to a running service"), diff --git a/Duplicati/License/Duplicati.License.csproj b/Duplicati/License/Duplicati.License.csproj index fa61756..bee32ea 100644 --- a/Duplicati/License/Duplicati.License.csproj +++ b/Duplicati/License/Duplicati.License.csproj @@ -185,18 +185,6 @@ - <Link>licenses\ManagedLZMA\license.txt</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
-- <Content Include="..\..\thirdparty\MonoMac\licensedata.json">
-- <Link>licenses\MonoMac\licensedata.json</Link>
-- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-- </Content>
-- <Content Include="..\..\thirdparty\MonoMac\download.txt">
-- <Link>licenses\MonoMac\download.txt</Link>
-- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-- </Content>
-- <Content Include="..\..\thirdparty\MonoMac\license.txt">
-- <Link>licenses\MonoMac\license.txt</Link>
-- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-- </Content>
- <Content Include="..\..\thirdparty\SQLite\licensedata.json">
- <Link>licenses\SQLite\licensedata.json</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <Link>licenses\ManagedLZMA\license.txt</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> +- <Content Include="..\..\thirdparty\MonoMac\licensedata.json"> +- <Link>licenses\MonoMac\licensedata.json</Link> +- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> +- </Content> +- <Content Include="..\..\thirdparty\MonoMac\download.txt"> +- <Link>licenses\MonoMac\download.txt</Link> +- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> +- </Content> +- <Content Include="..\..\thirdparty\MonoMac\license.txt"> +- <Link>licenses\MonoMac\license.txt</Link> +- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> +- </Content> + <Content Include="..\..\thirdparty\SQLite\licensedata.json"> + <Link>licenses\SQLite\licensedata.json</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> @@ -230,6 +218,5 @@ - <Folder Include="licenses\gdata\" />
- <Folder Include="licenses\HttpServer\" />
- <Folder Include="licenses\ManagedLZMA\" />
-- <Folder Include="licenses\MonoMac\" />
- </ItemGroup>
+ <Folder Include="licenses\gdata\" /> + <Folder Include="licenses\HttpServer\" /> + <Folder Include="licenses\ManagedLZMA\" /> +- <Folder Include="licenses\MonoMac\" /> + </ItemGroup> </Project> \ No newline at end of file diff --git a/thirdparty/MonoMac/MonoMac.dll b/thirdparty/MonoMac/MonoMac.dll @@ -399,16 +399,3 @@ index 358750c..0000000 - "notes": "Also released under MIT X11" -} \ No newline at end of file -diff --git a/Duplicati/Server/webroot/index.html b/Duplicati/Server/webroot/index.html -index 0c914c1..c3a75c4 100644 ---- a/Duplicati/Server/webroot/index.html -+++ b/Duplicati/Server/webroot/index.html -@@ -38,7 +38,7 @@ - <script type="text/javascript" src="scripts/hideShowPassword.min.js"></script> - <script type="text/javascript" src="scripts/jquery.timeago.js"></script> - <script type="text/javascript" src="scripts/jquery.noty.packaged.min.js"></script> -- <!-- <script type="text/javascript" src="scripts/plugins.nbi.js"></script> --> -+ <script type="text/javascript" src="scripts/plugins.nbi.js"></script> - - - <script id="backup-item-template" type="text/x-jquery-tmpl"> diff --git a/Installer/fedora/duplicati.spec b/Installer/fedora/duplicati.spec index 29dcfa1f8..36e9df328 100644 --- a/Installer/fedora/duplicati.spec +++ b/Installer/fedora/duplicati.spec @@ -9,7 +9,7 @@ %global debug_package %{nil} -%global gitdate 20130529 +%global gitdate 20140326 #%global gitcommit 18dba966f35f222a6b4bd054b2431a7abe4651de #%global gitver HEAD %global alphatag git @@ -57,11 +57,11 @@ backups for specific purposes. %prep %setup -q -n %{namer}-%{gitdate} -dos2unix Duplicati/CommandLine/Duplicati.CommandLine.csproj -dos2unix Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj -dos2unix Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj -dos2unix Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs -dos2unix Duplicati.sln +#dos2unix Duplicati/CommandLine/Duplicati.CommandLine.csproj +#dos2unix Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +#dos2unix Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +#dos2unix Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +#dos2unix Duplicati.sln #%patch0 -p1 %patch2 -p1 %patch3 -p1 |