Fix building with x11-libs/libnotify >= 0.7.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 38 insertions, 27 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 3294f58d6d6b..007187fffa2b 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.227 2011/01/08 06:21:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.228 2011/02/05 07:37:11 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> uim-1.6.1.ebuild,
+  +files/uim-1.6.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
 *uim-1.6.1 (08 Jan 2011)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 9ccc9cf8f10e..dd47dc951e54 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
 AUX uim-1.5.4-gcc43.patch 404 RMD160 99bb3adb856b82b7efcf5e9e07dfe1a647cde83d SHA1 5ec9d1ffbd7eb44568795b9e532e05e7caf59457 SHA256 560494a526ab30d7524d769f359a592c1a73671b51491e426d48306cc537707a
 AUX uim-1.5.4-gentoo.patch 1366 RMD160 2ff73cab38b95772245ed78c06166ca865aa4474 SHA1 cb729594bd9d1cf56c084050ed954bf07fac0e8d SHA256 5b9639144848e42a049426172d7a4b53cbc74532e9787881a807511ab8b6552b
@@ -13,6 +10,7 @@ AUX uim-1.6.0-gettext.patch 449 RMD160 2b60687cc2d0adf6c2e8a958b4c042379a8b48b3
 AUX uim-1.6.0-linker.patch 5969 RMD160 a6e60d17606a1bede3bb159b0ed34bf2705877a3 SHA1 eded83ebc0dc5ac4bffad982b64f7cd7895ec695 SHA256 432d51518a51aeca563ec9ae0a8b84b3968032afe5b0313c403a2fe872a883d0
 AUX uim-1.6.0-sandbox-violation.patch 7290 RMD160 376e25f36c4757b43bdb814c7c31efc18d2d45b3 SHA1 36425bfb3e923a660ebf258c4aaa3a7139b83767 SHA256 a3c4afa9af03c85fc4cb8457c07dfe4641cda4c5534cbbad7ffe2adddc84f573
 AUX uim-1.6.0-xcompose.patch 428 RMD160 d9f0800edbee447b79da7cc05a1150ce13e3b1df SHA1 27d407df9d97617f44655f2e3f0decada84c4e11 SHA256 9fab26881d5318c856daeab20c98b9278bf31dc2c6c5131bec914f2c038b5756
+AUX uim-1.6.1-libnotify-0.7.patch 661 RMD160 18ded31a4895abd2491fb470e20d8dfc8fbe5f1b SHA1 3130c041f0f62248b1ff0ae5f1a78a6953872f50 SHA256 f96f6fb81208a4a11382f08687bb92e0738ab54bb39a06146a284d8232edd8bb
 AUX xinput-uim 91 RMD160 88eece15af5524e1b1e1568fb0824b9e242eeb92 SHA1 37e09df5d915ff9ecbf645efbdd751d6bc2d2fd6 SHA256 ade06862ce4bf2705886d64be6c18bd97c3d5a981676a98a7daea94e9de02757
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
 DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac SHA1 fbea2590286ddc857a7824d8544cb08842f4299f SHA256 f404b274c4b7e71b4b912912c758606585af476fcc5f3d602a08564187ad4e46
@@ -22,23 +20,6 @@ EBUILD uim-1.4.2.ebuild 3999 RMD160 43c80abb4398057ef4530d51b1cbc592d3d7ba3e SHA
 EBUILD uim-1.5.7-r1.ebuild 5416 RMD160 804d1e87f0ef3fb4520cb0d07006c67d370bc267 SHA1 5c829d661aa9d4e0d6629b97562e276b4feacf07 SHA256 dc3230d6fe189071eba7bfde988359dd58ecf52832e73b0417979dbefe520e22
 EBUILD uim-1.5.7.ebuild 5296 RMD160 23fb62b18eb84c7792b45d7951c97a1fe193b7cd SHA1 d81dfdd0169c9eae48c1328bb685d905f9d9a13e SHA256 95d7baf47b0c95a4c001d95e79da044343401aa50be2753a86059ab166937af5
 EBUILD uim-1.6.0-r2.ebuild 5927 RMD160 9ed1c763be52f1806f917439593f1782179a7a93 SHA1 f717971bce659a93e1743499e093f404b7452040 SHA256 bf25ab578f53b0cc49317ed16263d652bd607eeee349c5fd784a3ea659e6d0d6
