calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

update xneur

Browse Source
atratsevskiy
Alexander Tratsevskiy 12 years ago
parent f4808c7fc0
commit 97d702d3c7
6 changed files with 91 additions and 54 deletions
Show Stats Download Patch File Download Diff File

9
x11-misc/xneur/ChangeLog
Unescape View File

@ -1,7 +1,14 @@
# ChangeLog for x11-misc/xneur
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*xneur-0.15.0 (27 Jan 2012)
27 Jan 2012; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+files/0.15.0-select-gtk.patch, -xneur-0.12.0-r1.ebuild,
-files/xneur-0.12.0-libnotify-0.7.patch, +xneur-0.15.0.ebuild, -metadata.xml:
version bump
12 Mar 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
-xneur-0.12.0.ebuild, +xneur-0.12.0-r1.ebuild,
+files/xneur-0.12.0-libnotify-0.7.patch:

9
x11-misc/xneur/Manifest
Unescape View File

@ -1,5 +1,4 @@
AUX xneur-0.12.0-libnotify-0.7.patch 942 RMD160 7b387ed208aca4bda8c486357a3bdc96c6dd0599 SHA1 65ca63a725ec95cc71538bd0debca394be434b38 SHA256 a47904e04aac0167d0afe8fd9aa63f24acef65755bfc63744d98342c1538e295
DIST xneur-0.12.0.tar.bz2 1088554 RMD160 0e5fa4012b69c4e82f7bcefe3e3c478f5500487a SHA1 aff607938f1cc1f7bd38b41b53ea8bf70a4db376 SHA256 962660306f138de44fbfcb458fffac59ce32000a49e2314e4f0460a98ac93327
EBUILD xneur-0.12.0-r1.ebuild 2520 RMD160 ee0dabd6912e4dff9c500fe0045a6345e3ab9d3d SHA1 39056ec4c43885fddb0593491fcccc6e80069ec5 SHA256 1a654990ccb906fe42611d174b7dd3467b66c0bbac7edef9710e778545155200
MISC ChangeLog 2422 RMD160 bcd4f006ceb5d69ba776f4d8f5d9e8c348c269fc SHA1 96467c8dcd2c5a7ddc0708a3028f6ea303a1ebd9 SHA256 865a64517f56b1b19b7d2f6a5a48d6fb35ca7eabcd692727a5de6f16ac48f6f2
MISC metadata.xml 474 RMD160 4973d641049a2ff4fee27892be5fe67647bad186 SHA1 0208c219f21a0d4c7cd84ba5962e7f2901426f4a SHA256 dfe27aab6e4b47d75ab37a7d4e07f936e5e3577ce277dfd8c0eb0493b813d09e
AUX 0.15.0-select-gtk.patch 1656 RMD160 2b9469eaa20c1c6bccc372d4ca2893b0825dc38d SHA1 9ea7718ae3fcf7173a6dd49d1f8f0f1d1ebefbbb SHA256 d674c760251f8cec10692ec2688bc364b69291e3ebcd69f8c63d499c4535129a
DIST xneur-0.15.0.tar.bz2 1136568 RMD160 4e112bc286a5be4afe1bd32b63989a7ccf23bd26 SHA1 46795bebb7787d9f6fa092005ffefce423bc7c3c SHA256 ebedf81ac2c8510d60e235ca66c7ed73c306b22b5b3164981a628950b5cb3e70
EBUILD xneur-0.15.0.ebuild 3042 RMD160 a7b192f3e0fa8ee9dd505a99e927a0037dfb101c SHA1 e6185512fde8344897480814f4cc8e51f17fe2ab SHA256 f061257ce539e79d5ce3d7db5885a0fd45e4ee7761c940c48ef4a39095283e58
MISC ChangeLog 2671 RMD160 8b9c0a8c837cd5b3c34c66bd6ab517117bb91d72 SHA1 b53523b037f8e61589488e12dd4bdc71180bd83c SHA256 e6a342d7c7d5b159d9810afa894e6c6e300b086c5c71e154326ba2002a34ba99

48
x11-misc/xneur/files/0.15.0-select-gtk.patch
Unescape View File

@ -0,0 +1,48 @@
--- configure.in.orig 2011-12-06 19:43:49.934493120 +0100
+++ configure.in 2011-12-06 19:43:57.365437555 +0100
@@ -192,16 +192,28 @@
AC_ARG_WITH(libnotify, [ --without-libnotify Compile without libnotify message support])
if test "x$with_libnotify" != "xno"; then
- AC_ARG_WITH(gtk, [ --with-gtk Compile with additional GTK support])
- if test "x$with_gtk" == "xyes"; then
- PKG_CHECK_MODULES(GTK, [gtk+-3.0], found_gtk="yes", found_gtk="no")
- if test "x$found_gtk" = "xno"; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0])
- fi
+ AC_ARG_WITH(gtk, [ --with-gtk[[=ARG]] Compile with additional GTK support ARG=[[yes|no|gtk2|gtk3]] [[default=no]]])
+ if test "x$with_gtk" != "xno"; then
+ if test "x$with_gtk" = "x"; then
+ with_gtk="gtk3"
+ fi
+
+ case $with_gtk in
+ gtk2)
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0], found_gtk="yes", found_gtk="no")
+ ;;
+ gtk3|yes)
+ PKG_CHECK_MODULES(GTK, [gtk+-3.0], found_gtk="yes", found_gtk="no")
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported Gtk+ selected, --with-gtk=[[yes|no|gtk2|gtk3]]])
+ ;;
+ esac
+
+ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4.0])
+ AC_DEFINE(WITH_LIBNOTIFY, 1, [Define if you want libnotify message support])
fi
- PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4.0])
- AC_DEFINE(WITH_LIBNOTIFY, 1, [Define if you want libnotify message support])
fi
AC_ARG_WITH(plugins, [ --without-plugins Compile without plugins support])
@@ -331,7 +343,7 @@
fi
if test "x$with_popup" != "xno"; then
- if test "x$with_gtk" == "xyes"; then
+ if test "x$found_gtk" == "xyes"; then
cat <<EOF
GTK compiler flags: $GTK_CFLAGS
GTK linker flags: $GTK_LIBS

