From 1e298de01c290f42670be494525e2071c8433e00 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Fri, 16 Oct 2009 08:29:38 +0000 Subject: [PATCH] x11-misc/xneur: Version bump. Patch substituted with shell magic. Imlib/xpm support to display flag close to cursor was found slow and dropped. Spell is highly suggested upstream. svn path=/sunrise/; revision=9374 --- x11-misc/xneur/ChangeLog | 6 ++ x11-misc/xneur/Manifest | 7 +- x11-misc/xneur/files/xneur-0.9.5-gcc44.patch | 67 ------------------- ...{xneur-0.9.5.ebuild => xneur-0.9.7.ebuild} | 19 ++---- 4 files changed, 15 insertions(+), 84 deletions(-) delete mode 100644 x11-misc/xneur/files/xneur-0.9.5-gcc44.patch rename x11-misc/xneur/{xneur-0.9.5.ebuild => xneur-0.9.7.ebuild} (84%) diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog index faaeeafdc..73d945a47 100644 --- a/x11-misc/xneur/ChangeLog +++ b/x11-misc/xneur/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Oct 2009; Peter Volkov -xneur-0.9.5.ebuild, + -files/xneur-0.9.5-gcc44.patch, +xneur-0.9.7.ebuild: + Version bump. Patch substituted with shell magic. Imlib/xpm support to + display flag close to cursor was found slow and dropped. Spell is highly + suggested upstream. + 26 Aug 2009; Peter Volkov -xneur-0.9.4.ebuild, +xneur-0.9.5.ebuild, +files/xneur-0.9.5-gcc44.patch: Version bump. Dropped subversion support code from ebuild (not used anyway). diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest index 2be1f3c4e..b8740777e 100644 --- a/x11-misc/xneur/Manifest +++ b/x11-misc/xneur/Manifest @@ -1,5 +1,4 @@ -AUX xneur-0.9.5-gcc44.patch 1841 RMD160 8bc5211d8cf351c232c7be27152436a413ab7f08 SHA1 bdfb9a2324e765870e703851bfa74bf76c3babb2 SHA256 7fff23da4ab72714722d62afa88f0577229f969a9ec0116a1a7c8f8f9de78ad7 -DIST xneur-0.9.5.tar.bz2 1041698 RMD160 83b0cbcc1c9b54780f716a65ea1d126b17854072 SHA1 daf21e3e9fb631504ef96f8757383ef2f1418678 SHA256 1c61881a447a316257258f40d412fa46e5f6d02fe5460fcb0da6427fe93a341b -EBUILD xneur-0.9.5.ebuild 2448 RMD160 6ae22a13da977679f7b86b0a34ded8bb81a115ed SHA1 f6f6bb4c6332f4f2c5e271da89f3099704b6e7bb SHA256 3d31e7dae8275440b5e06547a27cb30e0ad27632abafe4f1f349292feeff6f83 -MISC ChangeLog 1018 RMD160 c01c2f00b1de735a996058633ae6ec73a7b62b99 SHA1 b9295315d7ae854f474b39651c254eb2deda51bd SHA256 ca20ec6374010b917c5b1446abb9f2672f4f28e3226de8d21240cc4db35ca829 +DIST xneur-0.9.7.tar.bz2 1044732 RMD160 6b45840aec6ecac6372892f762820bfd9d441ee3 SHA1 d38c6db3f12b88f5a628608460338da0e73ff512 SHA256 1efc137a5954e377785422ccd0db7a1fde4f1609b97b73288b603a5f1b59fc32 +EBUILD xneur-0.9.7.ebuild 2319 RMD160 6a3cf50c4a6625f43fc2ee18cd40789af40e869d SHA1 9d9afb5e2fc8d7314f6cfe58b8b8f86bd04b438b SHA256 598ebe279ea23f23888b13ba04728e781ed8958783ad41e569f907696f1287e6 +MISC ChangeLog 1310 RMD160 1d4be5536a6122dfa80d6eb54ab53ac8d0c23c6c SHA1 fa84b56022d88f79f2839bdb9c8d6ac44f1077e2 SHA256 26311637e140281ce90918a8384a9c8582487cd6fb11d44c362d36e606c595da MISC metadata.xml 279 RMD160 f03e1cd34a6e25d6662a6583f295080e9cae21e1 SHA1 1b3c6b021ae7dad444549a9bec3e0b73c64e3901 SHA256 f813e4b9164f8fc63957501780b2e77a54097384bc50a392d902b20a9e498e24 diff --git a/x11-misc/xneur/files/xneur-0.9.5-gcc44.patch b/x11-misc/xneur/files/xneur-0.9.5-gcc44.patch deleted file mode 100644 index 742a885c7..000000000 --- a/x11-misc/xneur/files/xneur-0.9.5-gcc44.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fixes build issues with some versions of gcc (4.x I guess) -http://xneur.ru/changeset?new=502%40%2F&old=501%40%2F - -Index: lib/main/plugin.c -=================================================================== ---- lib/main/plugin.c (revision 501) -+++ lib/main/plugin.c (revision 502) -@@ -193,4 +193,4 @@ - p->uninit = plugin_uninit; - - return p; --} -\ No newline at end of file -+} -Index: lib/main/bind_table.c -=================================================================== ---- lib/main/bind_table.c (revision 501) -+++ lib/main/bind_table.c (revision 502) -@@ -194,4 +194,4 @@ - void unbind_user_actions(void) - { - free(ubtable); --} -\ No newline at end of file -+} -Index: lib/main/selection.c -=================================================================== ---- lib/main/selection.c (revision 501) -+++ lib/main/selection.c (revision 502) -@@ -116,4 +116,3 @@ - else if (status == BadWindow) - log_message(ERROR, _("Failed to convert selection with error BadWindow")); - } -- -Index: lib/notify/popup.h -=================================================================== ---- lib/notify/popup.h (revision 501) -+++ lib/notify/popup.h (revision 502) -@@ -22,4 +22,4 @@ - - void popup_show(char *popup_text); - --#endif /* _POPUP_H_ */ -\ No newline at end of file -+#endif /* _POPUP_H_ */ -Index: lib/notify/notify.h -=================================================================== ---- lib/notify/notify.h (revision 501) -+++ lib/notify/notify.h (revision 502) -@@ -22,4 +22,4 @@ - - void show_notify(int notify, char *command); - --#endif /* _NOTIFY_H_ */ -\ No newline at end of file -+#endif /* _NOTIFY_H_ */ -Index: lib/misc/text.c -=================================================================== ---- lib/misc/text.c (revision 501) -+++ lib/misc/text.c (revision 502) -@@ -152,4 +152,4 @@ - } - - return result_orig; --} -\ No newline at end of file -+} diff --git a/x11-misc/xneur/xneur-0.9.5.ebuild b/x11-misc/xneur/xneur-0.9.7.ebuild similarity index 84% rename from x11-misc/xneur/xneur-0.9.5.ebuild rename to x11-misc/xneur/xneur-0.9.7.ebuild index 0ecc39099..24b913dff 100644 --- a/x11-misc/xneur/xneur-0.9.5.ebuild +++ b/x11-misc/xneur/xneur-0.9.7.ebuild @@ -13,13 +13,12 @@ SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="aplay debug +gstreamer +imlib libnotify nls openal xosd +pcre spell xpm" +IUSE="aplay debug gstreamer libnotify nls openal xosd pcre +spell" # Sound does not works here with media-sound/alsa-utils-1.0.16 -RDEPEND=">=x11-libs/libX11-1.1 +RDEPEND="sys-libs/zlib + >=x11-libs/libX11-1.1 x11-libs/libXtst - imlib? ( media-libs/imlib2 ) - !imlib? ( xpm? ( x11-libs/libXpm ) ) gstreamer? ( >=media-libs/gstreamer-0.10.6 ) !gstreamer? ( openal? ( >=media-libs/freealut-1.0.1 ) !openal? ( aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) ) @@ -34,7 +33,8 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.20" src_prepare() { - epatch "${FILESDIR}/${P}-gcc44.patch" + # Fixes error/warning: no newline at end of file + find . -name '*.c' -exec sed '${/[^ ]/s:$:\n:}' -i '{}' \; rm ltmain.sh aclocal.m4 m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 sed -i -e "s/-Werror -g0//" configure.in eautoreconf @@ -53,17 +53,10 @@ src_configure() { elog "Using aplay for sound output." myconf="--with-sound=aplay" else + elog "Sound support disabled." myconf="--with-sound=no" fi - if use imlib2; then - myconf="${myconf} --with-image=imlib2" - elif use xpm; then - myconf="${myconf} --with-image=xpm" - else - myconf="${myconf} --with-image=no" - fi - econf ${myconf} \ $(use_with debug) \ $(use_enable nls) \ -- 2.43.2