From ac20d6edf9f0a1752f070a38a1215564395ba068 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 19 Apr 2010 15:40:11 +0000 Subject: [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. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-office/orage/ChangeLog | 8 ++++++- app-office/orage/Manifest | 5 +++-- .../orage/files/orage-4.7.5-asneeded.patch | 22 +++++++++++++++++++ app-office/orage/orage-4.7.5.ebuild | 21 ++++++++++++------ 4 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 app-office/orage/files/orage-4.7.5-asneeded.patch 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/Manifest b/app-office/orage/Manifest index 9e8427d73923..1043dbdba9da 100644 --- a/app-office/orage/Manifest +++ b/app-office/orage/Manifest @@ -1,6 +1,7 @@ +AUX orage-4.7.5-asneeded.patch 897 RMD160 b062f420c9b423e4948e64637959dbbb7993bf37 SHA1 ef6affeb9eebafaf403c54c753af5a44cd9175e5 SHA256 0f6fb02bb11f249519b634435e0580e60d6b9803f89e80dd0c5fb088e4449804 DIST orage-4.6.1.tar.bz2 1937593 RMD160 7724992e2e177487c71597a15d7faf7f865bb56b SHA1 2db15404197ef9aa6f588c0eebac9fc4f68426df SHA256 f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d DIST orage-4.7.5.tar.bz2 2233120 RMD160 4642bff9673cea78f86e81be669717613b49f192 SHA1 abc04b59dd81c02d1bd04c52f8c64e57dfb0908f SHA256 285ff8de944a98487c98e502ade2ebce561338ea75a5dbbe5890ef9cbde58667 EBUILD orage-4.6.1.ebuild 981 RMD160 a6e1458aa2095c3ac85f5071d6c607c33d4e8660 SHA1 76981eed01a782aa16c29103b9a7b03c1b71c33f SHA256 836a2633f415fe9f6abe085e4dd4b244e0445bf7ee19bce4ac0f34aab980c322 -EBUILD orage-4.7.5.ebuild 1090 RMD160 84f45e8fc7deca28d2e9890c0067726a235d5c83 SHA1 8f1a9efca9fb373db5d837252cd2ec11d93d0a7e SHA256 717c70295cd56118dd2edd5e0dd56a8dbe0d80c73746665e72b26e815843b120 -MISC ChangeLog 7876 RMD160 677b841addcd8f67d06f7e5346723beb3352a01e SHA1 d12cd87a09a4291b5338fc30af4597dd4f224a29 SHA256 e782bebad59ff10eb7dcd64c4d34149989d526c083e8801f5107db8db0687add +EBUILD orage-4.7.5.ebuild 1270 RMD160 9e153afe9b252cbfdad53ed06f47eaea2228056f SHA1 ea593744c854f46b262151f22fa060b406d7d797 SHA256 3ea038599524f50a52847ebb6140aecce15b0c12d77427298991d4a17dbfa084 +MISC ChangeLog 8165 RMD160 512b8896cd9755b58bc594f720ac48c9cb0a414c SHA1 5dac48b586616865fcf352ebb16c26d672fb12f8 SHA256 651555e99ad491a707f84939affd63300b9c80efacb73eec70408a98116f6733 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 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 } -- 2.26.2