From b14169c94dfadc99be44ab3043156872a23487d2 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 19 Apr 2010 15:40:11 +0000 Subject: Fix missing depend (and building with) libical-0.44 wrt #316013 by Andrew Frink. Fix building with (new) xfce4-panel and -Wl,--as-needed. Fix rest of bogus dependencies. (Portage version: 2.2_rc67/cvs/Linux x86_64) --- app-office/orage/ChangeLog | 8 +++++++- app-office/orage/files/orage-4.7.5-asneeded.patch | 22 ++++++++++++++++++++++ app-office/orage/orage-4.7.5.ebuild | 21 ++++++++++++++------- 3 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 app-office/orage/files/orage-4.7.5-asneeded.patch (limited to 'app-office/orage') diff --git a/app-office/orage/ChangeLog b/app-office/orage/ChangeLog index 8b1b3cd4c01e..00ffa5da2303 100644 --- a/app-office/orage/ChangeLog +++ b/app-office/orage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/orage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.27 2010/04/17 04:16:18 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.28 2010/04/19 15:40:11 ssuominen Exp $ + + 19 Apr 2010; Samuli Suominen orage-4.7.5.ebuild, + +files/orage-4.7.5-asneeded.patch: + Fix missing depend (and building with) libical-0.44 wrt #316013 by Andrew + Frink. Fix building with (new) xfce4-panel and -Wl,--as-needed. Fix rest + of bogus dependencies. *orage-4.7.5 (17 Apr 2010) diff --git a/app-office/orage/files/orage-4.7.5-asneeded.patch b/app-office/orage/files/orage-4.7.5-asneeded.patch new file mode 100644 index 000000000000..094404809b03 --- /dev/null +++ b/app-office/orage/files/orage-4.7.5-asneeded.patch @@ -0,0 +1,22 @@ +diff -ur orage-4.7.5.16.orig/globaltime/Makefile.am orage-4.7.5.16/globaltime/Makefile.am +--- orage-4.7.5.16.orig/globaltime/Makefile.am 2010-03-04 09:34:55.000000000 +0200 ++++ orage-4.7.5.16/globaltime/Makefile.am 2010-04-19 18:35:33.000000000 +0300 +@@ -26,6 +26,7 @@ + + globaltime_CFLAGS = \ + $(LIBXFCEGUI4_CFLAGS) \ ++ $(LIBXFCE4PANEL_CFLAGS) \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" + +diff -ur orage-4.7.5.16.orig/panel-plugin/Makefile.am orage-4.7.5.16/panel-plugin/Makefile.am +--- orage-4.7.5.16.orig/panel-plugin/Makefile.am 2010-03-04 09:34:55.000000000 +0200 ++++ orage-4.7.5.16/panel-plugin/Makefile.am 2010-04-19 18:32:05.000000000 +0300 +@@ -9,6 +9,7 @@ + + xfce4_orageclock_plugin_LDFLAGS = \ + @LIBXFCE4PANEL_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ \ + -lX11 + + xfce4_orageclock_plugin_SOURCES = \ diff --git a/app-office/orage/orage-4.7.5.ebuild b/app-office/orage/orage-4.7.5.ebuild index a50a4b3f93f2..17671bf19e1e 100644 --- a/app-office/orage/orage-4.7.5.ebuild +++ b/app-office/orage/orage-4.7.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.7.5.ebuild,v 1.1 2010/04/17 04:16:18 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.7.5.ebuild,v 1.2 2010/04/19 15:40:11 ssuominen Exp $ EAPI=2 - -inherit xfconf +EAUTORECONF=yes +inherit flag-o-matic xfconf DESCRIPTION="Calendar suite for Xfce4" HOMEPAGE="http://www.xfce.org/projects/orage/" @@ -15,9 +15,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="berkdb dbus debug libnotify" -RDEPEND=">=x11-libs/gtk+-2.6:2 - >=xfce-base/libxfcegui4-4.4 - >=xfce-base/xfce4-panel-4.4 +RDEPEND=">=x11-libs/gtk+-2.10:2 + >=xfce-base/libxfcegui4-4.6 + >=xfce-base/xfce4-panel-4.6 + >=dev-libs/libical-0.43 berkdb? ( >=sys-libs/db-4 ) libnotify? ( x11-libs/libnotify ) dbus? ( dev-libs/dbus-glib )" @@ -26,7 +27,7 @@ DEPEND="${RDEPEND} dev-util/intltool" # source of 4.7.5 unpacks into 4.7.5.16. -S="${WORKDIR}/${P}.16" +S=${WORKDIR}/${P}.16 pkg_setup() { XFCONF="--disable-dependency-tracking @@ -35,4 +36,10 @@ pkg_setup() { $(use_with berkdb bdb4) $(xfconf_use_debug)" DOCS="AUTHORS ChangeLog NEWS README TODO" + PATCHES=( "${FILESDIR}/${P}-asneeded.patch" ) +} + +src_configure() { + append-flags -I/usr/include/libical + xfconf_src_configure } -- cgit v1.2.3-65-gdbad