Attachment 212747 Details for Bug 239859 – Patch to properly update [g]xneur to 0.20.0

[patch] Patch to properly update [g]xneur to 0.20.0

deskutils_gxneur_xneur.svndiff (text/plain), 9.67 KB, created by Fernando Apesteguía on 2020-03-27 10:07:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2020-03-27 10:07:23 UTC

Size: 9.67 KB

patch

obsolete

>Index: deskutils/gxneur/Makefile
>===================================================================
>--- deskutils/gxneur/Makefile	(revision 529164)
>+++ deskutils/gxneur/Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	gxneur
>-PORTVERSION=	0.17.0
>+PORTVERSION=	0.20.0
> DISTVERSIONSUFFIX=.orig
>-PORTREVISION=	3
> CATEGORIES=	deskutils
> MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
> DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
>@@ -14,14 +13,16 @@
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	xneur:deskutils/xneur
>+BUILD_DEPENDS=	xneur:deskutils/xneur \
>+		intltool-update:textproc/intltool
> RUN_DEPENDS=	xneur:deskutils/xneur
> 
>-GNU_CONFIGURE=	yes
>-USES=		compiler:c++11-lang gnome pkgconfig
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+USES=		compiler:c++11-lang pkgconfig gmake gnome
> USE_GNOME=	gconf2 gtk20 libglade2
>+
> INSTALLS_ICONS=	yes
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+GNU_CONFIGURE=	yes
> 
> OPTIONS_DEFINE=	NLS
> 
>@@ -29,8 +30,4 @@
> NLS_USES=	gettext
> NLS_CONFIGURE_OFF=	--without-nls
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '/all_modifiers/d' ${WRKSRC}/src/misc.c
>-	@${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>Index: deskutils/gxneur/distinfo
>===================================================================
>--- deskutils/gxneur/distinfo	(revision 529164)
>+++ deskutils/gxneur/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (gxneur_0.17.0.orig.tar.gz) = 05d518310d0e41c789845088c70638c7ee0ffcce63395df1442540d47ea7ac7d
>-SIZE (gxneur_0.17.0.orig.tar.gz) = 795207
>+TIMESTAMP = 1565791738
>+SHA256 (gxneur_0.20.0.orig.tar.gz) = b943d63bb4044a4437b68d57c4c8b0b0d5e9a5433046c05c29f942205983752b
>+SIZE (gxneur_0.20.0.orig.tar.gz) = 779975
>Index: deskutils/gxneur/files/patch-src_xkb.h
>===================================================================
>--- deskutils/gxneur/files/patch-src_xkb.h	(nonexistent)
>+++ deskutils/gxneur/files/patch-src_xkb.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/xkb.h.orig	2020-03-26 12:44:18 UTC
>++++ src/xkb.h
>+@@ -18,7 +18,7 @@
>+  */
>+ 
>+ #ifndef _XKBGXNEUR_H_
>+-#define _XKBGGXNEUR_H_
>++#define _XKBGXNEUR_H_
>+ 
>+ #include <X11/XKBlib.h>
>+ 
>
>Property changes on: deskutils/gxneur/files/patch-src_xkb.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/gxneur/pkg-plist
>===================================================================
>--- deskutils/gxneur/pkg-plist	(revision 529164)
>+++ deskutils/gxneur/pkg-plist	(working copy)
>@@ -1,14 +1,6 @@
> bin/gxneur
> man/man1/gxneur.1.gz
> share/applications/gxneur.desktop
>-%%DATADIR%%/glade/abbr_add.glade
>-%%DATADIR%%/glade/about.glade
>-%%DATADIR%%/glade/action_add.glade
>-%%DATADIR%%/glade/app_add.glade
>-%%DATADIR%%/glade/choose_file.glade
>-%%DATADIR%%/glade/config.glade
>-%%DATADIR%%/glade/list.glade
>-%%DATADIR%%/glade/rule_add.glade
> %%DATADIR%%/pixmaps/am.png
> %%DATADIR%%/pixmaps/bg.png
> %%DATADIR%%/pixmaps/by.png
>@@ -42,6 +34,15 @@
> %%DATADIR%%/pixmaps/us.png
> %%DATADIR%%/pixmaps/uz.png
> %%DATADIR%%/pixmaps/x3.png
>+%%DATADIR%%/ui/abbr_add.ui
>+%%DATADIR%%/ui/about.ui
>+%%DATADIR%%/ui/action_add.ui
>+%%DATADIR%%/ui/app_add.ui
>+%%DATADIR%%/ui/choose_file.ui
>+%%DATADIR%%/ui/config.ui
>+%%DATADIR%%/ui/list.ui
>+%%DATADIR%%/ui/rule_add.ui
>+%%DATADIR%%/ui/usr_action_add.ui
> share/icons/hicolor/16x16/apps/gxneur-am.png
> share/icons/hicolor/16x16/apps/gxneur-bg.png
> share/icons/hicolor/16x16/apps/gxneur-by.png
>Index: deskutils/xneur/Makefile
>===================================================================
>--- deskutils/xneur/Makefile	(revision 529164)
>+++ deskutils/xneur/Makefile	(working copy)
>@@ -2,26 +2,30 @@
> # $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
> 
>+BUILD_DEPENDS=	intltool-update:textproc/intltool
> LIB_DEPENDS=	libnotify.so:devel/libnotify \
> 		libpcre.so:devel/pcre
> 
> USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
>-		pkgconfig
>+		pkgconfig xorg
>+USE_GNOME=	gtk20
>+
>+USE_XORG=	xtst
>+
> 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
>Index: deskutils/xneur/distinfo
>===================================================================
>--- deskutils/xneur/distinfo	(revision 529164)
>+++ 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 529164)
>+++ deskutils/xneur/files/patch-etc-Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 = \
>Index: deskutils/xneur/files/patch-lib_main_program.c
>===================================================================
>--- deskutils/xneur/files/patch-lib_main_program.c	(nonexistent)
>+++ deskutils/xneur/files/patch-lib_main_program.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib/main/program.c.orig	2020-03-26 11:56:18 UTC
>++++ lib/main/program.c
>+@@ -445,7 +445,7 @@ static void program_process_input(struct _program *p)
>+ 			#ifdef WITH_ASPELL
>+ 					if (xconfig->handle->has_spell_checker[lang])
>+ 					{
>+-						loKg_message(DEBUG, _("      %s aspell dictionary loaded"), lang_name);
>++						log_message(DEBUG, _("      %s aspell dictionary loaded"), lang_name);
>+ 					}
>+ 					else
>+ 					{
>
>Property changes on: deskutils/xneur/files/patch-lib_main_program.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/xneur/pkg-plist
>===================================================================
>--- deskutils/xneur/pkg-plist	(revision 529164)
>+++ deskutils/xneur/pkg-plist	(working copy)
>@@ -1,29 +1,30 @@
> bin/xneur
> @sample %%ETCDIR%%/xneurrc.sample
>-lib/xneur/libxneur.so.17.0.0
>-lib/xneur/libxneur.so.17
>+include/xneur/list_char.h
>+include/xneur/xnconfig.h
>+include/xneur/xneur.h
>+lib/xneur/libxnconfig.so
>+lib/xneur/libxnconfig.so.20
>+lib/xneur/libxnconfig.so.20.0.0
> lib/xneur/libxneur.so
>-lib/xneur/libxnconfig.so.17.0.0
>-lib/xneur/libxnconfig.so.17
>-lib/xneur/libxnconfig.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
>-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/xneur/libxnstatistic.so
>+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
>@@ -87,16 +88,10 @@
> %%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

Flags:

fernape: maintainer-approval? (mizhka)

Actions: View | Diff

Attachments on bug 239859: 206545 | 206546 | 212747