View | Details | Raw Unified | Return to bug 239859 | Differences between
and this patch

Collapse All | Expand All

(-)deskutils/xneur/Makefile (-4 / +4 lines)
Lines 1-73 Link Here
1
# Created by: Alex "lissyara" Keda <admin@lissyara.su>
1
# Created by: Alex "lissyara" Keda <admin@lissyara.su>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	xneur
4
PORTNAME=	xneur
5
PORTVERSION=	0.17.0
5
PORTVERSION=	0.20.0
6
DISTVERSIONSUFFIX=.orig
6
DISTVERSIONSUFFIX=.orig
7
PORTREVISION=	7
8
CATEGORIES=	deskutils
7
CATEGORIES=	deskutils
9
MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
8
MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
10
DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
9
DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
11
10
12
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	mizhka@gmail.com
13
COMMENT=	Auto keyboard switcher
12
COMMENT=	Auto keyboard switcher
14
13
15
LICENSE=	GPLv2
14
LICENSE=	GPLv2
16
15
17
LIB_DEPENDS=	libnotify.so:devel/libnotify \
16
LIB_DEPENDS=	libnotify.so:devel/libnotify \
18
		libpcre.so:devel/pcre
17
		libpcre.so:devel/pcre
19
18
20
USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
19
USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
21
		pkgconfig
20
		pkgconfig
