Attachment 162016 Details for Bug 203762 – xfe.diff

[patch] xfe.diff

xfe.diff (text/plain), 5.30 KB, created by Walter Schwarzenfeld on 2015-10-14 07:58:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2015-10-14 07:58:58 UTC

Size: 5.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 399232)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xfe
>-PORTVERSION=	1.40
>+PORTVERSION=	1.40.1
> CATEGORIES=	x11-fm
> MASTER_SITES=	SF
> 
>@@ -16,13 +16,15 @@
> OPTIONS_DEFINE=	NLS
> 
> OPTIONS_SUB=	yes
>-NLS_CONFIGURE_ENABLE=	nls
> 
>-USES=		desktop-file-utils gettext gmake pathfix
>+USES=		desktop-file-utils gmake pathfix
> USE_XORG=	xft
> USE_GNOME=	intltool
> GNU_CONFIGURE=	yes
> 
>+NLS_USES=	gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+
> CFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -pthread
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 399232)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xfe-1.40.tar.gz) = 2b476f15beff1a1ce85dd4ce6559bb7ceca78b866c63fb4986456862a36862a8
>-SIZE (xfe-1.40.tar.gz) = 2574477
>+SHA256 (xfe-1.40.1.tar.gz) = ec3d9495bb329c6199f6265dbfb514ffd3bdb8801e36ccc4e8fac6cea15bcc71
>+SIZE (xfe-1.40.1.tar.gz) = 2627754
>Index: files/patch-src__main.cpp
>===================================================================
>--- files/patch-src__main.cpp	(revision 399232)
>+++ files/patch-src__main.cpp	(working copy)
>@@ -1,19 +0,0 @@
>---- src/main.cpp.orig
>-+++ src/main.cpp
>-@@ -270,6 +270,7 @@
>- 	const char *vdrname = "Xfe";
>- 	int i;
>- 	FXbool loadicons;
>-+	FXString cmd;
>- 	FXString startfiledir1="";
>- 	FXString startdir2="";
>- 	FXbool iconic=false;
>-@@ -307,7 +308,7 @@
>-     //   - if dpkg exists then the system uses deb packages
>-     //   - else if rpm exists, then the system uses rpm packages
>- 	//   - else another (unsupported) package manager is used
>--	FXString cmd, str;
>-+	FXString str;
>- 
>- 	cmd="dpkg --version";
>- 	str=getCommandOutput(cmd);
>Index: files/patch-xfeutils_cpp
>===================================================================
>--- files/patch-xfeutils_cpp	(revision 0)
>+++ files/patch-xfeutils_cpp	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/xfeutils.cpp.orig	2015-09-07 15:32:21 UTC
>++++ src/xfeutils.cpp
>+@@ -563,36 +563,6 @@ int lstatmt(const char* filename, struct
>+ #endif
>+ 
>+ 
>+-// Safe strcpy function (Public domain, by C.B. Falconer)
>+-// The destination string is always null terminated
>+-// Size sz must be equal to strlen(src)+1
>+-size_t strlcpy(char* dst, const char* src, size_t sz)
>+-{
>+-	const char *start = src;
>+-
>+-	if (src && sz--)
>+-	{
>+-		while ((*dst++ = *src))
>+-			if (sz--)
>+-				src++;
>+-			else
>+-		 	{
>+-            	*(--dst) = '\0';
>+-            	break;
>+-         	}
>+-   	}
>+-   	if (src)
>+-   	{
>+-      	while (*src++)
>+-			continue;
>+-      	return src - start - 1;
>+-   	}
>+-   	else if (sz)
>+-		*dst = '\0';
>+-	return 0;
>+-}
>+-
>+-
>+ // Safe strcat function (Public domain, by C.B. Falconer)
>+ // The destination string is always null terminated
>+ size_t strlcat(char* dst, const char* src, size_t sz)
>
>Property changes on: files/patch-xfeutils_cpp
>___________________________________________________________________
>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:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 399232)
>+++ pkg-plist	(working copy)
>@@ -10,29 +10,29 @@
> share/applications/xfi.desktop
> share/applications/xfp.desktop
> share/applications/xfw.desktop
>-%%NLS%%share/locale/bs/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/ca/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/cs/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/da/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/el/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/es_AR/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/es_CO/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/ja/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/no/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/pl/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/pt_PT/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/sv/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/tr/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfe.mo
>-%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfe.mo
>+share/locale/bs/LC_MESSAGES/xfe.mo
>+share/locale/ca/LC_MESSAGES/xfe.mo
>+share/locale/cs/LC_MESSAGES/xfe.mo
>+share/locale/da/LC_MESSAGES/xfe.mo
>+share/locale/de/LC_MESSAGES/xfe.mo
>+share/locale/el/LC_MESSAGES/xfe.mo
>+share/locale/es/LC_MESSAGES/xfe.mo
>+share/locale/es_AR/LC_MESSAGES/xfe.mo
>+share/locale/es_CO/LC_MESSAGES/xfe.mo
>+share/locale/fr/LC_MESSAGES/xfe.mo
>+share/locale/hu/LC_MESSAGES/xfe.mo
>+share/locale/it/LC_MESSAGES/xfe.mo
>+share/locale/ja/LC_MESSAGES/xfe.mo
>+share/locale/nl/LC_MESSAGES/xfe.mo
>+share/locale/no/LC_MESSAGES/xfe.mo
>+share/locale/pl/LC_MESSAGES/xfe.mo
>+share/locale/pt_BR/LC_MESSAGES/xfe.mo
>+share/locale/pt_PT/LC_MESSAGES/xfe.mo
>+share/locale/ru/LC_MESSAGES/xfe.mo
>+share/locale/sv/LC_MESSAGES/xfe.mo
>+share/locale/tr/LC_MESSAGES/xfe.mo
>+share/locale/zh_CN/LC_MESSAGES/xfe.mo
>+share/locale/zh_TW/LC_MESSAGES/xfe.mo
> share/pixmaps/xfe.png
> share/pixmaps/xfe.xpm
> share/pixmaps/xfi.png

Actions: View | Diff

Attachments on bug 203762: 162016