summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2011-03-10 19:46:15 -0800
committerGeorge Sherwood2011-03-12 09:51:58 -0600
commit19222215c6c224324eb1af3b7aa8ff388a4352c6 (patch)
treea84b54c7e756191aeaa007f9255c90b879a8ae0b
parent14f7ab7af6c6b575258f16eb89df4abdcfd85e09 (diff)
evolution-sharp: Fixes Bug #14945 (thanks Ladislav)
Depends on autoconf (to rebuild configure from configure.in) Apply evolution-sharp-0.21.1-fix-retarded-version-check.patch Fixes compilation against newer evolution-data-server (cherry picked from commit 0e70745602a15d52adf61db9b804030b2018922f)
-rwxr-xr-xgnome2-libs/evolution-sharp/DEPENDS1
-rw-r--r--gnome2-libs/evolution-sharp/HISTORY4
-rwxr-xr-xgnome2-libs/evolution-sharp/PRE_BUILD5
-rw-r--r--gnome2-libs/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch17
4 files changed, 27 insertions, 0 deletions
diff --git a/gnome2-libs/evolution-sharp/DEPENDS b/gnome2-libs/evolution-sharp/DEPENDS
index 7409f48999..c099561879 100755
--- a/gnome2-libs/evolution-sharp/DEPENDS
+++ b/gnome2-libs/evolution-sharp/DEPENDS
@@ -1,3 +1,4 @@
+depends autoconf &&
depends evolution-data-server &&
depends evolution &&
depends gtk-sharp-2
diff --git a/gnome2-libs/evolution-sharp/HISTORY b/gnome2-libs/evolution-sharp/HISTORY
index 1cce1314eb..40546073b8 100644
--- a/gnome2-libs/evolution-sharp/HISTORY
+++ b/gnome2-libs/evolution-sharp/HISTORY
@@ -1,6 +1,10 @@
2011-03-10 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 0.21.1
SOURCE matches upstream posted sha256
+ * DEPENDS: Depends on autoconf (to rebuild configure from configure.in)
+ * PRE_BUILD: Apply evolution-sharp-0.21.1-fix-retarded-version-check.patch
+ * evolution-sharp-0.21.1-fix-retarded-version-check.patch: Bug #14945
+ Fixes compilation against newer evolution-data-server
2009-04-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 0.20.0
diff --git a/gnome2-libs/evolution-sharp/PRE_BUILD b/gnome2-libs/evolution-sharp/PRE_BUILD
new file mode 100755
index 0000000000..79e98e12a9
--- /dev/null
+++ b/gnome2-libs/evolution-sharp/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+patch "$SOURCE_DIRECTORY"/configure.in \
+ "$SPELL_DIRECTORY"/evolution-sharp-0.21.1-fix-retarded-version-check.patch &&
+cd "$SOURCE_DIRECTORY" &&
+autoconf
diff --git a/gnome2-libs/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch b/gnome2-libs/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch
new file mode 100644
index 0000000000..900d3e6e86
--- /dev/null
+++ b/gnome2-libs/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch
@@ -0,0 +1,17 @@
+#
+# From http://projects.archlinux.org/svntogit/packages.git/tree/evolution-sharp/trunk/evolution-sharp-0.21.1-fix-retarded-version-check.patch
+# Fixes Bug #14945
+#
+diff -up evolution-sharp-0.21.1/configure.in.fix-retarded-version-check evolution-sharp-0.21.1/configure.in
+--- evolution-sharp-0.21.1/configure.in.fix-retarded-version-check 2009-08-20 21:46:34.000000000 -0400
++++ evolution-sharp-0.21.1/configure.in 2009-08-20 21:47:16.000000000 -0400
+@@ -16,8 +16,7 @@ fi
+ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no]))
+ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no]))
+ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no]))
+-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27.4, edsver="2.24", AC_MSG_RESULT([no]))
+-PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27.4, edsver="unsupported", AC_MSG_RESULT([no]))
++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92, edsver="2.24", AC_MSG_RESULT([no]))
+
+ if test "x$edsver" = "x1.8"; then
+ EDS_VERSION=-1.2