21
USE_GNOME=	gtk20
22
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
22
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
24
CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
25
CFLAGS_mips=	-fnested-functions
25
CFLAGS_mips=	-fnested-functions
26
CFLAGS_mips64=	-fnested-functions
26
CFLAGS_mips64=	-fnested-functions
27
CFLAGS_powerpc=	-fnested-functions
27
CFLAGS_powerpc=	-fnested-functions
28
CFLAGS_powerpcspe=	-fnested-functions
28
CFLAGS_powerpcspe=	-fnested-functions
29
CFLAGS_powerpc64=	-fnested-functions
29
CFLAGS_powerpc64=	-fnested-functions
30
CFLAGS_sparc64=	-fnested-functions
30
CFLAGS_sparc64=	-fnested-functions
31
31
32
USE_LDCONFIG=	${PREFIX}/lib/xneur ${PREFIX}/lib/xneur/xneur
32
USE_LDCONFIG=	${PREFIX}/lib/xneur ${PREFIX}/lib/xneur/xneur
33
INSTALLS_ICONS=	yes
33
INSTALLS_ICONS=	yes
34
INSTALL_TARGET=	install-strip
34
INSTALL_TARGET=	install-strip
35
35
36
OPTIONS_DEFINE=	ASPELL XOSD NLS X11
36
OPTIONS_DEFINE=	ASPELL XOSD NLS X11
37
OPTIONS_DEFAULT=	GSTREAMER ASPELL
37
OPTIONS_DEFAULT=	GSTREAMER ASPELL
38
OPTIONS_RADIO=	SOUND
38
OPTIONS_RADIO=	SOUND
39
OPTIONS_RADIO_SOUND=	GSTREAMER OPENAL
39
OPTIONS_RADIO_SOUND=	GSTREAMER OPENAL
40
XOSD_DESC=	Xosd support
40
XOSD_DESC=	Xosd support
41
41
42
OPTIONS_SUB=	yes
42
OPTIONS_SUB=	yes
43
43
44
NLS_USES=		gettext
44
NLS_USES=		gettext
45
NLS_CONFIGURE_ENABLE=	nls
45
NLS_CONFIGURE_ENABLE=	nls
46
46
47
X11_USE=		XORG=x11
47
X11_USE=		XORG=x11
48
X11_CONFIGURE_WITH=	x
48
X11_CONFIGURE_WITH=	x
49
49
50
ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
50
ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
51
ASPELL_CONFIGURE_ON=	--with-spell=aspell
51
ASPELL_CONFIGURE_ON=	--with-spell=aspell
52
ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
52
ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
53
53
54
XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
54
XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
55
XOSD_CONFIGURE_WITH=	xosd
55
XOSD_CONFIGURE_WITH=	xosd
56
56
57
.include <bsd.port.options.mk>
57
.include <bsd.port.options.mk>
58
58
59
.if ${PORT_OPTIONS:MGSTREAMER}
59
.if ${PORT_OPTIONS:MGSTREAMER}
60
USE_GSTREAMER=	yes
60
USE_GSTREAMER=	yes
61
CONFIGURE_ARGS+=	--with-sound=gstreamer
61
CONFIGURE_ARGS+=	--with-sound=gstreamer
62
.elif ${PORT_OPTIONS:MOPENAL}
62
.elif ${PORT_OPTIONS:MOPENAL}
63
USES+=			openal:al,alut
63
USES+=			openal:al,alut
64
CONFIGURE_ARGS+=	--with-sound=openal
64
CONFIGURE_ARGS+=	--with-sound=openal
65
.else
65
.else
66
CONFIGURE_ARGS+=	--with-sound=no
66
CONFIGURE_ARGS+=	--with-sound=no
67
.endif
67
.endif
68
68
69
post-patch:
69
post-patch:
70
	@${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure
70
	@${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure
71
	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
71
	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
72
72
73
.include <bsd.port.mk>
73
.include <bsd.port.mk>
(-)deskutils/xneur/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (xneur_0.17.0.orig.tar.gz) = b5243e401239505c449a6a2671a0d42c05deabac8ef7442d4a7ca8236137a8ab
1
TIMESTAMP = 1565792030
2
SIZE (xneur_0.17.0.orig.tar.gz) = 1669034
2
SHA256 (xneur_0.20.0.orig.tar.gz) = f9f6a0e834c6e28d0611f12c9fcc712831ced3701e31b77b71a9cf9be2c5e3d1
3
SIZE (xneur_0.20.0.orig.tar.gz) = 1683789
(-)deskutils/xneur/files/patch-etc-Makefile.in (-2 / +2 lines)
Lines 1-11 Link Here
1
--- etc/Makefile.in.orig	2015-06-22 10:21:10 UTC
1
--- etc/Makefile.in.orig	2019-08-14 14:23:32 UTC
2
+++ etc/Makefile.in
2
+++ etc/Makefile.in
3
@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
3
@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
4
 top_srcdir = @top_srcdir@
4
 top_srcdir = @top_srcdir@
5
 xneurrcdir = $(sysconfdir)/xneur
5
 xneurrcdir = $(sysconfdir)/xneur
6
 xneurrc_DATA = \
6
 xneurrc_DATA = \
7
-	xneurrc	
7
-	xneurrc	
8
+	xneurrc.sample
8
+	xneurrc.sample
9
 
9
 
10
 EXTRA_DIST = $(xneurrc_DATA)
10
 EXTRA_DIST = $(xneurrc_DATA)
11
 all: all-am
11
 all: all-am
(-)deskutils/xneur/pkg-plist (-33 / +28 lines)
Lines 1-102 Link Here
1
bin/xneur
1
bin/xneur
2
@sample %%ETCDIR%%/xneurrc.sample
2
@sample %%ETCDIR%%/xneurrc.sample
3
lib/xneur/libxneur.so.17.0.0
3
include/xneur/list_char.h
4
lib/xneur/libxneur.so.17
4
include/xneur/xnconfig.h
5
lib/xneur/libxneur.so
5
include/xneur/xneur.h
6
lib/xneur/libxnconfig.so.17.0.0
7
lib/xneur/libxnconfig.so.17
8
lib/xneur/libxnconfig.so
6
lib/xneur/libxnconfig.so
9
lib/xneur/xneur/libxntest.so.0.0.0
7
lib/xneur/libxnconfig.so.20
10
lib/xneur/xneur/libxntest.so.0
8
lib/xneur/libxnconfig.so.20.0.0
11
lib/xneur/xneur/libxntest.so
9
lib/xneur/libxneur.so
12
lib/xneur/xneur/libxnstatistic.so.0.0.0
10
lib/xneur/libxneur.so.20
13
lib/xneur/xneur/libxnstatistic.so.0
11
lib/xneur/libxneur.so.20.0.0
14
lib/xneur/xneur/libxnstatistic.so
12
lib/xneur/xneur/libxnstatistic.so
13
lib/xneur/xneur/libxnstatistic.so.0
14
lib/xneur/xneur/libxnstatistic.so.0.0.0
15
lib/xneur/xneur/libxntest.so
16
lib/xneur/xneur/libxntest.so.0
17
lib/xneur/xneur/libxntest.so.0.0.0
18
libdata/pkgconfig/xnconfig.pc
19
libdata/pkgconfig/xneur.pc
15
man/man1/xneur.1.gz
20
man/man1/xneur.1.gz
16
man/man5/xneurrc.5.gz
21
man/man5/xneurrc.5.gz
17
include/xneur/list_char.h
22
share/icons/hicolor/16x16/apps/xneur.png
18
include/xneur/xneur.h
23
share/icons/hicolor/22x22/apps/xneur.png
19
include/xneur/xnconfig.h
24
share/icons/hicolor/24x24/apps/xneur.png
20
%%DATADIR%%/sounds/layout1.wav
25
share/icons/hicolor/32x32/apps/xneur.png
21
%%DATADIR%%/sounds/layout2.wav
26
share/icons/hicolor/48x48/apps/xneur.png
22
%%DATADIR%%/sounds/layout1type.wav
27
share/icons/hicolor/scalable/apps/xneur.svg
23
%%DATADIR%%/sounds/layout2type.wav
24
%%DATADIR%%/sounds/replace.wav
25
%%DATADIR%%/sounds/switch.wav
26
%%DATADIR%%/sounds/itemback.wav
27
%%DATADIR%%/languages/am/dictionary
28
%%DATADIR%%/languages/am/dictionary
28
%%DATADIR%%/languages/am/proto
29
%%DATADIR%%/languages/am/proto
29
%%DATADIR%%/languages/am/proto3
30
%%DATADIR%%/languages/am/proto3
30
%%DATADIR%%/languages/bg/dictionary
31
%%DATADIR%%/languages/bg/dictionary
31
%%DATADIR%%/languages/bg/proto
32
%%DATADIR%%/languages/bg/proto
32
%%DATADIR%%/languages/bg/proto3
33
%%DATADIR%%/languages/bg/proto3
33
%%DATADIR%%/languages/by/dictionary
34
%%DATADIR%%/languages/by/dictionary
34
%%DATADIR%%/languages/by/proto
35
%%DATADIR%%/languages/by/proto
35
%%DATADIR%%/languages/by/proto3
36
%%DATADIR%%/languages/by/proto3
36
%%DATADIR%%/languages/cz/dictionary
37
%%DATADIR%%/languages/cz/dictionary
37
%%DATADIR%%/languages/cz/proto
38
%%DATADIR%%/languages/cz/proto
38
%%DATADIR%%/languages/cz/proto3
39
%%DATADIR%%/languages/cz/proto3
39
%%DATADIR%%/languages/de/dictionary
40
%%DATADIR%%/languages/de/dictionary
40
%%DATADIR%%/languages/de/proto
41
%%DATADIR%%/languages/de/proto
41
%%DATADIR%%/languages/de/proto3
42
%%DATADIR%%/languages/de/proto3
42
%%DATADIR%%/languages/ee/dictionary
43
%%DATADIR%%/languages/ee/dictionary
43
%%DATADIR%%/languages/ee/proto
44
%%DATADIR%%/languages/ee/proto
44
%%DATADIR%%/languages/ee/proto3
45
%%DATADIR%%/languages/ee/proto3
45
%%DATADIR%%/languages/en/dictionary
46
%%DATADIR%%/languages/en/dictionary
46
%%DATADIR%%/languages/en/proto
47
%%DATADIR%%/languages/en/proto
47
%%DATADIR%%/languages/en/proto3
48
%%DATADIR%%/languages/en/proto3
48
%%DATADIR%%/languages/es/dictionary
49
%%DATADIR%%/languages/es/dictionary
49
%%DATADIR%%/languages/es/proto
50
%%DATADIR%%/languages/es/proto
50
%%DATADIR%%/languages/es/proto3
51
%%DATADIR%%/languages/es/proto3
51
%%DATADIR%%/languages/fr/dictionary
52
%%DATADIR%%/languages/fr/dictionary
52
%%DATADIR%%/languages/fr/proto
53
%%DATADIR%%/languages/fr/proto
53
%%DATADIR%%/languages/fr/proto3
54
%%DATADIR%%/languages/fr/proto3
54
%%DATADIR%%/languages/gb/dictionary
55
%%DATADIR%%/languages/gb/dictionary
55
%%DATADIR%%/languages/gb/proto
56
%%DATADIR%%/languages/gb/proto
56
%%DATADIR%%/languages/gb/proto3
57
%%DATADIR%%/languages/gb/proto3
57
%%DATADIR%%/languages/ge/dictionary
58
%%DATADIR%%/languages/ge/dictionary
58
%%DATADIR%%/languages/ge/proto
59
%%DATADIR%%/languages/ge/proto
59
%%DATADIR%%/languages/ge/proto3
60
%%DATADIR%%/languages/ge/proto3
60
%%DATADIR%%/languages/gr/dictionary
61
%%DATADIR%%/languages/gr/dictionary
61
%%DATADIR%%/languages/gr/proto
62
%%DATADIR%%/languages/gr/proto
62
%%DATADIR%%/languages/gr/proto3
63
%%DATADIR%%/languages/gr/proto3
63
%%DATADIR%%/languages/kz/dictionary
64
%%DATADIR%%/languages/kz/dictionary
64
%%DATADIR%%/languages/kz/proto
65
%%DATADIR%%/languages/kz/proto
65
%%DATADIR%%/languages/kz/proto3
66
%%DATADIR%%/languages/kz/proto3
66
%%DATADIR%%/languages/lt/dictionary
67
%%DATADIR%%/languages/lt/dictionary
67
%%DATADIR%%/languages/lt/proto
68
%%DATADIR%%/languages/lt/proto
68
%%DATADIR%%/languages/lt/proto3
69
%%DATADIR%%/languages/lt/proto3
69
%%DATADIR%%/languages/lv/dictionary
70
%%DATADIR%%/languages/lv/dictionary
70
%%DATADIR%%/languages/lv/proto
71
%%DATADIR%%/languages/lv/proto
71
%%DATADIR%%/languages/lv/proto3
72
%%DATADIR%%/languages/lv/proto3
72
%%DATADIR%%/languages/pl/dictionary
73
%%DATADIR%%/languages/pl/dictionary
73
%%DATADIR%%/languages/pl/proto
74
%%DATADIR%%/languages/pl/proto
74
%%DATADIR%%/languages/pl/proto3
75
%%DATADIR%%/languages/pl/proto3
75
%%DATADIR%%/languages/ro/dictionary
76
%%DATADIR%%/languages/ro/dictionary
76
%%DATADIR%%/languages/ro/proto
77
%%DATADIR%%/languages/ro/proto
77
%%DATADIR%%/languages/ro/proto3
78
%%DATADIR%%/languages/ro/proto3
78
%%DATADIR%%/languages/ru/dictionary
79
%%DATADIR%%/languages/ru/dictionary
79
%%DATADIR%%/languages/ru/proto
80
%%DATADIR%%/languages/ru/proto
80
%%DATADIR%%/languages/ru/proto3
81
%%DATADIR%%/languages/ru/proto3
81
%%DATADIR%%/languages/ua/dictionary
82
%%DATADIR%%/languages/ua/dictionary
82
%%DATADIR%%/languages/ua/proto
83
%%DATADIR%%/languages/ua/proto
83
%%DATADIR%%/languages/ua/proto3
84
%%DATADIR%%/languages/ua/proto3
84
%%DATADIR%%/languages/us/dictionary
85
%%DATADIR%%/languages/us/dictionary
85
%%DATADIR%%/languages/us/proto
86
%%DATADIR%%/languages/us/proto
86
%%DATADIR%%/languages/us/proto3
87
%%DATADIR%%/languages/us/proto3
87
%%DATADIR%%/languages/uz/dictionary
88
%%DATADIR%%/languages/uz/dictionary
88
%%DATADIR%%/languages/uz/proto
89
%%DATADIR%%/languages/uz/proto
89
%%DATADIR%%/languages/uz/proto3
90
%%DATADIR%%/languages/uz/proto3
90
%%NLS%%share/locale/be/LC_MESSAGES/xneur.mo
91
%%DATADIR%%/sounds/itemback.wav
91
%%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
92
%%DATADIR%%/sounds/layout1.wav
92
%%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
93
%%DATADIR%%/sounds/layout1type.wav
93
%%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo
94
%%DATADIR%%/sounds/layout2.wav
94
%%NLS%%share/locale/uk/LC_MESSAGES/xneur.mo
95
%%DATADIR%%/sounds/layout2type.wav
95
libdata/pkgconfig/xneur.pc
96
%%DATADIR%%/sounds/replace.wav
96
libdata/pkgconfig/xnconfig.pc
97
%%DATADIR%%/sounds/switch.wav
97
share/icons/hicolor/16x16/apps/xneur.png
98
share/icons/hicolor/22x22/apps/xneur.png
99
share/icons/hicolor/24x24/apps/xneur.png
100
share/icons/hicolor/32x32/apps/xneur.png
101
share/icons/hicolor/48x48/apps/xneur.png
102
share/icons/hicolor/scalable/apps/xneur.svg

Return to bug 239859