-EBUILD uim-1.6.1.ebuild 5964 RMD160 2fbe4766d106e35d078836b10a31970272faeb20 SHA1 790be4bad3938f7dceea8d7869cb6c25a46c5545 SHA256 b4d64e2e5e6786b4cb15767d0785d1f77327fe640d866f8a85a0ef34da26d9a4
-MISC ChangeLog 32433 RMD160 5ea1439950e8fa387127a22d8e7e903c6a2cd216 SHA1 0dadd795dbd6d15952d388484bf904206377c57d SHA256 634146fcf5a07d42edafc1c0973061ab26984f7aa35598bc8ce33102df261fc7
+EBUILD uim-1.6.1.ebuild 6017 RMD160 347de844b7a461c7bc3f90d2ec6fabfc5228ee2a SHA1 c224542d0dfe41599b885e253a75a896834907c9 SHA256 11111ba00835a3f748278d682430f97490d0378c8753abd77b25b0d06f38282e
+MISC ChangeLog 32596 RMD160 45a8be65b394e04af8711f480dcaac28ad556a2a SHA1 0500b17d68bf38b283047551396bea9ceb15c9cf SHA256 ea7444a662ab49737cd4de5fd5e286f8426f6343a9c84930f4000799bec8762a
 MISC metadata.xml 961 RMD160 74d29238a618f2307a09fc3061f0652ceb305073 SHA1 665044f11f9f9b7e16b6b580a379b4138ffd2f1c SHA256 f1ca51e0e41161ec077f759a0e139bf523ace99a60e769b51e6a67fd549f075a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNKAJxAAoJECaGw+YFKA1pQxsP/2MInjkMKb9rDVtyjrb1BSuL
-gSFtymT+eZFXU0rWhbKkuX8r31zmF8q4D0MBn2i2ulDtcsgGdEVZ4OCf1Me9laVA
-fY/FCu9YvEmBpqO622+8irIZ7lfY5u943lnS50mAcz6NcIcVBUB5eYmDEiCyxcrb
-LEu+aqU5cz0Yp0c5cdOcFX5refYSritH+D2YM3JDrsqsmDJOrPjlB+50eGpFsW+u
-3Y1mGW2BwNxvX9VwmMv4NbzUQsjAHL6FEjvxpLYR3ZTQ/evvoUffOVLlhUzBBStu
-UOEPB0H7khDFNJ0JcWpRjCZh4HMDSzsOyFJtlyhmETTM7f07Xb4wKmHKAbcjdGoW
-l6cc4pRAh+Soxnsm0izzRILZSV9hzIHgePF79BiE5tw0ah40MuX2eFvPGfBEMeh6
-1UY+x2oWY4U/jT8xYpKqfjm6cCjuxi6Ajh+Q7hRHavgFXkK7V90GAqGRF3afA493
-RSDiAjoy/RP4SOxHP5vAZYVQYPE/6ZkcgQ6zXQOXNU2hZC1dwVk+3zZjEpSdRcY4
-KttDNLf+uT9luIrqvke25mzSNrJnleQj5LA22A8B52ZtzxDDVd6bvEoKlQUUM9/b
-JkS9RlQYWIFoYj0UoRync3p+zWb4gdrnUD+MvRpWroVdLi1FVl4/jYtYBWjJyDDo
-QSsR6OTSOlVDbR6wgj/O
-=peyK
------END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/uim-1.6.1-libnotify-0.7.patch b/app-i18n/uim/files/uim-1.6.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..4899794c52da
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.6.1-libnotify-0.7.patch
@@ -0,0 +1,25 @@
+--- notify/uim-libnotify.c
++++ notify/uim-libnotify.c
+@@ -44,6 +44,10 @@
+ #include "uim-notify.h"
+ #include "gettext.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #define UIM_ICON UIM_PIXMAPSDIR "/uim-icon.png"
+ #define UGETTEXT(str)	(dgettext(GETTEXT_PACKAGE, (str)))
+ 
+@@ -73,7 +77,11 @@
+     return UIM_FALSE;
+   }
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  notification = notify_notification_new("uim", gmsg, UIM_ICON);
++#else
+   notification = notify_notification_new("uim", gmsg, UIM_ICON, NULL);
++#endif
+ 
+   if (!notification) {
+     fprintf(stderr, "notify_notification_new: can not create notification object\n");
diff --git a/app-i18n/uim/uim-1.6.1.ebuild b/app-i18n/uim/uim-1.6.1.ebuild
index ab57bfbc0a36..f4254c81ffef 100644
--- a/app-i18n/uim/uim-1.6.1.ebuild
+++ b/app-i18n/uim/uim-1.6.1.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-i18n/uim/uim-1.6.1.ebuild,v 1.1 2011/01/08 06:21:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.2 2011/02/05 07:37:11 ssuominen Exp $
 
 EAPI="3"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -93,9 +93,10 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-1.6.0-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
-		"${FILESDIR}/${PN}-1.6.0-linker.patch"
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.6.0-linker.patch \
+		"${FILESDIR}"/${PN}-1.6.1-libnotify-0.7.patch
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die