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

Collapse All | Expand All

(-)deskutils/gxneur/Makefile (-10 / +7 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gxneur
4
PORTNAME=	gxneur
5
PORTVERSION=	0.17.0
5
PORTVERSION=	0.20.0
6
DISTVERSIONSUFFIX=.orig
6
DISTVERSIONSUFFIX=.orig
7
PORTREVISION=	3
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}
Lines 14-27 Link Here
14
13
15
LICENSE=	GPLv2
14
LICENSE=	GPLv2
16
15
17
BUILD_DEPENDS=	xneur:deskutils/xneur
16
BUILD_DEPENDS=	xneur:deskutils/xneur \
17
		intltool-update:textproc/intltool
18
RUN_DEPENDS=	xneur:deskutils/xneur
18
RUN_DEPENDS=	xneur:deskutils/xneur
19
19
20
GNU_CONFIGURE=	yes
20
USES=		compiler:c++11-lang pkgconfig gmake gnome
21
USES=		compiler:c++11-lang gnome pkgconfig
22
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
23
USE_GNOME=	gconf2 gtk20 libglade2
21
USE_GNOME=	gconf2 gtk20 libglade2
22
24
INSTALLS_ICONS=	yes
23
INSTALLS_ICONS=	yes
24
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
25
GNU_CONFIGURE=	yes
25
26
26
OPTIONS_DEFINE=	NLS
27
OPTIONS_DEFINE=	NLS
27
28
Lines 29-36 Link Here
29
NLS_USES=	gettext
30
NLS_USES=	gettext
30
NLS_CONFIGURE_OFF=	--without-nls
31
NLS_CONFIGURE_OFF=	--without-nls
31
32
32
post-patch:
33
	@${REINPLACE_CMD} -e '/all_modifiers/d' ${WRKSRC}/src/misc.c
