summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-12-04 15:35:15 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-12-04 15:35:15 +0000
commit216d20087dcd05b4c254e02f54aac1fd44a384b7 (patch)
tree20822f73f999d4e64c68f0c1bc9cc6ed69a4106e /app-office/planner
parentFix bug #249806. Remove old with huge patch. (diff)
downloadhistorical-216d20087dcd05b4c254e02f54aac1fd44a384b7.tar.gz
historical-216d20087dcd05b4c254e02f54aac1fd44a384b7.tar.bz2
historical-216d20087dcd05b4c254e02f54aac1fd44a384b7.zip
Allow planner to select specific libgda and fix build with newer glib/gcc, bug #231823
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
Diffstat (limited to 'app-office/planner')
-rw-r--r--app-office/planner/ChangeLog12
-rw-r--r--app-office/planner/Manifest12
-rw-r--r--app-office/planner/files/planner-0.14.3-build-failure.patch19
-rw-r--r--app-office/planner/files/planner-0.14.3-configure.patch76
-rw-r--r--app-office/planner/planner-0.14.3-r1.ebuild81
-rw-r--r--app-office/planner/planner-0.14.3-r2.ebuild81
6 files changed, 276 insertions, 5 deletions
diff --git a/app-office/planner/ChangeLog b/app-office/planner/ChangeLog
index 60426f4bcf0b..361104a7c95e 100644
--- a/app-office/planner/ChangeLog
+++ b/app-office/planner/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for app-office/planner
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/planner/ChangeLog,v 1.44 2008/05/25 12:38:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/ChangeLog,v 1.45 2008/12/04 15:35:15 eva Exp $
+
+*planner-0.14.3-r2 (04 Dec 2008)
+*planner-0.14.3-r1 (04 Dec 2008)
+
+ 04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+ +files/planner-0.14.3-build-failure.patch,
+ +files/planner-0.14.3-configure.patch, +planner-0.14.3-r1.ebuild,
+ +planner-0.14.3-r2.ebuild:
+ Allow planner to select specific libgda and fix build with newer glib/gcc,
+ bug #231823
25 May 2008; Markus Meier <maekke@gentoo.org> planner-0.14.3.ebuild:
amd64/x86 stable, bug #223297
diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index f56185e64185..a02eba1d8e1d 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,18 +1,22 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX planner-0.14.3-build-failure.patch 569 RMD160 cf826cbb91f0d69579ad990de64614ba79461c70 SHA1 f10f67e5173df906d3a2b35f692c1c6b3cc58a24 SHA256 ef021dc3b7a7a457fb4fc00d458f92789195ee9407bf21872e27a4b80de280a3
+AUX planner-0.14.3-configure.patch 2141 RMD160 6a08c1da2d1f479fc6c38f4dda65ad805f3c76cd SHA1 9e74ba7eb1e9eeb386b8b0e23e71d38dc085ff4a SHA256 37e8c699771808482c37c408215d74b9d4d07bebf3a3eca56b28a7d4462e5275
AUX planner-0.14.3-eds-plugin.patch 414 RMD160 f4c2889fee792dada172d29b892095c0e55b4932 SHA1 cfeb262519a716df225ca956876e1c64da47a58b SHA256 710dd83cdf908c263b9d3256a227006c7cda94b1ad8ceb46404465c521fcd0c6
AUX planner-0.14.3-parallel-build.patch 1489 RMD160 0bbb3877df6f3388a048f0a117602b03f181947d SHA1 ad733e744e1c1525ebc865788cfc4ace4af1d60b SHA256 51feca273ff9caab5d25a1b053c0572f0820715ebd4b0b3fb17c04d08d65a965
DIST planner-0.14.2.tar.bz2 3590698 RMD160 a3befcb640b99e3cdf1a28011075f13f9a0c96ea SHA1 098a129662ffbe9a067cd6fa4f497b9ec1db0e3d SHA256 d2097172369c753d62fed48bddfe874b3486ab5477831eab75bfefcfed44eae4
DIST planner-0.14.3.tar.bz2 3685823 RMD160 8e91c0afac14e7a6ac1f80d209a44bef5d1e1eb8 SHA1 aacdca51a16ef9e7024fbb674d5e8b1c24d088f1 SHA256 8fa5e28b0ba71c0822be73d3c0719623e711b5f9abdcddb63321e31c02a168fe
EBUILD planner-0.14.2.ebuild 1596 RMD160 97786c6163ac64a4f469520db1daee3f20b2d77e SHA1 774469e5aa5dcd611257988b0ed58cc95a1974d4 SHA256 d7cf2f8ca4fb562fcf9b24e3eeca60408b118769a79118c82e21a4cb32bbb00e
+EBUILD planner-0.14.3-r1.ebuild 2007 RMD160 c82d85228a1a2c0a5f098fdd75d31ac14eab6494 SHA1 600d602c20f04bc413f402abd742ca445ad6a258 SHA256 a63e8037b7d171e2502ecd8709a863bd20ab508434ae3e8137bd74f0ce03c372
+EBUILD planner-0.14.3-r2.ebuild 2007 RMD160 f44230da548bb89ca50e9fed1c7f7055416a8b10 SHA1 57e6c5abfc65a6800eab6905344f1e0928bfb323 SHA256 98875701d8b7004bca25ef5e7c2f5ff32715ca7cebb92138c8d942742a9b088b
EBUILD planner-0.14.3.ebuild 1852 RMD160 804f652aecc74804a55668220550cdefa414de55 SHA1 2923ad2f9167d9bca90f6c73ddf45678b45e7ba5 SHA256 b832c160c276ec476fc390e377d5a98e853a28bda98bf32e665cf9f2b950b65e
-MISC ChangeLog 8839 RMD160 544c9f0a9c7cee06f39034456fed789ac525fc35 SHA1 afd6e6fa64d7295945a9883e64b64b4c640a78ed SHA256 9167cc80f04697e67a5ffa31b39db0cd427217cf407792c53a484a520648004e
+MISC ChangeLog 9191 RMD160 5668128fde9331a9566b2117eef5036c2af405ad SHA1 678d66d128e78b263b6f5a103c8a6182f5c66555 SHA256 dbf7fee099ed03fe8cfff621e87c1aec48bec1f1e3c8beb71d8ea32203e2609e
MISC metadata.xml 167 RMD160 3b9bd7883121c8868b966914627e4f714f0334f5 SHA1 ec07f2508f1d0ed5a20416cdb42bf44ff9198923 SHA256 d1dbd0cf93ea6330c8c2fe1f02775bf64b3019bc51f7351606e3fa61a2d63a83
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkg5XfEACgkQkKaRLQcq0GJU/QCeNvflFpNVrpe7jxZeBsXBcFvj
-w3cAn3Z4Gksev2lNmSJhZjYxz5XSpObv
-=3d9r
+iEYEARECAAYFAkk3+MIACgkQ1fmVwcYIWAY/LACfZGCsLa4r+LseZ0iNESfKRzVx
+TlIAoKUgFXJoxFHpLMvJawDVCu6NF7jR
+=ctpP
-----END PGP SIGNATURE-----
diff --git a/app-office/planner/files/planner-0.14.3-build-failure.patch b/app-office/planner/files/planner-0.14.3-build-failure.patch
new file mode 100644
index 000000000000..1317a2cb6d27
--- /dev/null
+++ b/app-office/planner/files/planner-0.14.3-build-failure.patch
@@ -0,0 +1,19 @@
+#
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=231823
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=539993
+#
+--- a/libplanner/mrp-sql.c 2008/07/15 01:17:58 1.1
++++ b/libplanner/mrp-sql.c 2008/07/15 01:19:28
+@@ -2405,9 +2405,9 @@ mrp_sql_load_project (MrpStorageSQL *sto
+ }
+
+ #define WRITE_ERROR(e,c) \
+-G_STMT_START \
+-g_set_error(e,MRP_ERROR,MRP_ERROR_SAVE_WRITE_FAILED, sql_get_last_error (c)) \
+-G_STMT_END
++G_STMT_START { \
++g_set_error(e,MRP_ERROR,MRP_ERROR_SAVE_WRITE_FAILED, sql_get_last_error (c)); \
++} G_STMT_END
+
+
+ /*************************
diff --git a/app-office/planner/files/planner-0.14.3-configure.patch b/app-office/planner/files/planner-0.14.3-configure.patch
new file mode 100644
index 000000000000..f59454f03fe4
--- /dev/null
+++ b/app-office/planner/files/planner-0.14.3-configure.patch
@@ -0,0 +1,76 @@
+#
+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=562984
+#
+Index: b/configure.in
+===================================================================
+--- a/configure.in (révision 940)
++++ b/configure.in (copie de travail)
+@@ -80,28 +81,40 @@
+ dnl -----------
+ dnl | Database/GDA check |----------------------------------------------
+ dnl -----------
+-AC_ARG_ENABLE(database, [ --enable-database=[no/yes] enable database support [default=no]], enable_database="$enableval", enable_database=no)
++AC_ARG_WITH(database,
++ AS_HELP_STRING([--with-database],
++ [enable database support @<:@default=no@:>@ (auto/no/gda1/gda2/gda3)]),
++ with_database="$withval", with_database=no)
+
+-if test "x$enable_database" = "xyes" ; then
++GDA_VER=
++use_gda=no
+
+- PKG_CHECK_MODULES(GDA, libgda-3.0 >= 1.0,
+- [
+- GDA_VER=30
+- ],
+- [
+- PKG_CHECK_MODULES(GDA, libgda-2.0 >= 1.0,
+- [
+- GDA_VER=20
+- ],
+- [
+- PKG_CHECK_MODULES(GDA, libgda >= 1.0)
+- GDA_VER=10
+- ])
+- ])
+- use_gda=yes
+-else
+- use_gda=no
++case "$with_database" in
++auto|yes)
++ PKG_CHECK_MODULES(GDA, libgda-3.0 >= 1.0, [GDA_VER=30],
++ [PKG_CHECK_MODULES(GDA, libgda-2.0 >= 1.0, [GDA_VER=20],
++ [PKG_CHECK_MODULES(GDA, libgda >= 1.0, [GDA_VER=10])
++ ])
++ ])
++ ;;
++*gda3*)
++ PKG_CHECK_MODULES(GDA, libgda-3.0 >= 1.0, [GDA_VER=30])
++ ;;
++*gda2*)
++ PKG_CHECK_MODULES(GDA, libgda-2.0 >= 1.0, [GDA_VER=20])
++ ;;
++*gda1*)
++ PKG_CHECK_MODULES(GDA, libgda >= 1.0, [GDA_VER=10])
++ ;;
++*)
++ use_gda=no
++ ;;
++esac
++
++if test x$GDA_VER != x; then
++ use_gda=yes
+ fi
++
+ AC_SUBST(GDA_VER)
+ AM_CONDITIONAL(HAVE_GDA, test x$use_gda = xyes)
+ dnl -----------------------------------------------------------
+@@ -351,7 +364,7 @@
+ echo "Python plugin : $enable_python_plugin"
+ #echo "Dotnet bindings : $have_dotnet"
+ echo "Simple priority scheduling : $use_simple_priority_scheduling"
+-echo "Database/GDA support : $use_gda"
++echo "Database/GDA support : $use_gda, $GDA_VER"
+ echo "Evolution Data Server import : $use_eds"
+ echo "Evolution Data Server backend: $use_eds_backend"
+ echo
diff --git a/app-office/planner/planner-0.14.3-r1.ebuild b/app-office/planner/planner-0.14.3-r1.ebuild
new file mode 100644
index 000000000000..933086712e9c
--- /dev/null
+++ b/app-office/planner/planner-0.14.3-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.14.3-r1.ebuild,v 1.1 2008/12/04 15:35:15 eva Exp $
+
+EAPI="1"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Project manager for Gnome2"
+HOMEPAGE="http://live.gnome.org/Planner/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="doc eds libgda python examples"
+
+RDEPEND=">=dev-libs/glib-2.6
+ >=x11-libs/gtk+-2.6
+ >=gnome-base/libgnomecanvas-2.10
+ >=gnome-base/libgnomeui-2.10
+ >=gnome-base/libglade-2.4
+ >=gnome-base/gnome-vfs-2.10
+ >=gnome-base/libgnomeprintui-2.10
+ >=gnome-base/gconf-2.6
+ >=dev-libs/libxml2-2.6.27
+ >=dev-libs/libxslt-1.1.23
+ libgda? ( gnome-extra/libgda:1 )
+ python? ( >=dev-python/pygtk-2.6 )
+ eds? (
+ >=gnome-extra/evolution-data-server-1.1
+ >=mail-client/evolution-2.1.3 )"
+
+# FIXME: disable eds backend for now, its experimental
+
+DEPEND="${RDEPEND}
+ >=dev-util/pkgconfig-0.12.0
+ app-text/scrollkeeper
+ >=dev-util/intltool-0.35.5
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.0 )"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL README"
+
+pkg_setup() {
+ G2CONF="${G2CONF}
+ $(use_with libgda database gda1)
+ $(use_enable python)
+ $(use_enable python python-plugin)
+ $(use_enable eds)
+ --disable-update-mimedb"
+# $(use_enable eds eds-backend)
+}
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # Fix parallel build issues
+ epatch "${FILESDIR}/${P}-parallel-build.patch"
+
+ # Fix compile failure with eds-plugin
+ epatch "${FILESDIR}/${P}-eds-plugin.patch"
+
+ # Fix compilation failure with recent glib/gcc, bug #231823
+ epatch "${FILESDIR}/${P}-build-failure.patch"
+
+ # Fix libgda selection
+ epatch "${FILESDIR}/${P}-configure.patch"
+
+ intltoolize --force || die "intltoolize failed"
+ eautoreconf
+}
+
+src_install() {
+ gnome2_src_install \
+ sqldocdir="\$(datadir)/doc/${PF}" \
+ sampledir="\$(datadir)/doc/${PF}/examples"
+
+ if ! use examples; then
+ rm -rf "${D}/usr/share/doc/${PF}/examples"
+ fi
+}
diff --git a/app-office/planner/planner-0.14.3-r2.ebuild b/app-office/planner/planner-0.14.3-r2.ebuild
new file mode 100644
index 000000000000..d04f5857d73c
--- /dev/null
+++ b/app-office/planner/planner-0.14.3-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.14.3-r2.ebuild,v 1.1 2008/12/04 15:35:15 eva Exp $
+
+EAPI="1"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Project manager for Gnome2"
+HOMEPAGE="http://live.gnome.org/Planner/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="doc eds libgda python examples"
+
+RDEPEND=">=dev-libs/glib-2.6
+ >=x11-libs/gtk+-2.6
+ >=gnome-base/libgnomecanvas-2.10
+ >=gnome-base/libgnomeui-2.10
+ >=gnome-base/libglade-2.4
+ >=gnome-base/gnome-vfs-2.10
+ >=gnome-base/libgnomeprintui-2.10
+ >=gnome-base/gconf-2.6
+ >=dev-libs/libxml2-2.6.27
+ >=dev-libs/libxslt-1.1.23
+ libgda? ( gnome-extra/libgda:3 )
+ python? ( >=dev-python/pygtk-2.6 )
+ eds? (
+ >=gnome-extra/evolution-data-server-1.1
+ >=mail-client/evolution-2.1.3 )"
+
+# FIXME: disable eds backend for now, its experimental
+
+DEPEND="${RDEPEND}
+ >=dev-util/pkgconfig-0.12.0
+ app-text/scrollkeeper
+ >=dev-util/intltool-0.35.5
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.0 )"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL README"
+
+pkg_setup() {
+ G2CONF="${G2CONF}
+ $(use_with libgda database gda3)
+ $(use_enable python)
+ $(use_enable python python-plugin)
+ $(use_enable eds)
+ --disable-update-mimedb"
+# $(use_enable eds eds-backend)
+}
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # Fix parallel build issues
+ epatch "${FILESDIR}/${P}-parallel-build.patch"
+
+ # Fix compile failure with eds-plugin
+ epatch "${FILESDIR}/${P}-eds-plugin.patch"
+
+ # Fix compilation failure with recent glib/gcc, bug #231823
+ epatch "${FILESDIR}/${P}-build-failure.patch"
+
+ # Fix libgda selection
+ epatch "${FILESDIR}/${P}-configure.patch"
+
+ intltoolize --force || die "intltoolize failed"
+ eautoreconf
+}
+
+src_install() {
+ gnome2_src_install \
+ sqldocdir="\$(datadir)/doc/${PF}" \
+ sampledir="\$(datadir)/doc/${PF}/examples"
+
+ if ! use examples; then
+ rm -rf "${D}/usr/share/doc/${PF}/examples"
+ fi
+}