Attachment #185024 for bug #221073

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gloox	4	PORTNAME= gloox
5	PORTVERSION= 1.0.18	5	PORTVERSION= 1.0.20
6	CATEGORIES= net-im	6	CATEGORIES= net-im
7	MASTER_SITES= http://camaya.net/download/	7	MASTER_SITES= http://camaya.net/download/
8		8

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486377427	1	TIMESTAMP = 1501863237
2	SHA256 (gloox-1.0.18.tar.bz2) = 16730e7fd4679e098a6d6c1f94ee72aca825e8f40e6744f5921ac32fdf22548e	2	SHA256 (gloox-1.0.20.tar.bz2) = 0243086c0f4f0440d6d8e55705f83249a4463a1d75a034be42b5312e8886dea8
3	SIZE (gloox-1.0.18.tar.bz2) = 700080	3	SIZE (gloox-1.0.20.tar.bz2) = 701114

Lines 1-4 Link Here

(-)files/patch-src__examples__e2ee_client.cpp (-1 / +1 lines)
1	--- src/examples/e2ee_client.cpp.orig 2015-08-11 14:37:51 UTC	1	--- src/examples/e2ee_client.cpp.orig 2017-02-21 12:32:57 UTC
2	+++ src/examples/e2ee_client.cpp	2	+++ src/examples/e2ee_client.cpp
3	@@ -24,8 +24,8 @@	3	@@ -24,8 +24,8 @@
4	using namespace gloox;	4	using namespace gloox;

Lines 1-4 Link Here

(-)files/patch-src__examples__e2ee_server.cpp (-1 / +1 lines)
1	--- src/examples/e2ee_server.cpp.orig 2015-08-11 14:37:51 UTC	1	--- src/examples/e2ee_server.cpp.orig 2017-02-21 12:32:57 UTC
2	+++ src/examples/e2ee_server.cpp	2	+++ src/examples/e2ee_server.cpp
3	@@ -24,8 +24,8 @@	3	@@ -24,8 +24,8 @@
4	using namespace gloox;	4	using namespace gloox;

Lines 1-4 Link Here

(-)files/patch-src__examples__ft_recv.cpp (-1 / +1 lines)
1	--- src/examples/ft_recv.cpp.orig 2015-08-11 14:37:51 UTC	1	--- src/examples/ft_recv.cpp.orig 2017-02-21 12:32:57 UTC
2	+++ src/examples/ft_recv.cpp	2	+++ src/examples/ft_recv.cpp
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@
4	using namespace gloox;	4	using namespace gloox;

Lines 1-4 Link Here

(-)files/patch-src__examples__linklocal_example.cpp (-1 / +1 lines)
1	--- src/examples/linklocal_example.cpp.orig 2015-08-11 14:37:51 UTC	1	--- src/examples/linklocal_example.cpp.orig 2017-02-21 12:32:57 UTC
2	+++ src/examples/linklocal_example.cpp	2	+++ src/examples/linklocal_example.cpp
3	@@ -111,15 +111,15 @@ class LinkLocalExample : public LinkLoca	3	@@ -111,15 +111,15 @@ class LinkLocalExample : public LinkLoca
4	for( ; it != services.end(); ++it )	4	for( ; it != services.end(); ++it )

Lines 1-4 Link Here

