Attachment 159994 Details for Bug 201875 – Patch2.diff

[patch] Patch2.diff

patch-parcellite.diff (text/plain), 5.15 KB, created by Andriy Voskoboinyk on 2015-08-18 22:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-08-18 22:39:29 UTC

Size: 5.15 KB

patch

obsolete

>Index: deskutils/parcellite/Makefile
>===================================================================
>--- deskutils/parcellite/Makefile	(revision 394657)
>+++ deskutils/parcellite/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	parcellite
>-PORTVERSION=	1.1.7
>-PORTREVISION=	1
>+PORTVERSION=	1.1.9
> PORTEPOCH=	1
> CATEGORIES=	deskutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>@@ -12,38 +11,53 @@
> COMMENT=	Lightweight GTK+ clipboard manager
> 
> LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
>-
>-USES=		gettext-tools gmake pkgconfig
>+USES=		pkgconfig
> GNU_CONFIGURE=	yes
>-USE_GNOME=	gtk20 intltool
>+USE_GNOME=	glib20 gtk20 pango
>+USE_XORG=	x11
>+CONFIGURE_ARGS+=--disable-appindicator
> 
> PORTDOCS=	AUTHORS ChangeLog README
> 
>+CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> LIBS+=		-lgio-2.0
> 
>-OPTIONS_DEFINE= DOCS NLS
>+OPTIONS_DEFINE=	DOCS NLS
> OPTIONS_SUB=	yes
> 
>-NLS_CONFIGURE_ENABLE=	nls
>-NLS_USES=	gettext-runtime
>+NLS_USES=	gmake gettext
>+NLS_USE=	GNOME=intltool
>+NLS_USES_OFF=	autoreconf
>+NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extrapatch-configure.ac
> NLS_LIBS=	-lintl
> 
> SUB_FILES=	pkg-message
> 
>-.include <bsd.port.options.mk>
>+post-patch-NLS-on:
>+	@${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
>+		${WRKSRC}/po/Makefile.in.in
> 
>+post-patch-NLS-off:
>+	@${REINPLACE_CMD} -e 's|@INTLTOOL_DESKTOP_RULE@||' \
>+		${WRKSRC}/data/Makefile.am
>+	@${REINPLACE_CMD} -e 's|_Name|Name|' -e 's|_Comment|Comment|' \
>+		${WRKSRC}/data/parcellite-startup.desktop.in \
>+		${WRKSRC}/data/parcellite.desktop.in
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's|"/proc/|"/compat/linux/proc/|; \
>-		s|"/proc"|"/compat/linux/proc"|' \
>+	@${REINPLACE_CMD} -e 's|/proc|/compat/linux/proc|g' \
> 		${WRKSRC}/src/utils.c
>-.if ${PORT_OPTIONS:MNLS}
>-	@${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
>-		${WRKSRC}/po/Makefile.in.in
>-.endif
> 
>+pre-build-NLS-off:
>+	@${REINPLACE_CMD} -e '/SUBDIRS = /s| po||' ${WRKSRC}/Makefile
>+	${MV} ${WRKSRC}/data/parcellite-startup.desktop.in \
>+		${WRKSRC}/data/parcellite-startup.desktop
>+	${MV} ${WRKSRC}/data/parcellite.desktop.in \
>+		${WRKSRC}/data/parcellite.desktop
>+
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>Index: deskutils/parcellite/distinfo
>===================================================================
>--- deskutils/parcellite/distinfo	(revision 394657)
>+++ deskutils/parcellite/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (parcellite-1.1.7.tar.gz) = 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f
>-SIZE (parcellite-1.1.7.tar.gz) = 723826
>+SHA256 (parcellite-1.1.9.tar.gz) = cba89585082eebbe848ac1c0023cc71a0184c0db24ebc5f8a21039e46d7f11d4
>+SIZE (parcellite-1.1.9.tar.gz) = 720177
>Index: deskutils/parcellite/files/extrapatch-configure.ac
>===================================================================
>--- deskutils/parcellite/files/extrapatch-configure.ac	(revision 0)
>+++ deskutils/parcellite/files/extrapatch-configure.ac	(working copy)
>@@ -0,0 +1,27 @@
>+--- configure.ac.orig	2014-10-01 14:43:09 UTC
>++++ configure.ac
>+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
>+ AC_SUBST(GETTEXT_PACKAGE)
>+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
>+ 
>+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
>+-AM_GLIB_GNU_GETTEXT()
>+-AC_PROG_INTLTOOL([0.23])
>+-
>+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
>+ AC_SUBST(parcellitelocaledir)
>+ 
>+-AM_GNU_GETTEXT([external])
>+-
>+ # -------------------------------------------------------------------------------
>+ # Main settings.
>+ # -------------------------------------------------------------------------------
>+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
>+ # -------------------------------------------------------------------------------
>+ # Checks for header files.
>+ # -------------------------------------------------------------------------------
>+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
>++AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
>+ 
>+ # -------------------------------------------------------------------------------
>+ # Checks for typedefs, structures, and compiler characteristics.
>
>Property changes on: deskutils/parcellite/files/extrapatch-configure.ac
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: deskutils/parcellite/files/patch-src__main.c
>===================================================================
>--- deskutils/parcellite/files/patch-src__main.c	(revision 394657)
>+++ deskutils/parcellite/files/patch-src__main.c	(working copy)
>@@ -1,10 +0,0 @@
>---- ./src/main.c.orig	2013-10-15 19:39:04.000000000 +0200
>-+++ ./src/main.c	2013-12-31 15:12:54.000000000 +0100
>-@@ -2097,6 +2097,7 @@
>- 	}
>- 	clip_lock= g_mutex_new();
>- 	hist_lock= g_mutex_new();
>-+	g_mutex_trylock(clip_lock);
>- 	g_mutex_unlock(clip_lock);
>- 
>-   show_icon=!get_pref_int32("no_icon");

Actions: View | Diff

Attachments on bug 201875: 159216 | 159217 | 159218 | 159219 | 159220 | 159221 | 159994 | 159995 | 159996 | 159997