From b2eee0922013d431d5c21e4e237e1cb7273b40a0 Mon Sep 17 00:00:00 2001 From: nia Date: Wed, 1 Apr 2020 10:46:59 +0000 Subject: [PATCH] clipit: Update to 2.4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Facetoe (5): Add option to allow users to select entry on prefix. Add preferences for purging history after timeout. Add ability to purge history after timeout. Improve input matching feature. Always select first match when inputting text. L'Africain (4): Update fr_FR.po Update fr.po Update fr.po Update fr_FR.po Martin Lambertz (3): Rename configure.in to configure.ac Add missing call to PKG_PROG_PKG_CONFIG Fix autotool warnings Nikita Zlobin (2): Fix libappindicator detection with gtk3 Fix compilation Paweł Błaszczyk (5): Multiple calls to remove item from history don't work #21. Clear clipboard if first element from history is removed. Check if `pkg-config` is installed before using it. Remove trailing whitespace characters. Add optional support for GTK+3. Robert Antoni Buj Gelonch (3): Add Catalan language Update .tx/config Update Catalan translation Rogutės Sparnuotos (2): Silence glib warnings regarding GOptionFlags. Sveinn í Felli (1): Create is.po ZEN (5): Fixed work with utf8 strings Fixed comparison of string length by using the 'str_len' variable instead of 'string->len' Refactored the code from merge #30. Now by default working with string in utf8 mode. Added 'Remove all' action to context menu Clean up Resolved conflict with master anfabio (1): Update pt_BR.po mananaBanana (3): Updated Github link for project. Updated .gitignore: Ignore autogenerated file - compile Returning if string dooesn't exist on stdin. Fixes "Binding failed" warning Åke Engelbrektson (1): Update sv.po --- x11/clipit/Makefile | 24 +++++++++++++++--------- x11/clipit/PLIST | 3 ++- x11/clipit/distinfo | 11 +++++------ x11/clipit/patches/patch-src_Makefile.in | 15 --------------- 4 files changed, 22 insertions(+), 31 deletions(-) delete mode 100644 x11/clipit/patches/patch-src_Makefile.in diff --git a/x11/clipit/Makefile b/x11/clipit/Makefile index 509c75253a6d..dd6c91ead371 100644 --- a/x11/clipit/Makefile +++ b/x11/clipit/Makefile @@ -1,24 +1,27 @@ -# $NetBSD: Makefile,v 1.24 2020/03/10 22:11:11 wiz Exp $ -# +# $NetBSD: Makefile,v 1.25 2020/04/01 10:46:59 nia Exp $ -DISTNAME= clipit-1.4.2 -PKGREVISION= 19 +DISTNAME= clipit-1.4.4 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkclipit/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=CristianHenzel/} +GITHUB_PROJECT= ClipIt +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= khorben@NetBSD.org -#HOMEPAGE= http://clipit.rspwn.com/ +HOMEPAGE= https://github.com/CristianHenzel/ClipIt COMMENT= Lightweight, fully featured GTK+ clipboard manager LICENSE= gnu-gpl-v3 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} USE_TOOLS+= gmake -USE_TOOLS+= intltool msgfmt +USE_TOOLS+= intltool msgfmt msgmerge xgettext +USE_TOOLS+= aclocal autoconf autoreconf automake autopoint intltoolize USE_TOOLS+= pkg-config +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFiGURE_ARGS+= --disable-glibtest + BUILD_DEFS+= PKG_SYSCONFBASE EGDIR= ${PREFIX}/share/examples/clipit @@ -28,7 +31,10 @@ MAKE_DIRS= ${PKG_SYSCONFBASE}/xdg/autostart INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} +pre-configure: + cd ${WRKSRC} && ${SH} autogen.sh -.include "../../x11/gtk2/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/clipit/PLIST b/x11/clipit/PLIST index 0643457a87bd..1aa0a2798a79 100644 --- a/x11/clipit/PLIST +++ b/x11/clipit/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2012/12/07 01:41:58 khorben Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/04/01 10:46:59 nia Exp $ bin/clipit man/man1/clipit.1 share/applications/clipit.desktop share/examples/clipit/xdg/autostart/clipit-startup.desktop share/icons/hicolor/scalable/apps/clipit-trayicon.svg +share/locale/ca/LC_MESSAGES/clipit.mo share/locale/cs/LC_MESSAGES/clipit.mo share/locale/da/LC_MESSAGES/clipit.mo share/locale/de/LC_MESSAGES/clipit.mo diff --git a/x11/clipit/distinfo b/x11/clipit/distinfo index 0216d69b3480..04a890764ecd 100644 --- a/x11/clipit/distinfo +++ b/x11/clipit/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 03:28:26 agc Exp $ +$NetBSD: distinfo,v 1.3 2020/04/01 10:46:59 nia Exp $ -SHA1 (clipit-1.4.2.tar.gz) = e01d02a60efdac575f8c0f84ceef210be1466d1a -RMD160 (clipit-1.4.2.tar.gz) = 3ef589b5eab4bb2cb65b220d82d3ba06881dba84 -SHA512 (clipit-1.4.2.tar.gz) = 7c89d941cb879f00ecdbae1fbc9732f32b4f03bfb06b86af33d2a30e68a2ecb76cebc0bc290a676ccfe5a017020e9dc64de310f5d328d0844558cc62299dfe46 -Size (clipit-1.4.2.tar.gz) = 284614 bytes -SHA1 (patch-src_Makefile.in) = 8aac206ff8a32044fd926d8808399fe70b863b92 +SHA1 (clipit-1.4.4.tar.gz) = 234286dc87bacaf4cbd5a5d081b71814d521d054 +RMD160 (clipit-1.4.4.tar.gz) = 68a900bbe0cb35bb523142c3a6a2f2d245385974 +SHA512 (clipit-1.4.4.tar.gz) = 09d83aa6107c85a7fa604bee40cf45b4096b2db316f1e3286b8919d143d04cd2c4ba2293d563ff2b2e03d7e688a217149e24c14acbc9509146479e8532b3a623 +Size (clipit-1.4.4.tar.gz) = 99090 bytes diff --git a/x11/clipit/patches/patch-src_Makefile.in b/x11/clipit/patches/patch-src_Makefile.in deleted file mode 100644 index 7009d7477e09..000000000000 --- a/x11/clipit/patches/patch-src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2012/12/07 01:41:58 khorben Exp $ - -Fixes build on MacOS X - ---- src/Makefile.in.orig 2012-04-04 07:53:01.000000000 +0000 -+++ src/Makefile.in -@@ -226,7 +226,7 @@ AM_CPPFLAGS = -I$(top_srcdir) - AM_CFLAGS = -Wall -g -DCLIPITLOCALEDIR=\""$(clipitlocaledir)"\" - INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include - LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) $(X11_LIBS) --AM_LDFLAGS = -Wl,--as-needed -+#AM_LDFLAGS = -Wl,--as-needed - DISTCLEANFILES = *.bak *.log *~ .deps/*.P - clipit_SOURCES = main.c main.h \ - utils.c utils.h \