(-)files/patch-src__linklocalclient.cpp (-1 / +1 lines)
1	--- src/linklocalclient.cpp.orig 2015-08-11 14:37:51 UTC	1	--- src/linklocalclient.cpp.orig 2017-02-21 12:32:57 UTC
2	+++ src/linklocalclient.cpp	2	+++ src/linklocalclient.cpp
3	@@ -55,7 +55,7 @@ namespace gloox	3	@@ -55,7 +55,7 @@ namespace gloox
4	bool Client::connect( const std::string& service, const std::string& type,	4	bool Client::connect( const std::string& service, const std::string& type,

Lines 1-4 Link Here

(-)files/patch-src__linklocalmanager.cpp (-1 / +1 lines)
1	--- src/linklocalmanager.cpp.orig 2015-08-11 14:37:51 UTC	1	--- src/linklocalmanager.cpp.orig 2017-02-21 12:32:58 UTC
2	+++ src/linklocalmanager.cpp	2	+++ src/linklocalmanager.cpp
3	@@ -197,7 +197,7 @@ namespace gloox	3	@@ -197,7 +197,7 @@ namespace gloox
4		4




--- src/examples/adhoc_example.cpp.orig	2017-08-04 16:24:08 UTC
+++ src/examples/adhoc_example.cpp
@@ -20,8 +20,8 @@
 #include "../logsink.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/annotations_example.cpp.orig	2017-08-04 16:25:40 UTC
+++ src/examples/annotations_example.cpp
@@ -17,8 +17,8 @@
 #include "../annotations.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/bookmarkstorage_example.cpp.orig	2017-08-04 16:25:23 UTC
+++ src/examples/bookmarkstorage_example.cpp
@@ -17,8 +17,8 @@
 #include "../bookmarkstorage.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/component_example.cpp.orig	2017-08-04 16:25:10 UTC
+++ src/examples/component_example.cpp
@@ -17,8 +17,8 @@
 #include "../disco.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/disco_example.cpp.orig	2017-08-04 16:23:56 UTC
+++ src/examples/disco_example.cpp
@@ -19,8 +19,8 @@
 #include "../loghandler.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/privacylist_example.cpp.orig	2017-08-04 16:26:10 UTC
+++ src/examples/privacylist_example.cpp
@@ -17,8 +17,8 @@
 #include "../privacymanager.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/privatexml_example.cpp.orig	2017-08-04 16:24:56 UTC
+++ src/examples/privatexml_example.cpp
@@ -17,8 +17,8 @@
 #include "../privatexml.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/register_example.cpp.orig	2017-08-04 16:23:26 UTC
+++ src/examples/register_example.cpp
@@ -17,8 +17,8 @@
 #include "../loghandler.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/reset_example.cpp.orig	2017-08-04 16:27:13 UTC
+++ src/examples/reset_example.cpp
@@ -18,8 +18,8 @@
 #include "../logsink.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/roster_example.cpp.orig	2017-08-04 16:24:40 UTC
+++ src/examples/roster_example.cpp
@@ -22,8 +22,8 @@
 #include "../presence.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]




--- src/examples/vcard_example.cpp.orig	2017-08-04 16:26:37 UTC
+++ src/examples/vcard_example.cpp
@@ -21,8 +21,8 @@
 #include "../vcard.h"
 using namespace gloox;
 
-#include <stdio.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include <string>
 
 #include <cstdio> // [s]print[f]

Lines 150-155 Link Here

(-)pkg-plist (-2 / +2 lines)
150	include/gloox/xhtmlim.h	150	include/gloox/xhtmlim.h
151	lib/libgloox.a	151	lib/libgloox.a
152	lib/libgloox.so	152	lib/libgloox.so
153	lib/libgloox.so.15	153	lib/libgloox.so.17
154	lib/libgloox.so.15.0.0	154	lib/libgloox.so.17.0.0
155	libdata/pkgconfig/gloox.pc	155	libdata/pkgconfig/gloox.pc

Return to bug 221073

Line 0 Link Here

(-)files/patch-src_examples_adhoc__example.cpp (+13 lines)
	1	--- src/examples/adhoc_example.cpp.orig 2017-08-04 16:24:08 UTC
	2	+++ src/examples/adhoc_example.cpp
	3	@@ -20,8 +20,8 @@
	4	#include "../logsink.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_annotations__example.cpp (+13 lines)
	1	--- src/examples/annotations_example.cpp.orig 2017-08-04 16:25:40 UTC
	2	+++ src/examples/annotations_example.cpp
	3	@@ -17,8 +17,8 @@
	4	#include "../annotations.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_bookmarkstorage__example.cpp (+13 lines)
	1	--- src/examples/bookmarkstorage_example.cpp.orig 2017-08-04 16:25:23 UTC
	2	+++ src/examples/bookmarkstorage_example.cpp
	3	@@ -17,8 +17,8 @@
	4	#include "../bookmarkstorage.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_component__example.cpp (+13 lines)
	1	--- src/examples/component_example.cpp.orig 2017-08-04 16:25:10 UTC
	2	+++ src/examples/component_example.cpp
	3	@@ -17,8 +17,8 @@
	4	#include "../disco.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_disco__example.cpp (+13 lines)
	1	--- src/examples/disco_example.cpp.orig 2017-08-04 16:23:56 UTC
	2	+++ src/examples/disco_example.cpp
	3	@@ -19,8 +19,8 @@
	4	#include "../loghandler.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_privacylist__example.cpp (+13 lines)
	1	--- src/examples/privacylist_example.cpp.orig 2017-08-04 16:26:10 UTC
	2	+++ src/examples/privacylist_example.cpp
	3	@@ -17,8 +17,8 @@
	4	#include "../privacymanager.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_privatexml__example.cpp (+13 lines)
	1	--- src/examples/privatexml_example.cpp.orig 2017-08-04 16:24:56 UTC
	2	+++ src/examples/privatexml_example.cpp
	3	@@ -17,8 +17,8 @@
	4	#include "../privatexml.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_register__example.cpp (+13 lines)
	1	--- src/examples/register_example.cpp.orig 2017-08-04 16:23:26 UTC
	2	+++ src/examples/register_example.cpp
	3	@@ -17,8 +17,8 @@
	4	#include "../loghandler.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_reset__example.cpp (+13 lines)
	1	--- src/examples/reset_example.cpp.orig 2017-08-04 16:27:13 UTC
	2	+++ src/examples/reset_example.cpp
	3	@@ -18,8 +18,8 @@
	4	#include "../logsink.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_roster__example.cpp (+13 lines)
	1	--- src/examples/roster_example.cpp.orig 2017-08-04 16:24:40 UTC
	2	+++ src/examples/roster_example.cpp
	3	@@ -22,8 +22,8 @@
	4	#include "../presence.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]

Line 0 Link Here

(-)files/patch-src_examples_vcard__example.cpp (+13 lines)
	1	--- src/examples/vcard_example.cpp.orig 2017-08-04 16:26:37 UTC
	2	+++ src/examples/vcard_example.cpp
	3	@@ -21,8 +21,8 @@
	4	#include "../vcard.h"
	5	using namespace gloox;
	6
	7	-#include <stdio.h>
	8	-#include <locale.h>
	9	+#include <ctime>
	10	+#include <clocale>
	11	#include <string>
	12
	13	#include <cstdio> // [s]print[f]