Attachment 206546 Details for Bug 239859 – SVN patch for xneur

[patch] SVN patch for xneur

deskutils_xneur_0.20.diff (text/plain), 7.92 KB, created by Michael Zhilin on 2019-08-14 16:33:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Zhilin

Created: 2019-08-14 16:33:50 UTC

Size: 7.92 KB

patch

obsolete

>Index: deskutils/xneur/Makefile
>===================================================================
>--- deskutils/xneur/Makefile	(revision 508717)
>+++ deskutils/xneur/Makefile	(working copy)
>@@ -1,73 +1,73 @@
> # Created by: Alex "lissyara" Keda <admin@lissyara.su>
> # $FreeBSD$
> 
> PORTNAME=	xneur
>-PORTVERSION=	0.17.0
>+PORTVERSION=	0.20.0
> DISTVERSIONSUFFIX=.orig
>-PORTREVISION=	7
> CATEGORIES=	deskutils
> MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
> DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	mizhka@gmail.com
> COMMENT=	Auto keyboard switcher
> 
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libnotify.so:devel/libnotify \
> 		libpcre.so:devel/pcre
> 
> USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
> 		pkgconfig
>+USE_GNOME=	gtk20
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
>+CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
> CFLAGS_mips=	-fnested-functions
> CFLAGS_mips64=	-fnested-functions
> CFLAGS_powerpc=	-fnested-functions
> CFLAGS_powerpcspe=	-fnested-functions
> CFLAGS_powerpc64=	-fnested-functions
> CFLAGS_sparc64=	-fnested-functions
> 
> USE_LDCONFIG=	${PREFIX}/lib/xneur ${PREFIX}/lib/xneur/xneur
> INSTALLS_ICONS=	yes
> INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	ASPELL XOSD NLS X11
> OPTIONS_DEFAULT=	GSTREAMER ASPELL
> OPTIONS_RADIO=	SOUND
> OPTIONS_RADIO_SOUND=	GSTREAMER OPENAL
> XOSD_DESC=	Xosd support
> 
> OPTIONS_SUB=	yes
> 
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
> X11_USE=		XORG=x11
> X11_CONFIGURE_WITH=	x
> 
> ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
> ASPELL_CONFIGURE_ON=	--with-spell=aspell
> ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
> 
> XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
> XOSD_CONFIGURE_WITH=	xosd
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGSTREAMER}
> USE_GSTREAMER=	yes
> CONFIGURE_ARGS+=	--with-sound=gstreamer
> .elif ${PORT_OPTIONS:MOPENAL}
> USES+=			openal:al,alut
> CONFIGURE_ARGS+=	--with-sound=openal
> .else
> CONFIGURE_ARGS+=	--with-sound=no
> .endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure
> 	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
> 
> .include <bsd.port.mk>
>Index: deskutils/xneur/distinfo
>===================================================================
>--- deskutils/xneur/distinfo	(revision 508717)
>+++ deskutils/xneur/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (xneur_0.17.0.orig.tar.gz) = b5243e401239505c449a6a2671a0d42c05deabac8ef7442d4a7ca8236137a8ab
>-SIZE (xneur_0.17.0.orig.tar.gz) = 1669034
>+TIMESTAMP = 1565792030
>+SHA256 (xneur_0.20.0.orig.tar.gz) = f9f6a0e834c6e28d0611f12c9fcc712831ced3701e31b77b71a9cf9be2c5e3d1
>+SIZE (xneur_0.20.0.orig.tar.gz) = 1683789
>Index: deskutils/xneur/files/patch-etc-Makefile.in
>===================================================================
>--- deskutils/xneur/files/patch-etc-Makefile.in	(revision 508717)
>+++ deskutils/xneur/files/patch-etc-Makefile.in	(working copy)
>@@ -1,11 +1,11 @@
>---- etc/Makefile.in.orig	2015-06-22 10:21:10 UTC
>+--- etc/Makefile.in.orig	2019-08-14 14:23:32 UTC
> +++ etc/Makefile.in
>-@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
>+@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>  xneurrcdir = $(sysconfdir)/xneur
>  xneurrc_DATA = \
> -	xneurrc	
> +	xneurrc.sample
>  
>  EXTRA_DIST = $(xneurrc_DATA)
>  all: all-am
>Index: deskutils/xneur/pkg-plist
>===================================================================
>--- deskutils/xneur/pkg-plist	(revision 508717)
>+++ deskutils/xneur/pkg-plist	(working copy)
>@@ -1,102 +1,97 @@
> bin/xneur
> @sample %%ETCDIR%%/xneurrc.sample
>-lib/xneur/libxneur.so.17.0.0
>-lib/xneur/libxneur.so.17
>-lib/xneur/libxneur.so
>-lib/xneur/libxnconfig.so.17.0.0
>-lib/xneur/libxnconfig.so.17
>+include/xneur/list_char.h
>+include/xneur/xnconfig.h
>+include/xneur/xneur.h
> lib/xneur/libxnconfig.so
>-lib/xneur/xneur/libxntest.so.0.0.0
>-lib/xneur/xneur/libxntest.so.0
>-lib/xneur/xneur/libxntest.so
>-lib/xneur/xneur/libxnstatistic.so.0.0.0
>-lib/xneur/xneur/libxnstatistic.so.0
>+lib/xneur/libxnconfig.so.20
>+lib/xneur/libxnconfig.so.20.0.0
>+lib/xneur/libxneur.so
>+lib/xneur/libxneur.so.20
>+lib/xneur/libxneur.so.20.0.0
> lib/xneur/xneur/libxnstatistic.so
>+lib/xneur/xneur/libxnstatistic.so.0
>+lib/xneur/xneur/libxnstatistic.so.0.0.0
>+lib/xneur/xneur/libxntest.so
>+lib/xneur/xneur/libxntest.so.0
>+lib/xneur/xneur/libxntest.so.0.0.0
>+libdata/pkgconfig/xnconfig.pc
>+libdata/pkgconfig/xneur.pc
> man/man1/xneur.1.gz
> man/man5/xneurrc.5.gz
>-include/xneur/list_char.h
>-include/xneur/xneur.h
>-include/xneur/xnconfig.h
>-%%DATADIR%%/sounds/layout1.wav
>-%%DATADIR%%/sounds/layout2.wav
>-%%DATADIR%%/sounds/layout1type.wav
>-%%DATADIR%%/sounds/layout2type.wav
>-%%DATADIR%%/sounds/replace.wav
>-%%DATADIR%%/sounds/switch.wav
>-%%DATADIR%%/sounds/itemback.wav
>+share/icons/hicolor/16x16/apps/xneur.png
>+share/icons/hicolor/22x22/apps/xneur.png
>+share/icons/hicolor/24x24/apps/xneur.png
>+share/icons/hicolor/32x32/apps/xneur.png
>+share/icons/hicolor/48x48/apps/xneur.png
>+share/icons/hicolor/scalable/apps/xneur.svg
> %%DATADIR%%/languages/am/dictionary
> %%DATADIR%%/languages/am/proto
> %%DATADIR%%/languages/am/proto3
> %%DATADIR%%/languages/bg/dictionary
> %%DATADIR%%/languages/bg/proto
> %%DATADIR%%/languages/bg/proto3
> %%DATADIR%%/languages/by/dictionary
> %%DATADIR%%/languages/by/proto
> %%DATADIR%%/languages/by/proto3
> %%DATADIR%%/languages/cz/dictionary
> %%DATADIR%%/languages/cz/proto
> %%DATADIR%%/languages/cz/proto3
> %%DATADIR%%/languages/de/dictionary
> %%DATADIR%%/languages/de/proto
> %%DATADIR%%/languages/de/proto3
> %%DATADIR%%/languages/ee/dictionary
> %%DATADIR%%/languages/ee/proto
> %%DATADIR%%/languages/ee/proto3
> %%DATADIR%%/languages/en/dictionary
> %%DATADIR%%/languages/en/proto
> %%DATADIR%%/languages/en/proto3
> %%DATADIR%%/languages/es/dictionary
> %%DATADIR%%/languages/es/proto
> %%DATADIR%%/languages/es/proto3
> %%DATADIR%%/languages/fr/dictionary
> %%DATADIR%%/languages/fr/proto
> %%DATADIR%%/languages/fr/proto3
> %%DATADIR%%/languages/gb/dictionary
> %%DATADIR%%/languages/gb/proto
> %%DATADIR%%/languages/gb/proto3
> %%DATADIR%%/languages/ge/dictionary
> %%DATADIR%%/languages/ge/proto
> %%DATADIR%%/languages/ge/proto3
> %%DATADIR%%/languages/gr/dictionary
> %%DATADIR%%/languages/gr/proto
> %%DATADIR%%/languages/gr/proto3
> %%DATADIR%%/languages/kz/dictionary
> %%DATADIR%%/languages/kz/proto
> %%DATADIR%%/languages/kz/proto3
> %%DATADIR%%/languages/lt/dictionary
> %%DATADIR%%/languages/lt/proto
> %%DATADIR%%/languages/lt/proto3
> %%DATADIR%%/languages/lv/dictionary
> %%DATADIR%%/languages/lv/proto
> %%DATADIR%%/languages/lv/proto3
> %%DATADIR%%/languages/pl/dictionary
> %%DATADIR%%/languages/pl/proto
> %%DATADIR%%/languages/pl/proto3
> %%DATADIR%%/languages/ro/dictionary
> %%DATADIR%%/languages/ro/proto
> %%DATADIR%%/languages/ro/proto3
> %%DATADIR%%/languages/ru/dictionary
> %%DATADIR%%/languages/ru/proto
> %%DATADIR%%/languages/ru/proto3
> %%DATADIR%%/languages/ua/dictionary
> %%DATADIR%%/languages/ua/proto
> %%DATADIR%%/languages/ua/proto3
> %%DATADIR%%/languages/us/dictionary
> %%DATADIR%%/languages/us/proto
> %%DATADIR%%/languages/us/proto3
> %%DATADIR%%/languages/uz/dictionary
> %%DATADIR%%/languages/uz/proto
> %%DATADIR%%/languages/uz/proto3
>-%%NLS%%share/locale/be/LC_MESSAGES/xneur.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
>-%%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo
>-%%NLS%%share/locale/uk/LC_MESSAGES/xneur.mo
>-libdata/pkgconfig/xneur.pc
>-libdata/pkgconfig/xnconfig.pc
>-share/icons/hicolor/16x16/apps/xneur.png
>-share/icons/hicolor/22x22/apps/xneur.png
>-share/icons/hicolor/24x24/apps/xneur.png
>-share/icons/hicolor/32x32/apps/xneur.png
>-share/icons/hicolor/48x48/apps/xneur.png
>-share/icons/hicolor/scalable/apps/xneur.svg
>+%%DATADIR%%/sounds/itemback.wav
>+%%DATADIR%%/sounds/layout1.wav
>+%%DATADIR%%/sounds/layout1type.wav
>+%%DATADIR%%/sounds/layout2.wav
>+%%DATADIR%%/sounds/layout2type.wav
>+%%DATADIR%%/sounds/replace.wav
>+%%DATADIR%%/sounds/switch.wav

Actions: View | Diff

Attachments on bug 239859: 206545 | 206546 | 212747