28
x11-misc/xneur/files/xneur-0.12.0-libnotify-0.7.patch
Unescape View File

@ -1,28 +0,0 @@
diff -ru xneur-0.12.0-orig/lib/notify/popup.c xneur-0.12.0/lib/notify/popup.c
--- xneur-0.12.0-orig/lib/notify/popup.c 2011-01-27 05:25:42.000000000 -0500
+++ xneur-0.12.0/lib/notify/popup.c 2011-03-12 02:21:20.411001315 -0500
@@ -27,6 +27,10 @@
#include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION /* macro did not exist before libnotify-0.5.2 */
+# define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
#include <pthread.h>
#include <stdio.h>
#include <string.h>
@@ -73,8 +77,12 @@
popup_body->header = popup_body->content;
popup_body->content = NULL;
}
-
+
+#if NOTIFY_CHECK_VERSION(0,7,0)
+ NotifyNotification *notify = notify_notification_new(popup_body->header, popup_body->content, icon);
+#else
NotifyNotification *notify = notify_notification_new(popup_body->header, popup_body->content, icon, NULL);
+#endif
notify_notification_set_category(notify, type);
notify_notification_set_urgency(notify, urgency);

12
x11-misc/xneur/metadata.xml
Unescape View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>no-herd</herd>
<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
<use>
<flag name='aplay'>Use aplay from <pkg>media-sound/alsa-utils</pkg> for
playing sounds</flag>
<flag name='keylogger'>Enable keylogger support (logs all text into html;
<pkg>x11-misc/gxneur</pkg> allows to view this text)</flag>
</use>
</pkgmetadata>

39
x11-misc/xneur/xneur-0.12.0-r1.ebuild → x11-misc/xneur/xneur-0.15.0.ebuild
Unescape View File

@ -1,4 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@ -13,7 +13,7 @@ SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="aplay debug gstreamer keylogger libnotify nls openal openmp xosd +spell"
IUSE="aplay debug gstreamer gtk gtk3 keylogger libnotify nls openal xosd +spell"
COMMON_DEPEND=">=dev-libs/libpcre-5.0
sys-libs/zlib
@ -24,16 +24,20 @@ COMMON_DEPEND=">=dev-libs/libpcre-5.0
openal? ( >=media-libs/freealut-1.0.1 )
!openal? (
aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
libnotify? ( >=x11-libs/libnotify-0.4.0 )
libnotify? (
gtk? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 ) )
>=x11-libs/libnotify-0.4.0 )
spell? ( app-text/enchant )
xosd? ( x11-libs/xosd )"
RDEPEND="${COMMON_DEPEND}
gstreamer? ( media-libs/gst-plugins-good
media-plugins/gst-plugins-alsa )
nls? ( virtual/libintl )"
nls? ( virtual/libintl )
gtk3? ( !x11-misc/gxneur )"
DEPEND="${COMMON_DEPEND}
>=dev-util/pkgconfig-0.20
openmp? ( sys-devel/gcc[openmp] )
nls? ( sys-devel/gettext )"
src_prepare() {
@ -42,14 +46,19 @@ src_prepare() {
rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \
ltmain.sh aclocal.m4 || die
sed -i -e "s/-Werror -g0//" configure.in
epatch "${FILESDIR}/${P}-libnotify-0.7.patch"
sed -i -e "s/-Werror -g0//" configure.in || die
# allows to select between gtk2 or gtk3, or none
epatch "${FILESDIR}/${PV}-select-gtk.patch"
eautoreconf
}
src_configure() {
local myconf
if use gtk && ! use libnotify; then
einfo "libnotify is not in USE - gtk USE flag will have no effect"
fi
if use gstreamer; then
elog "Using gstreamer for sound output."
myconf="--with-sound=gstreamer"
@ -64,9 +73,18 @@ src_configure() {
myconf="--with-sound=no"
fi
if use gtk; then
if use gtk3; then
myconf="${myconf} --with-gtk=gtk3"
else
myconf="${myconf} --with-gtk=gtk2"
fi
else
myconf="${myconf} --without-gtk"
fi
econf ${myconf} \
$(use_with debug) \
$(use_enable openmp) \
$(use_enable nls) \
$(use_with spell) \
$(use_with xosd) \
@ -83,6 +101,11 @@ pkg_postinst() {
elog "This is command line tool. If you are looking for GUI frontend just"
elog "emerge gxneur, which uses xneur transparently as backend."
elog
elog "It is recommended to install dictionary for your language"
elog "(myspell or aspell), for example app-dicts/aspell-ru."
ewarn
ewarn "If you upgraded from <=xneur-0.9.3, you need to remove"
ewarn "dictionary files in the home directory:"
ewarn " $ rm ~/.xneur/{ru,en,be,etc.}/dict"
Write Preview
Loading…
Cancel
Save