From owner-svn-ports-head@freebsd.org Sun Apr 5 11:31:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CEF02B3BCC; Sun, 5 Apr 2020 11:31:01 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48wBLp6kS6z4TH1; Sun, 5 Apr 2020 11:30:58 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6C0FBF71; Sun, 5 Apr 2020 11:24:16 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 035BOGFi091519; Sun, 5 Apr 2020 11:24:16 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 035BOEH3091511; Sun, 5 Apr 2020 11:24:14 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202004051124.035BOEH3091511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Sun, 5 Apr 2020 11:24:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530768 - in head/deskutils: gxneur gxneur/files xneur xneur/files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/deskutils: gxneur gxneur/files xneur xneur/files X-SVN-Commit-Revision: 530768 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2020 11:31:01 -0000 Author: fernape Date: Sun Apr 5 11:24:14 2020 New Revision: 530768 URL: https://svnweb.freebsd.org/changeset/ports/530768 Log: deskutils/{g}xneur: Update to 0.20 PR: 239859 Submitted by: mizhka@gmail.com (maintainer) Added: head/deskutils/gxneur/files/ head/deskutils/gxneur/files/patch-src_xkb.h (contents, props changed) head/deskutils/xneur/files/patch-lib_main_program.c (contents, props changed) Modified: head/deskutils/gxneur/Makefile head/deskutils/gxneur/distinfo head/deskutils/gxneur/pkg-plist head/deskutils/xneur/Makefile head/deskutils/xneur/distinfo head/deskutils/xneur/files/patch-etc-Makefile.in head/deskutils/xneur/pkg-plist Modified: head/deskutils/gxneur/Makefile ============================================================================== --- head/deskutils/gxneur/Makefile Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/gxneur/Makefile Sun Apr 5 11:24:14 2020 (r530768) @@ -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,23 +13,21 @@ COMMENT= GTK frontend for XNeur keyboard layout switch 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 OPTIONS_SUB= yes 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 Modified: head/deskutils/gxneur/distinfo ============================================================================== --- head/deskutils/gxneur/distinfo Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/gxneur/distinfo Sun Apr 5 11:24:14 2020 (r530768) @@ -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 Added: head/deskutils/gxneur/files/patch-src_xkb.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gxneur/files/patch-src_xkb.h Sun Apr 5 11:24:14 2020 (r530768) @@ -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 + Modified: head/deskutils/gxneur/pkg-plist ============================================================================== --- head/deskutils/gxneur/pkg-plist Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/gxneur/pkg-plist Sun Apr 5 11:24:14 2020 (r530768) @@ -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 @@ share/applications/gxneur.desktop %%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 Modified: head/deskutils/xneur/Makefile ============================================================================== --- head/deskutils/xneur/Makefile Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/xneur/Makefile Sun Apr 5 11:24:14 2020 (r530768) @@ -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 Modified: head/deskutils/xneur/distinfo ============================================================================== --- head/deskutils/xneur/distinfo Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/xneur/distinfo Sun Apr 5 11:24:14 2020 (r530768) @@ -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 Modified: head/deskutils/xneur/files/patch-etc-Makefile.in ============================================================================== --- head/deskutils/xneur/files/patch-etc-Makefile.in Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/xneur/files/patch-etc-Makefile.in Sun Apr 5 11:24:14 2020 (r530768) @@ -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 = \ Added: head/deskutils/xneur/files/patch-lib_main_program.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xneur/files/patch-lib_main_program.c Sun Apr 5 11:24:14 2020 (r530768) @@ -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 + { Modified: head/deskutils/xneur/pkg-plist ============================================================================== --- head/deskutils/xneur/pkg-plist Sun Apr 5 11:22:34 2020 (r530767) +++ head/deskutils/xneur/pkg-plist Sun Apr 5 11:24:14 2020 (r530768) @@ -1,29 +1,30 @@ 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 @@ -87,16 +88,10 @@ include/xneur/xnconfig.h %%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