From 286d53a233490a11ac1d03ca9c238f945c11afa9 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Wed, 6 Apr 2016 10:19:03 +0100
Subject: [PATCH] linux: Fix build

---
 SparkleShare/Linux/EventLog.cs                |  2 +-
 SparkleShare/Linux/SparkleShare.Linux.csproj  | 14 ++++++---
 SparkleShare/Mac/SparkleShare.Mac.csproj      |  7 -----
 .../Windows/SparkleShare.Windows.csproj       | 29 +++----------------
 Sparkles/Git/Sparkles.Git.csproj              |  1 +
 Sparkles/Sparkles.csproj                      |  1 +
 6 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/SparkleShare/Linux/EventLog.cs b/SparkleShare/Linux/EventLog.cs
index 5fe9a298..88d92274 100755
--- a/SparkleShare/Linux/EventLog.cs
+++ b/SparkleShare/Linux/EventLog.cs
@@ -65,7 +65,7 @@ namespace SparkleShare {
             layout_sizes.PackStart (this.history_label, false, false, 0);
 
             VBox layout_vertical = new VBox (false, 0);
-         //   this.spinner         = new Spinner ();
+            this.spinner         = new Spinner ();
             this.spinner_wrapper = new VBox ();
             this.content_wrapper = new EventBox ();
             this.scrolled_window = new ScrolledWindow ();
diff --git a/SparkleShare/Linux/SparkleShare.Linux.csproj b/SparkleShare/Linux/SparkleShare.Linux.csproj
index 08ccdbb0..fd6f239c 100644
--- a/SparkleShare/Linux/SparkleShare.Linux.csproj
+++ b/SparkleShare/Linux/SparkleShare.Linux.csproj
@@ -10,6 +10,8 @@
     <RootNamespace>SparkleShare.Linux</RootNamespace>
     <AssemblyName>SparkleShare.Linux</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>
+    </ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,10 +35,14 @@
     <Reference Include="System.Net" />
     <Reference Include="Mono.Posix" />
     <Reference Include="System.Xml" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="soup-sharp, Version=2.42.2.0, Culture=neutral, PublicKeyToken=91c4c95333b14883" />
+    <Reference Include="notify-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Sparkles\Git\Sparkles.Git.csproj">
diff --git a/SparkleShare/Mac/SparkleShare.Mac.csproj b/SparkleShare/Mac/SparkleShare.Mac.csproj
index 5f376ac3..863e5303 100644
--- a/SparkleShare/Mac/SparkleShare.Mac.csproj
+++ b/SparkleShare/Mac/SparkleShare.Mac.csproj
@@ -151,13 +151,6 @@
       <Link>HTML\jquery.js</Link>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="HTML\" />
-    <Folder Include="Presets\" />
-    <Folder Include="Controllers\" />
-    <Folder Include="UserInterface\" />
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="..\Common\Pixmaps\side-splash.png">
       <Link>Resources\side-splash.png</Link>
diff --git a/SparkleShare/Windows/SparkleShare.Windows.csproj b/SparkleShare/Windows/SparkleShare.Windows.csproj
index e9a32bc6..24620acc 100644
--- a/SparkleShare/Windows/SparkleShare.Windows.csproj
+++ b/SparkleShare/Windows/SparkleShare.Windows.csproj
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <ProjectGuid>{728483AA-E34B-4441-BF2C-C8BC2901E4E0}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AssemblyName>SparkleShare</AssemblyName>
@@ -50,6 +50,8 @@
     <ErrorReport>prompt</ErrorReport>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -116,19 +118,6 @@
     <Compile Include="SparkleSpinner.cs" />
   </ItemGroup>
   <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am">
-          <BuildFilesVar Sync="True" Name="SOURCES" />
-          <DeployFilesVar />
-          <ResourcesVar />
-          <OthersVar />
-          <GacRefVar />
-          <AsmRefVar />
-          <ProjectRefVar />
-        </MonoDevelop.Autotools.MakefileInfo>
-      </Properties>
-    </MonoDevelop>
     <VisualStudio />
   </ProjectExtensions>
   <ItemGroup>
@@ -278,14 +267,4 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="SparkleLib\Git\SparkleLib.Git.csproj">
-      <Project>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</Project>
-      <Name>Sparkles.Git</Name>
-    </ProjectReference>
-    <ProjectReference Include="SparkleLib\SparkleLib.csproj">
-      <Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
-      <Name>Sparkles</Name>
-    </ProjectReference>
-  </ItemGroup>
 </Project>
diff --git a/Sparkles/Git/Sparkles.Git.csproj b/Sparkles/Git/Sparkles.Git.csproj
index c4ca1fd3..59f0f37f 100644
--- a/Sparkles/Git/Sparkles.Git.csproj
+++ b/Sparkles/Git/Sparkles.Git.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <ReleaseVersion>
     </ReleaseVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>True</Optimize>
diff --git a/Sparkles/Sparkles.csproj b/Sparkles/Sparkles.csproj
index d34547e8..baa710e3 100644
--- a/Sparkles/Sparkles.csproj
+++ b/Sparkles/Sparkles.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>Sparkles</AssemblyName>
     <ReleaseVersion>
     </ReleaseVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>