diff options
| -rw-r--r-- | x11-misc/xneur/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-misc/xneur/Manifest | 8 | ||||
| -rw-r--r-- | x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch | 87 | ||||
| -rw-r--r-- | x11-misc/xneur/files/xneur-0.9.3-build-failure.patch | 23 | ||||
| -rw-r--r-- | x11-misc/xneur/xneur-0.9.4.ebuild (renamed from x11-misc/xneur/xneur-0.9.3.ebuild) | 8 |
5 files changed, 13 insertions, 118 deletions
diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog index dc9be3b13..a5a36e431 100644 --- a/x11-misc/xneur/ChangeLog +++ b/x11-misc/xneur/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Jun 2009; Peter Volkov <pva@gentoo.org> -xneur-0.9.3.ebuild, + -files/xneur-0.9.3-CFLAGS.patch, -files/xneur-0.9.3-build-failure.patch, + +xneur-0.9.4.ebuild: + Version bump. Thank Jan Aniŝĉuk for the patch (bug #169494). + 17 Apr 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> xneur-0.9.3.ebuild: QA quotes around EAPI version diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest index a1372db45..4bc0ac52a 100644 --- a/x11-misc/xneur/Manifest +++ b/x11-misc/xneur/Manifest @@ -1,6 +1,4 @@ -AUX xneur-0.9.3-CFLAGS.patch 3872 RMD160 56dd77fdb82d9ab923aa532dbbcb4ab2bc97ddcc SHA1 c6e8e8bb443301893ff0dc51fb79d23940e3267d SHA256 91c7baba148950135ef047f27b8c2801a8af4022e9506543e1dd7e648fb4c164 -AUX xneur-0.9.3-build-failure.patch 1304 RMD160 c7d500b1872bd7731afe9ca7de6a9272665fbe4e SHA1 f6f600141d06873644d67cc950f3b62c7039d330 SHA256 e975cb829c002fb8973d3265fcf03efccb960ff850b7e53f9673fc92a857c8ab -DIST xneur-0.9.3.tar.bz2 611562 RMD160 391da368f8634e205602d54d726b478c6f10efeb SHA1 4fde52f1edca076e58623be235e4a00f4baa74e0 SHA256 22608cce119fb9296fa7d8bf75e280240431e75036eeecc1a172c52555d7f292 -EBUILD xneur-0.9.3.ebuild 2533 RMD160 0140f524798e5cb3543ece6cf63aca3458f145f6 SHA1 726349f271ab0c9d51ae678a0aab55cb37059e56 SHA256 eb62ea9823600b01d60af0ffb586967c322ff66ae5295e518a120412163b1904 -MISC ChangeLog 560 RMD160 5cc60e8a126f4725a91fb2fb4a91f94dc72f9ef0 SHA1 1115d8f9a5ba3d24bc2cfb1de13206dc15af027f SHA256 8a736f529f9ba8843bd0735fca321e24a7a3cde96a329c972ca3bcb35d3a49ce +DIST xneur-0.9.4.tar.bz2 1020509 RMD160 3a881da2932a1a7bc21ade4472e792402643061f SHA1 7d3ab24e1f44090099a77e65cf88dbc3fed5da13 SHA256 244548027da8f50a1d72e1de44be351364d1be18c7135941c212e77ced55aec5 +EBUILD xneur-0.9.4.ebuild 2603 RMD160 7918971cc455d2d42b5acddfca4d03353d91f6cc SHA1 caf3990c5968053069f402aac31d84deb3ebd386 SHA256 53564a79d0eb1eaeeddd8268cd51e8b1a4d9bcdbf79144d02498fde3d1de8954 +MISC ChangeLog 790 RMD160 73c6e51928934e3ed22705e81dafe2be77a2d1fd SHA1 d07a992e3d4f00961c08b94b800763219201775e SHA256 86dfb8c535bccd503d7171acb3c179e24754a32c0b3e030c8277fae68e3fe8aa MISC metadata.xml 279 RMD160 f03e1cd34a6e25d6662a6583f295080e9cae21e1 SHA1 1b3c6b021ae7dad444549a9bec3e0b73c64e3901 SHA256 f813e4b9164f8fc63957501780b2e77a54097384bc50a392d902b20a9e498e24 diff --git a/x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch b/x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch deleted file mode 100644 index 4711bba38..000000000 --- a/x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch +++ /dev/null @@ -1,87 +0,0 @@ -=== modified file 'configure.in' ---- configure.in 2009-03-15 09:13:28 +0000 -+++ configure.in 2009-03-15 09:13:53 +0000 -@@ -198,8 +198,8 @@ - AC_SUBST(XOSD_LIBS) - fi - --CFLAGS="-Wall -Wextra -Werror -g0 -fPIC -std=gnu99" --AC_SUBST(CFLAGS) -+DEFAULT_CFLAGS="-Wall -Wextra -Werror -g0 -fPIC -std=gnu99" -+AC_SUBST(DEFAULT_CFLAGS) - - AC_OUTPUT([share/Makefile share/sounds/Makefile share/pixmaps/Makefile share/en/Makefile share/ru/Makefile share/uk/Makefile share/be/Makefile share/fr/Makefile share/ro/Makefile share/kz/Makefile share/de/Makefile etc/Makefile lib/Makefile lib/ai/Makefile lib/config/Makefile lib/misc/Makefile lib/sound/Makefile lib/x/Makefile src/Makefile po/Makefile.in Makefile xnconfig.pc]) - - -=== modified file 'lib/ai/Makefile.am' ---- lib/ai/Makefile.am 2009-03-15 09:13:28 +0000 -+++ lib/ai/Makefile.am 2009-03-15 09:14:07 +0000 -@@ -6,6 +6,6 @@ - detection.c \ - detection.h - --libxnai_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x @X11_CFLAGS@ @ASPELL_CFLAGS@ -+libxnai_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x @X11_CFLAGS@ @ASPELL_CFLAGS@ @DEFAULT_CFLAGS@ - libxnai_la_LDFLAGS = -static @X11_LIBS@ @ASPELL_LIBS@ - libxnai_la_LIBADD = ../misc/libxnmisc.la - -=== modified file 'lib/config/Makefile.am' ---- lib/config/Makefile.am 2009-03-15 09:13:28 +0000 -+++ lib/config/Makefile.am 2009-03-15 09:14:28 +0000 -@@ -14,7 +14,7 @@ - xnconfig.c \ - xnconfig_memory.c - --libxnconfig_la_CFLAGS = -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x -+libxnconfig_la_CFLAGS = -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x @DEFAULT_CFLAGS@ - libxnconfig_la_LDFLAGS = -version-info 9:3:0 - libxnconfig_la_LIBADD = ../misc/libxnmisc.la - - -=== modified file 'lib/misc/Makefile.am' ---- lib/misc/Makefile.am 2009-03-15 09:13:28 +0000 -+++ lib/misc/Makefile.am 2009-03-15 09:15:07 +0000 -@@ -20,5 +20,5 @@ - utils.c \ - regexp.c - --libxnmisc_la_CFLAGS = @PCRE_CFLAGS@ -+libxnmisc_la_CFLAGS = @PCRE_CFLAGS@ @DEFAULT_CFLAGS@ - libxnmisc_la_LDFLAGS = -static @PCRE_LIBS@ - -=== modified file 'lib/sound/Makefile.am' ---- lib/sound/Makefile.am 2009-03-15 09:13:28 +0000 -+++ lib/sound/Makefile.am 2009-03-15 09:15:23 +0000 -@@ -4,6 +4,6 @@ - sound.c \ - sound.h - --libxnsound_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc @X11_CFLAGS@ @FREEALUT_CFLAGS@ @GSTREAMER_CFLAGS@ -+libxnsound_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc @X11_CFLAGS@ @FREEALUT_CFLAGS@ @GSTREAMER_CFLAGS@ @DEFAULT_CFLAGS@ - libxnsound_la_LDFLAGS = -static @X11_LIBS@ @FREEALUT_LIBS@ @GSTREAMER_LIBS@ @APLAY_LIBS@ - - -=== modified file 'lib/x/Makefile.am' ---- lib/x/Makefile.am 2009-03-15 09:13:28 +0000 -+++ lib/x/Makefile.am 2009-03-15 09:15:43 +0000 -@@ -27,5 +27,5 @@ - xOSD.c \ - xOSD.h - --libxnx_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/sound -I@top_srcdir@/lib/ai @X11_CFLAGS@ @XPM_CFLAGS@ @IMLIB2_CFLAGS@ -+libxnx_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/sound -I@top_srcdir@/lib/ai @X11_CFLAGS@ @XPM_CFLAGS@ @IMLIB2_CFLAGS@ @DEFAULT_CFLAGS@ - libxnx_la_LDFLAGS = -static @X11_LIBS@ @XPM_LIBS@ @IMLIB2_LIBS@ @XOSD_LIBS@ - -=== modified file 'src/Makefile.am' ---- src/Makefile.am 2009-03-15 09:13:28 +0000 -+++ src/Makefile.am 2009-03-15 09:15:58 +0000 -@@ -7,7 +7,7 @@ - newlang_creation.c \ - newlang_creation.h - --xneur_CFLAGS = -I@top_srcdir@/lib/ai -I@top_srcdir@/lib/config -I@top_srcdir@/lib/x -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/sound @X11_CFLAGS@ @XPM_CFLAGS@ -+xneur_CFLAGS = -I@top_srcdir@/lib/ai -I@top_srcdir@/lib/config -I@top_srcdir@/lib/x -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/sound @X11_CFLAGS@ @XPM_CFLAGS@ @DEFAULT_CFLAGS@ - - xneur_LDFLAGS = -L$(top_srcdir)/lib/ai -L$(top_srcdir)/lib/config -L$(top_srcdir)/lib/misc -L$(top_srcdir)/lib/x -L$(top_srcdir)/lib/sound @X11_LIBS@ @XPM_LIBS@ - - diff --git a/x11-misc/xneur/files/xneur-0.9.3-build-failure.patch b/x11-misc/xneur/files/xneur-0.9.3-build-failure.patch deleted file mode 100644 index 417843a94..000000000 --- a/x11-misc/xneur/files/xneur-0.9.3-build-failure.patch +++ /dev/null @@ -1,23 +0,0 @@ -libtool: compile: i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -DPACKAGE_SYSCONFDIR_DIR=\"/etc/xneur\" -DPACKAGE_SHAREDIR_DIR=\"/usr/share/xneur\" -I../../lib/misc -I../../lib/x -Wall -Wextra -fPIC -std=gnu99 -O2 -march=i686 -pipe -mtune=i686 -march=pentium-m -ggdb -U_FORTIFY_SOURCE -MT libxnconfig_la-xnconfig.lo -MD -MP -MF .deps/libxnconfig_la-xnconfig.Tpo -c xnconfig.c -fPIC -DPIC -o .libs/libxnconfig_la-xnconfig.o -xnconfig.c:75: error: expected identifier or '(' before '__extension__' -xnconfig.c:75: error: expected identifier or '(' before ')' token -make[3]: *** [libxnconfig_la-xnconfig.lo] Error 1 -make[3]: Leaving directory `/var/tmp/portage/x11-apps/xneur-0.9.3/work/xneur-0.9.3/lib/config' -make[2]: *** [all-recursive] Error 1 -make[2]: Leaving directory `/var/tmp/portage/x11-apps/xneur-0.9.3/work/xneur-0.9.3/lib' -make[1]: *** [all-recursive] Error 1 -make[1]: Leaving directory `/var/tmp/portage/x11-apps/xneur-0.9.3/work/xneur-0.9.3' -make: *** [all] Error 2 - -=== modified file 'lib/config/xnconfig.c' ---- lib/config/xnconfig.c 2009-03-15 09:13:28 +0000 -+++ lib/config/xnconfig.c 2009-03-15 10:11:41 +0000 -@@ -72,7 +72,6 @@ - static int load_lang = -1;
-
- pid_t getsid(pid_t pid);
--char* strsep(char **stringp, const char *delim);
-
- static char* get_word(char **string)
- {
- diff --git a/x11-misc/xneur/xneur-0.9.3.ebuild b/x11-misc/xneur/xneur-0.9.4.ebuild index bce08e6d3..9b7f58e43 100644 --- a/x11-misc/xneur/xneur-0.9.3.ebuild +++ b/x11-misc/xneur/xneur-0.9.4.ebuild @@ -8,7 +8,7 @@ inherit eutils autotools DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)" HOMEPAGE="http://www.xneur.ru/" -if [[ "${PV}" =~ (_p)([0-9]+) ]] ; then +if [[ ${PV} =~ (_p)([0-9]+) ]] ; then inherit subversion SRC_URI="" MTSLPT_REV=${BASH_REMATCH[2]} @@ -49,8 +49,6 @@ src_unpack() { src_prepare() { rm ltmain.sh aclocal.m4 m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 - epatch "${FILESDIR}/${P}-CFLAGS.patch" - epatch "${FILESDIR}/${P}-build-failure.patch" sed -i -e "s/-Werror -g0//" configure.in eautoreconf } @@ -95,4 +93,8 @@ src_install() { 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." + + 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" } |