34
	@${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/configure
35
36
.include <bsd.port.mk>
33
.include <bsd.port.mk>
(-)deskutils/gxneur/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (gxneur_0.17.0.orig.tar.gz) = 05d518310d0e41c789845088c70638c7ee0ffcce63395df1442540d47ea7ac7d
1
TIMESTAMP = 1565791738
2
SIZE (gxneur_0.17.0.orig.tar.gz) = 795207
2
SHA256 (gxneur_0.20.0.orig.tar.gz) = b943d63bb4044a4437b68d57c4c8b0b0d5e9a5433046c05c29f942205983752b
3
SIZE (gxneur_0.20.0.orig.tar.gz) = 779975
(-)deskutils/gxneur/files/patch-src_xkb.h (+11 lines)
Line 0 Link Here
1
--- src/xkb.h.orig	2020-03-26 12:44:18 UTC
2
+++ src/xkb.h
3
@@ -18,7 +18,7 @@
4
  */
5
 
6
 #ifndef _XKBGXNEUR_H_
7
-#define _XKBGGXNEUR_H_
8
+#define _XKBGXNEUR_H_
9
 
10
 #include <X11/XKBlib.h>
11
 
(-)deskutils/gxneur/pkg-plist (-8 / +9 lines)
Lines 1-14 Link Here
1
bin/gxneur
1
bin/gxneur
2
man/man1/gxneur.1.gz
2
man/man1/gxneur.1.gz
3
share/applications/gxneur.desktop
3
share/applications/gxneur.desktop
4
%%DATADIR%%/glade/abbr_add.glade
5
%%DATADIR%%/glade/about.glade
6
%%DATADIR%%/glade/action_add.glade
7
%%DATADIR%%/glade/app_add.glade
8
%%DATADIR%%/glade/choose_file.glade
9
%%DATADIR%%/glade/config.glade
10
%%DATADIR%%/glade/list.glade
11
%%DATADIR%%/glade/rule_add.glade
12
%%DATADIR%%/pixmaps/am.png
4
%%DATADIR%%/pixmaps/am.png
13
%%DATADIR%%/pixmaps/bg.png
5
%%DATADIR%%/pixmaps/bg.png
14
%%DATADIR%%/pixmaps/by.png
6
%%DATADIR%%/pixmaps/by.png
Lines 42-47 Link Here
42
%%DATADIR%%/pixmaps/us.png
34
%%DATADIR%%/pixmaps/us.png
43
%%DATADIR%%/pixmaps/uz.png
35
%%DATADIR%%/pixmaps/uz.png
44
%%DATADIR%%/pixmaps/x3.png
36
%%DATADIR%%/pixmaps/x3.png
37
%%DATADIR%%/ui/abbr_add.ui
38
%%DATADIR%%/ui/about.ui
39
%%DATADIR%%/ui/action_add.ui
40
%%DATADIR%%/ui/app_add.ui
41
%%DATADIR%%/ui/choose_file.ui
42
%%DATADIR%%/ui/config.ui
43
%%DATADIR%%/ui/list.ui
44
%%DATADIR%%/ui/rule_add.ui
45
%%DATADIR%%/ui/usr_action_add.ui
45
share/icons/hicolor/16x16/apps/gxneur-am.png
46
share/icons/hicolor/16x16/apps/gxneur-am.png
46
share/icons/hicolor/16x16/apps/gxneur-bg.png
47
share/icons/hicolor/16x16/apps/gxneur-bg.png
47
share/icons/hicolor/16x16/apps/gxneur-by.png
48
share/icons/hicolor/16x16/apps/gxneur-by.png
(-)deskutils/xneur/Makefile (-5 / +9 lines)
Lines 2-27 Link Here
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
16
BUILD_DEPENDS=	intltool-update:textproc/intltool
17
LIB_DEPENDS=	libnotify.so:devel/libnotify \
17
LIB_DEPENDS=	libnotify.so:devel/libnotify \
18
		libpcre.so:devel/pcre
18
		libpcre.so:devel/pcre
19
19
20
USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
20
USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
21
		pkgconfig
21
		pkgconfig xorg
22
USE_GNOME=	gtk20
23
24
USE_XORG=	xtst
25
22
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
26
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
23
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
28
CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
25
CFLAGS_mips=	-fnested-functions
29
CFLAGS_mips=	-fnested-functions
26
CFLAGS_mips64=	-fnested-functions
30
CFLAGS_mips64=	-fnested-functions
27
CFLAGS_powerpc=	-fnested-functions
31
CFLAGS_powerpc=	-fnested-functions
(-)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-6 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 = \
(-)deskutils/xneur/files/patch-lib_main_program.c (+11 lines)
Line 0 Link Here
1
--- lib/main/program.c.orig	2020-03-26 11:56:18 UTC
2
+++ lib/main/program.c
3
@@ -445,7 +445,7 @@ static void program_process_input(struct _program *p)
4
 			#ifdef WITH_ASPELL
5
 					if (xconfig->handle->has_spell_checker[lang])
6
 					{
7
-						loKg_message(DEBUG, _("      %s aspell dictionary loaded"), lang_name);
8
+						log_message(DEBUG, _("      %s aspell dictionary loaded"), lang_name);
9
 					}
10
 					else
11
 					{
(-)deskutils/xneur/pkg-plist (-33 / +28 lines)
Lines 1-29 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
include/xneur/xneur.h
6
lib/xneur/libxnconfig.so
7
lib/xneur/libxnconfig.so.20
8
lib/xneur/libxnconfig.so.20.0.0
5
lib/xneur/libxneur.so
9
lib/xneur/libxneur.so
6
lib/xneur/libxnconfig.so.17.0.0
10
lib/xneur/libxneur.so.20
7
lib/xneur/libxnconfig.so.17
11
lib/xneur/libxneur.so.20.0.0
8
lib/xneur/libxnconfig.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
9
lib/xneur/xneur/libxntest.so.0.0.0
17
lib/xneur/xneur/libxntest.so.0.0.0
10
lib/xneur/xneur/libxntest.so.0
18
libdata/pkgconfig/xnconfig.pc
11
lib/xneur/xneur/libxntest.so
19
libdata/pkgconfig/xneur.pc
12
lib/xneur/xneur/libxnstatistic.so.0.0.0
13
lib/xneur/xneur/libxnstatistic.so.0
14
lib/xneur/xneur/libxnstatistic.so
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
Lines 87-102 Link Here
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