[f-spot] Add a patch that will update the Hyena library
- From: Stephen Shaw <sshaw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Add a patch that will update the Hyena library
- Date: Sat, 8 Sep 2012 07:42:50 +0000 (UTC)
commit abe1c8db6f3dfb348d135fe1c0759675803f5773
Author: Stephen Shaw <sshaw decriptor com>
Date: Fri Sep 7 02:22:13 2012 -0700
Add a patch that will update the Hyena library
The hyena library uses VS2008 version. The patch
changes the ToolsVersion to VS2010 so that it
works with f-spot now.
The README now has more up to date instructions
including the patch. Hopefully we can get rid of
the patch soon.
README | 12 ++++++++----
hyena.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 4 deletions(-)
---
diff --git a/README b/README
index fa3c044..7e29fa8 100644
--- a/README
+++ b/README
@@ -32,11 +32,15 @@ With MonoDevelop:
If you want to use MonoDevelop to build and run F-Spot here are notes about that process.
There are a few steps you have to run before you can open MonoDevelop:
- 1. sh autogen.sh
+ 1. sh autogen.sh (on ubuntu you have to do ./autogen.sh)
2. cd build; make
- 3. cd ../lib; make
- 4. cd libfspot
- 5. sudo make install (this will install the libfspot.so files)
+ 3. cd ..; cp hyena.patch lib/Hyena
+ 4. cd lib/Hyena; patch -p1 < hyena.patch
+ 5. cd ../lib/libfspot; make
+ 6. cd libfspot
+ 7. sudo make install (this will install the libfspot.so files)
+
+ The hyena patch is just a temporary fix for now.
This will build a couple tools in ./build that are needed to build the projects
in ./lib. Unfortunately, the f-spot.exe.config file points to whatever prefix
diff --git a/hyena.patch b/hyena.patch
new file mode 100644
index 0000000..3f00269
--- /dev/null
+++ b/hyena.patch
@@ -0,0 +1,46 @@
+diff --git a/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj b/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
+index cabce10..21ed285 100644
+--- a/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
++++ b/Hyena.Data.Sqlite/Hyena.Data.Sqlite.csproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+diff --git a/Hyena.Gui/Hyena.Gui.csproj b/Hyena.Gui/Hyena.Gui.csproj
+index 0cf3088..539cfcc 100644
+--- a/Hyena.Gui/Hyena.Gui.csproj
++++ b/Hyena.Gui/Hyena.Gui.csproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+diff --git a/Hyena.sln b/Hyena.sln
+index 647d80f..971eb22 100644
+--- a/Hyena.sln
++++ b/Hyena.sln
+@@ -1,6 +1,6 @@
+
+-Microsoft Visual Studio Solution File, Format Version 10.00
+-# Visual Studio 2008
++Microsoft Visual Studio Solution File, Format Version 11.00
++# Visual Studio 2010
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "Hyena\Hyena.csproj", "{95374549-9553-4C1E-9D89-667755F90E12}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
+diff --git a/Hyena/Hyena.csproj b/Hyena/Hyena.csproj
+index cc18abc..b7014c2 100644
+--- a/Hyena/Hyena.csproj
++++ b/Hyena/Hyena.csproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]