Attachment 185024 Details for Bug 221073 – patch-fixed

[patch] patch-fixed

gloox-1.0.20.diff (text/plain), 14.20 KB, created by Demetris Procopiou on 2017-08-04 17:31:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Demetris Procopiou

Created: 2017-08-04 17:31:03 UTC

Size: 14.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 447344)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gloox
>-PORTVERSION=	1.0.18
>+PORTVERSION=	1.0.20
> CATEGORIES=	net-im
> MASTER_SITES=	http://camaya.net/download/
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 447344)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1486377427
>-SHA256 (gloox-1.0.18.tar.bz2) = 16730e7fd4679e098a6d6c1f94ee72aca825e8f40e6744f5921ac32fdf22548e
>-SIZE (gloox-1.0.18.tar.bz2) = 700080
>+TIMESTAMP = 1501863237
>+SHA256 (gloox-1.0.20.tar.bz2) = 0243086c0f4f0440d6d8e55705f83249a4463a1d75a034be42b5312e8886dea8
>+SIZE (gloox-1.0.20.tar.bz2) = 701114
>Index: files/patch-src__examples__e2ee_client.cpp
>===================================================================
>--- files/patch-src__examples__e2ee_client.cpp	(revision 447344)
>+++ files/patch-src__examples__e2ee_client.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/examples/e2ee_client.cpp.orig	2015-08-11 14:37:51 UTC
>+--- src/examples/e2ee_client.cpp.orig	2017-02-21 12:32:57 UTC
> +++ src/examples/e2ee_client.cpp
> @@ -24,8 +24,8 @@
>  using namespace gloox;
>Index: files/patch-src__examples__e2ee_server.cpp
>===================================================================
>--- files/patch-src__examples__e2ee_server.cpp	(revision 447344)
>+++ files/patch-src__examples__e2ee_server.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/examples/e2ee_server.cpp.orig	2015-08-11 14:37:51 UTC
>+--- src/examples/e2ee_server.cpp.orig	2017-02-21 12:32:57 UTC
> +++ src/examples/e2ee_server.cpp
> @@ -24,8 +24,8 @@
>  using namespace gloox;
>Index: files/patch-src__examples__ft_recv.cpp
>===================================================================
>--- files/patch-src__examples__ft_recv.cpp	(revision 447344)
>+++ files/patch-src__examples__ft_recv.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/examples/ft_recv.cpp.orig	2015-08-11 14:37:51 UTC
>+--- src/examples/ft_recv.cpp.orig	2017-02-21 12:32:57 UTC
> +++ src/examples/ft_recv.cpp
> @@ -23,7 +23,7 @@
>  using namespace gloox;
>Index: files/patch-src__examples__linklocal_example.cpp
>===================================================================
>--- files/patch-src__examples__linklocal_example.cpp	(revision 447344)
>+++ files/patch-src__examples__linklocal_example.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/examples/linklocal_example.cpp.orig	2015-08-11 14:37:51 UTC
>+--- src/examples/linklocal_example.cpp.orig	2017-02-21 12:32:57 UTC
> +++ src/examples/linklocal_example.cpp
> @@ -111,15 +111,15 @@ class LinkLocalExample : public LinkLoca
>        for( ; it != services.end(); ++it )
>Index: files/patch-src__linklocalclient.cpp
>===================================================================
>--- files/patch-src__linklocalclient.cpp	(revision 447344)
>+++ files/patch-src__linklocalclient.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/linklocalclient.cpp.orig	2015-08-11 14:37:51 UTC
>+--- src/linklocalclient.cpp.orig	2017-02-21 12:32:57 UTC
> +++ src/linklocalclient.cpp
> @@ -55,7 +55,7 @@ namespace gloox
>      bool Client::connect( const std::string& service, const std::string& type,
>Index: files/patch-src__linklocalmanager.cpp
>===================================================================
>--- files/patch-src__linklocalmanager.cpp	(revision 447344)
>+++ files/patch-src__linklocalmanager.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/linklocalmanager.cpp.orig	2015-08-11 14:37:51 UTC
>+--- src/linklocalmanager.cpp.orig	2017-02-21 12:32:58 UTC
> +++ src/linklocalmanager.cpp
> @@ -197,7 +197,7 @@ namespace gloox
>  
>Index: files/patch-src_examples_adhoc__example.cpp
>===================================================================
>--- files/patch-src_examples_adhoc__example.cpp	(nonexistent)
>+++ files/patch-src_examples_adhoc__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_adhoc__example.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: files/patch-src_examples_annotations__example.cpp
>===================================================================
>--- files/patch-src_examples_annotations__example.cpp	(nonexistent)
>+++ files/patch-src_examples_annotations__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_annotations__example.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: files/patch-src_examples_bookmarkstorage__example.cpp
>===================================================================
>--- files/patch-src_examples_bookmarkstorage__example.cpp	(nonexistent)
>+++ files/patch-src_examples_bookmarkstorage__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_bookmarkstorage__example.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: files/patch-src_examples_component__example.cpp
>===================================================================
>--- files/patch-src_examples_component__example.cpp	(nonexistent)
>+++ files/patch-src_examples_component__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_component__example.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: files/patch-src_examples_disco__example.cpp
>===================================================================
>--- files/patch-src_examples_disco__example.cpp	(nonexistent)
>+++ files/patch-src_examples_disco__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_disco__example.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: files/patch-src_examples_privacylist__example.cpp
>===================================================================
>--- files/patch-src_examples_privacylist__example.cpp	(nonexistent)
>+++ files/patch-src_examples_privacylist__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_privacylist__example.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: files/patch-src_examples_privatexml__example.cpp
>===================================================================
>--- files/patch-src_examples_privatexml__example.cpp	(nonexistent)
>+++ files/patch-src_examples_privatexml__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_privatexml__example.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: files/patch-src_examples_register__example.cpp
>===================================================================
>--- files/patch-src_examples_register__example.cpp	(nonexistent)
>+++ files/patch-src_examples_register__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_register__example.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: files/patch-src_examples_reset__example.cpp
>===================================================================
>--- files/patch-src_examples_reset__example.cpp	(nonexistent)
>+++ files/patch-src_examples_reset__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_reset__example.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: files/patch-src_examples_roster__example.cpp
>===================================================================
>--- files/patch-src_examples_roster__example.cpp	(nonexistent)
>+++ files/patch-src_examples_roster__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_roster__example.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: files/patch-src_examples_vcard__example.cpp
>===================================================================
>--- files/patch-src_examples_vcard__example.cpp	(nonexistent)
>+++ files/patch-src_examples_vcard__example.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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]
>
>Property changes on: files/patch-src_examples_vcard__example.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 447344)
>+++ pkg-plist	(working copy)
>@@ -150,6 +150,6 @@
> include/gloox/xhtmlim.h
> lib/libgloox.a
> lib/libgloox.so
>-lib/libgloox.so.15
>-lib/libgloox.so.15.0.0
>+lib/libgloox.so.17
>+lib/libgloox.so.17.0.0
> libdata/pkgconfig/gloox.pc

Flags:

dem.procopiou: maintainer-approval+

Actions: View | Diff

Attachments on bug 221073: 184811 | 185024