Attachment #162016 for bug #203762

View | Details | Raw Unified | Return to bug 203762
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	xfe
PORTVERSION=	1.40.1
CATEGORIES=	x11-fm
MASTER_SITES=	SF


OPTIONS_DEFINE=	NLS

OPTIONS_SUB=	yes
NLS_CONFIGURE_ENABLE=	nls

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


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xfe-1.40.tar.gz) = 2b476f15beff1a1ce85dd4ce6559bb7ceca78b866c63fb4986456862a36862a8	1	SHA256 (xfe-1.40.1.tar.gz) = ec3d9495bb329c6199f6265dbfb514ffd3bdb8801e36ccc4e8fac6cea15bcc71
2	SIZE (xfe-1.40.tar.gz) = 2574477	2	SIZE (xfe-1.40.1.tar.gz) = 2627754




--- 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);




--- 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)




share/applications/xfi.desktop
share/applications/xfp.desktop
share/applications/xfw.desktop
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

Return to bug 203762

Lines 2-8 Link Here

(-)Makefile (-3 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xfe	4	PORTNAME= xfe
5	PORTVERSION= 1.40	5	PORTVERSION= 1.40.1
6	CATEGORIES= x11-fm	6	CATEGORIES= x11-fm
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8
Lines 16-28 Link Here
16	OPTIONS_DEFINE= NLS	16	OPTIONS_DEFINE= NLS
17		17
18	OPTIONS_SUB= yes	18	OPTIONS_SUB= yes
19	NLS_CONFIGURE_ENABLE= nls
20		19
21	USES= desktop-file-utils gettext gmake pathfix	20	USES= desktop-file-utils gmake pathfix
22	USE_XORG= xft	21	USE_XORG= xft
23	USE_GNOME= intltool	22	USE_GNOME= intltool
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25		24
		25	NLS_USES= gettext
		26	NLS_CONFIGURE_ENABLE= nls
		27
26	CFLAGS+= -I${LOCALBASE}/include	28	CFLAGS+= -I${LOCALBASE}/include
27	LDFLAGS+= -L${LOCALBASE}/lib -pthread	29	LDFLAGS+= -L${LOCALBASE}/lib -pthread
28		30

Lines 1-19 Link Here

(-)files/patch-src__main.cpp (-19 lines)
1	--- src/main.cpp.orig
2	+++ src/main.cpp
3	@@ -270,6 +270,7 @@
4	const char *vdrname = "Xfe";
5	int i;
6	FXbool loadicons;
7	+ FXString cmd;
8	FXString startfiledir1="";
9	FXString startdir2="";
10	FXbool iconic=false;
11	@@ -307,7 +308,7 @@
12	// - if dpkg exists then the system uses deb packages
13	// - else if rpm exists, then the system uses rpm packages
14	// - else another (unsupported) package manager is used
15	- FXString cmd, str;
16	+ FXString str;
17
18	cmd="dpkg --version";
19	str=getCommandOutput(cmd);

Line 0 Link Here

(-)files/patch-xfeutils_cpp (+39 lines)
	1	--- src/xfeutils.cpp.orig 2015-09-07 15:32:21 UTC
	2	+++ src/xfeutils.cpp
	3	@@ -563,36 +563,6 @@ int lstatmt(const char* filename, struct
	4	#endif
	5
	6
	7	-// Safe strcpy function (Public domain, by C.B. Falconer)
	8	-// The destination string is always null terminated
	9	-// Size sz must be equal to strlen(src)+1
	10	-size_t strlcpy(char* dst, const char* src, size_t sz)
	11	-{
	12	- const char *start = src;
	13	-
	14	- if (src && sz--)
	15	- {
	16	- while ((dst++ = src))
	17	- if (sz--)
	18	- src++;
	19	- else
	20	- {
	21	- *(--dst) = '\0';
	22	- break;
	23	- }
	24	- }
	25	- if (src)
	26	- {
	27	- while (*src++)
	28	- continue;
	29	- return src - start - 1;
	30	- }
	31	- else if (sz)
	32	- *dst = '\0';
	33	- return 0;
	34	-}
	35	-
	36	-
	37	// Safe strcat function (Public domain, by C.B. Falconer)
	38	// The destination string is always null terminated
	39	size_t strlcat(char* dst, const char* src, size_t sz)

Lines 10-38 Link Here

(-)pkg-plist (-23 / +23 lines)
10	share/applications/xfi.desktop	10	share/applications/xfi.desktop
11	share/applications/xfp.desktop	11	share/applications/xfp.desktop
12	share/applications/xfw.desktop	12	share/applications/xfw.desktop
13	%%NLS%%share/locale/bs/LC_MESSAGES/xfe.mo	13	share/locale/bs/LC_MESSAGES/xfe.mo
14	%%NLS%%share/locale/ca/LC_MESSAGES/xfe.mo	14	share/locale/ca/LC_MESSAGES/xfe.mo
15	%%NLS%%share/locale/cs/LC_MESSAGES/xfe.mo	15	share/locale/cs/LC_MESSAGES/xfe.mo
16	%%NLS%%share/locale/da/LC_MESSAGES/xfe.mo	16	share/locale/da/LC_MESSAGES/xfe.mo
17	%%NLS%%share/locale/de/LC_MESSAGES/xfe.mo	17	share/locale/de/LC_MESSAGES/xfe.mo
18	%%NLS%%share/locale/el/LC_MESSAGES/xfe.mo	18	share/locale/el/LC_MESSAGES/xfe.mo
19	%%NLS%%share/locale/es/LC_MESSAGES/xfe.mo	19	share/locale/es/LC_MESSAGES/xfe.mo
20	%%NLS%%share/locale/es_AR/LC_MESSAGES/xfe.mo	20	share/locale/es_AR/LC_MESSAGES/xfe.mo
21	%%NLS%%share/locale/es_CO/LC_MESSAGES/xfe.mo	21	share/locale/es_CO/LC_MESSAGES/xfe.mo
22	%%NLS%%share/locale/fr/LC_MESSAGES/xfe.mo	22	share/locale/fr/LC_MESSAGES/xfe.mo
23	%%NLS%%share/locale/hu/LC_MESSAGES/xfe.mo	23	share/locale/hu/LC_MESSAGES/xfe.mo
24	%%NLS%%share/locale/it/LC_MESSAGES/xfe.mo	24	share/locale/it/LC_MESSAGES/xfe.mo
25	%%NLS%%share/locale/ja/LC_MESSAGES/xfe.mo	25	share/locale/ja/LC_MESSAGES/xfe.mo
26	%%NLS%%share/locale/nl/LC_MESSAGES/xfe.mo	26	share/locale/nl/LC_MESSAGES/xfe.mo
27	%%NLS%%share/locale/no/LC_MESSAGES/xfe.mo	27	share/locale/no/LC_MESSAGES/xfe.mo
28	%%NLS%%share/locale/pl/LC_MESSAGES/xfe.mo	28	share/locale/pl/LC_MESSAGES/xfe.mo
29	%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfe.mo	29	share/locale/pt_BR/LC_MESSAGES/xfe.mo
30	%%NLS%%share/locale/pt_PT/LC_MESSAGES/xfe.mo	30	share/locale/pt_PT/LC_MESSAGES/xfe.mo
31	%%NLS%%share/locale/ru/LC_MESSAGES/xfe.mo	31	share/locale/ru/LC_MESSAGES/xfe.mo
32	%%NLS%%share/locale/sv/LC_MESSAGES/xfe.mo	32	share/locale/sv/LC_MESSAGES/xfe.mo
33	%%NLS%%share/locale/tr/LC_MESSAGES/xfe.mo	33	share/locale/tr/LC_MESSAGES/xfe.mo
34	%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfe.mo	34	share/locale/zh_CN/LC_MESSAGES/xfe.mo
35	%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfe.mo	35	share/locale/zh_TW/LC_MESSAGES/xfe.mo
36	share/pixmaps/xfe.png	36	share/pixmaps/xfe.png
37	share/pixmaps/xfe.xpm	37	share/pixmaps/xfe.xpm
38	share/pixmaps/xfi.png	38	share/pixmaps/xfi.png