Attachment 201039 Details for Bug 234881 – port files patch

[patch] port files patch

aegis-4.25_10.diff (text/plain), 5.83 KB, created by aryeh.friedman on 2019-01-11 19:23:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: aryeh.friedman

Created: 2019-01-11 19:23:36 UTC

Size: 5.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 489989)
>+++ Makefile	(working copy)
>@@ -18,7 +18,6 @@
> 
> USES=		gettext ghostscript groff perl5 tk
> USE_GNOME=	libxml2
>-USE_GCC=	any
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	"-I${LOCALBASE}/include"
> CONFIGURE_ARGS=	--with-nlsdir="${PREFIX}/share/locale"
>Index: files/patch-common_ac_shared__ptr.h
>===================================================================
>--- files/patch-common_ac_shared__ptr.h	(nonexistent)
>+++ files/patch-common_ac_shared__ptr.h	(working copy)
>@@ -0,0 +1,26 @@
>+--- common/ac/shared_ptr.h.orig	2012-12-04 02:03:33 UTC
>++++ common/ac/shared_ptr.h
>+@@ -21,23 +21,6 @@
>+ #define COMMON_AC_SHARED_PTR_H
>+ 
>+ #include <common/config.h>
>+-
>+-#ifdef HAVE_TR1_MEMORY
>+-
>+-#include <tr1/memory>
>+-
>+-#define aegis_shared_ptr std::tr1::shared_ptr
>+-
>+-#elif HAVE_BOOST_SHARED_PTR_HPP
>+-
>+-#include <boost/shared_ptr.hpp>
>+-
>+-#define aegis_shared_ptr boost::shared_ptr
>+-
>+-#else
>+-
>+ #include <common/ac/shared_ptr/aegis.h>
>+ 
>+-#endif
>+-
>+ #endif // COMMON_AC_SHARED_PTR_H
>
>Property changes on: files/patch-common_ac_shared__ptr.h
>___________________________________________________________________
>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-common_ac_string.h
>===================================================================
>--- files/patch-common_ac_string.h	(nonexistent)
>+++ files/patch-common_ac_string.h	(working copy)
>@@ -0,0 +1,15 @@
>+--- common/ac/string.h.orig	2012-12-04 02:03:33 UTC
>++++ common/ac/string.h
>+@@ -128,10 +128,12 @@ size_t strlcat(char *dst, const char *sr
>+ char *strendcpy(char *dst, const char *src, const char *end);
>+ #endif
>+ 
>++/*
>+ #undef strcat
>+ #define strcat strcat_is_unsafe__use_strendcat_instead@
>+ #undef strcpy
>+ #define strcpy strcpy_is_unsafe__use_strendcpy_instead@
>++*/
>+ 
>+ #ifndef HAVE_MEMMEM
>+ void *memmem(const void *, size_t, const void *, size_t);
>
>Property changes on: files/patch-common_ac_string.h
>___________________________________________________________________
>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-etc_configure.ac
>===================================================================
>--- files/patch-etc_configure.ac	(nonexistent)
>+++ files/patch-etc_configure.ac	(working copy)
>@@ -0,0 +1,37 @@
>+--- etc/configure.ac.orig	2012-12-04 02:03:33 UTC
>++++ etc/configure.ac
>+@@ -649,8 +649,8 @@ AC_CHECK_SIZEOF(int)
>+ AC_CHECK_SIZEOF(long)
>+ AC_CHECK_SIZEOF(long long)
>+ 
>+-AC_COMPUTE_INT(ac_cv_long_bit, [sizeof(long) * CHAR_BIT], [#include <limits.h>],
>+-    [ac_cv_long_bit="sizeof(long) * CHAR_BIT"])
>++AC_COMPUTE_INT(ac_cv_long_bit, [LONG_BIT], [#include <limits.h>],
>++    [ac_cv_long_bit="LONG_BIT"])
>+ AC_DEFINE_UNQUOTED(LONG_BIT, [$ac_cv_long_bit],
>+     [Define this symbol to be the number of bits in a long.
>+     This is analogous to the standard CHAR_BIT define.])
>+@@ -849,15 +849,15 @@ dnl!
>+ AC_MSG_CHECKING([for tm_zone in struct tm])
>+ AC_TRY_COMPILE([
>+ #include <stdio.h>
>+-#ifdef TIME_WITH_SYS_TIME
>+-#include <sys/time.h>
>+-#include <time.h>
>+-#else
>+-#ifdef HAVE_SYS_TIME_H
>++dnl! #ifdef TIME_WITH_SYS_TIME
>+ #include <sys/time.h>
>+-#else
>+-#include <time.h>
>+-#endif
>++dnl!  #include <time.h>
>++dnl! #else
>++dnl! #ifdef HAVE_SYS_TIME_H
>++dnl! #include <sys/time.h>
>++dnl! #else
>++dnl! #include <time.h>
>++dnl! #endif
>+ #endif], [struct tm *tm;
>+ printf("%s\n", tm->tm_zone);],
>+ AC_DEFINE(HAVE_tm_zone,1,
>
>Property changes on: files/patch-etc_configure.ac
>___________________________________________________________________
>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-libaegis_introspector_time.h
>===================================================================
>--- files/patch-libaegis_introspector_time.h	(nonexistent)
>+++ files/patch-libaegis_introspector_time.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- libaegis/introspector/time.h.orig	2012-12-04 02:03:33 UTC
>++++ libaegis/introspector/time.h
>+@@ -19,6 +19,7 @@
>+ #ifndef LIBAEGIS_INTROSPECTOR_TIME_H
>+ #define LIBAEGIS_INTROSPECTOR_TIME_H
>+ 
>++#include <time.h>
>+ #include <libaegis/introspector.h>
>+ #include <libaegis/output.h>
>+ 
>
>Property changes on: files/patch-libaegis_introspector_time.h
>___________________________________________________________________
>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-libaegis_introspector_vector.h
>===================================================================
>--- files/patch-libaegis_introspector_vector.h	(nonexistent)
>+++ files/patch-libaegis_introspector_vector.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- libaegis/introspector/vector.h.orig	2012-12-04 02:03:33 UTC
>++++ libaegis/introspector/vector.h
>+@@ -19,6 +19,7 @@
>+ #ifndef LIBAEGIS_INTROSPECTOR_VECTOR_H
>+ #define LIBAEGIS_INTROSPECTOR_VECTOR_H
>+ 
>++#include <sys/types.h>
>+ #include <libaegis/introspector.h>
>+ 
>+ /**
>
>Property changes on: files/patch-libaegis_introspector_vector.h
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 234881: 201039