diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 14:02:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 14:02:20 +0000 |
| commit | 9cc1cde0627b686d815a6a650efbabb553a1c3e1 (patch) | |
| tree | e94656c18998a58bff84722a364057b060e0ce6b /app-office | |
| parent | Fix building with x11-libs/libnotify >= 0.7. (diff) | |
| download | historical-9cc1cde0627b686d815a6a650efbabb553a1c3e1.tar.gz historical-9cc1cde0627b686d815a6a650efbabb553a1c3e1.tar.bz2 historical-9cc1cde0627b686d815a6a650efbabb553a1c3e1.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/orage/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/orage/Manifest | 5 | ||||
| -rw-r--r-- | app-office/orage/files/orage-4.8.0-libnotify-0.7.patch | 25 | ||||
| -rw-r--r-- | app-office/orage/orage-4.8.0.ebuild | 5 |
4 files changed, 37 insertions, 4 deletions
diff --git a/app-office/orage/ChangeLog b/app-office/orage/ChangeLog index 9038cb57a0c1..fc286efe52be 100644 --- a/app-office/orage/ChangeLog +++ b/app-office/orage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/orage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.36 2011/01/25 18:01:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.37 2011/01/29 14:02:20 ssuominen Exp $ + + 29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> orage-4.8.0.ebuild, + +files/orage-4.8.0-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 25 Jan 2011; Jeroen Roovers <jer@gentoo.org> orage-4.7.5.ebuild: Stable for HPPA (bug #349023). diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest index 094b8a581932..42865b290089 100644 --- a/app-office/orage/Manifest +++ b/app-office/orage/Manifest @@ -1,7 +1,8 @@ AUX orage-4.7.5-asneeded.patch 897 RMD160 b062f420c9b423e4948e64637959dbbb7993bf37 SHA1 ef6affeb9eebafaf403c54c753af5a44cd9175e5 SHA256 0f6fb02bb11f249519b634435e0580e60d6b9803f89e80dd0c5fb088e4449804 +AUX orage-4.8.0-libnotify-0.7.patch 811 RMD160 dd02c0e55bb2c8d3badfa27c63f68f96b351e931 SHA1 f388a920ecde8d0f2dc03c1fd26840cfeded6e7d SHA256 1b044641e7427dce4f94d0e2e453d1b2d8ae37e52b95fe676772cc28f94181ec DIST orage-4.7.5.tar.bz2 2233120 RMD160 4642bff9673cea78f86e81be669717613b49f192 SHA1 abc04b59dd81c02d1bd04c52f8c64e57dfb0908f SHA256 285ff8de944a98487c98e502ade2ebce561338ea75a5dbbe5890ef9cbde58667 DIST orage-4.8.0.tar.bz2 2233578 RMD160 f1816aab0f0b4de6b7eb9eeeb9104a64027b3588 SHA1 b23edd1fe9ff3fa861b7f25292e66eea69250294 SHA256 677ef69bd28829f648d0b23c6062cb6c2d9b2491839bfb041775c9fa0e185939 EBUILD orage-4.7.5.ebuild 1248 RMD160 bb224feb75923ba426bbf58873943bfa53e28e05 SHA1 cd744a63b3c8df2c7ac7b9130d98496cdda44fa9 SHA256 8e529f157d4487f648a887c1f23cc2644ffb331b897ebed881afde8d6c7df4bd -EBUILD orage-4.8.0.ebuild 1312 RMD160 16f8329eb12f972b4996d9e18907613e37ddf461 SHA1 ca42c49e533269c69fe9cdecd8cf59d5a359bb62 SHA256 396f92eb836d8efd9d120b61647ebc477e25ed3e4ec700d94d33a98439a04645 -MISC ChangeLog 8980 RMD160 9ab4621b75d58d1c608c3039bdfa9a28cded242b SHA1 5662f52022095a576996a84f6df5190b210344a9 SHA256 025db6a97cc75bc01556bb497e4499d1e1601cf27b0ee7ef86e640ff1c260e2b +EBUILD orage-4.8.0.ebuild 1444 RMD160 936dd0c323523430648b1e9747cbcdc7ce9d8f48 SHA1 93b1f3889435eb523f8223da9caaced2978072b1 SHA256 330e9ac9b50f50a16949ce660660efb740b241a092017b1c2ae249421108ab11 +MISC ChangeLog 9150 RMD160 1aa5065eac7a9735140f4ec5a2a196b35f27ad68 SHA1 910bd73c57b54496d79dad797b0dbc3edb56996d SHA256 d8a3718ef0afb4936a572c852615d0687b39cb018d60bd1dbf041b6c2e3f88de MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/app-office/orage/files/orage-4.8.0-libnotify-0.7.patch b/app-office/orage/files/orage-4.8.0-libnotify-0.7.patch new file mode 100644 index 000000000000..16503b95e68c --- /dev/null +++ b/app-office/orage/files/orage-4.8.0-libnotify-0.7.patch @@ -0,0 +1,25 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=7204 + +--- src/reminder.c ++++ src/reminder.c +@@ -557,12 +557,19 @@ + g_strlcat(heading, l_alarm->action_time, 90); + g_strlcat(heading, "<\b>", 10); + } +- n = notify_notification_new(heading, l_alarm->description, NULL, NULL); ++ n = notify_notification_new(heading, l_alarm->description, NULL ++#ifdef HAVE_LIBNOTIFY_07 ++ ); ++#else ++ , NULL); ++#endif + l_alarm->active_alarm->active_notify = n; ++#ifndef HAVE_LIBNOTIFY_07 + if (g_par.trayIcon + && gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon)) + notify_notification_attach_to_status_icon(n + , (GtkStatusIcon *)g_par.trayIcon); ++#endif + + if (l_alarm->notify_timeout == -1) + notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER); diff --git a/app-office/orage/orage-4.8.0.ebuild b/app-office/orage/orage-4.8.0.ebuild index 4b8b9ab4aa37..2c1ee5d0e01a 100644 --- a/app-office/orage/orage-4.8.0.ebuild +++ b/app-office/orage/orage-4.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.0.ebuild,v 1.2 2011/01/19 22:06:06 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.0.ebuild,v 1.3 2011/01/29 14:02:20 ssuominen Exp $ EAPI=3 inherit flag-o-matic xfconf @@ -26,6 +26,9 @@ DEPEND="${RDEPEND} dev-util/intltool" pkg_setup() { + has_version ">=x11-libs/libnotify-0.7" && append-cppflags -DHAVE_LIBNOTIFY_07 + PATCHES=( "${FILESDIR}"/${P}-libnotify-0.7.patch ) + XFCONF=( --docdir="${EPREFIX}"/usr/share/doc/${PF}/html --disable-dependency-tracking |