Attachment #201039 for bug #234881

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

Lines 18-24 Link Here

(-)Makefile (-1 lines)
18		18
19	USES= gettext ghostscript groff perl5 tk	19	USES= gettext ghostscript groff perl5 tk
20	USE_GNOME= libxml2	20	USE_GNOME= libxml2
21	USE_GCC= any
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	CPPFLAGS+= "-I${LOCALBASE}/include"	22	CPPFLAGS+= "-I${LOCALBASE}/include"
24	CONFIGURE_ARGS= --with-nlsdir="${PREFIX}/share/locale"	23	CONFIGURE_ARGS= --with-nlsdir="${PREFIX}/share/locale"




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




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




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

Line 0 Link Here

(-)files/patch-libaegis_introspector_time.h (+10 lines)
	1	--- libaegis/introspector/time.h.orig 2012-12-04 02:03:33 UTC
	2	+++ libaegis/introspector/time.h
	3	@@ -19,6 +19,7 @@
	4	#ifndef LIBAEGIS_INTROSPECTOR_TIME_H
	5	#define LIBAEGIS_INTROSPECTOR_TIME_H
	6
	7	+#include <time.h>
	8	#include <libaegis/introspector.h>
	9	#include <libaegis/output.h>
	10

Line 0 Link Here

(-)files/patch-libaegis_introspector_vector.h (+10 lines)
	1	--- libaegis/introspector/vector.h.orig 2012-12-04 02:03:33 UTC
	2	+++ libaegis/introspector/vector.h
	3	@@ -19,6 +19,7 @@
	4	#ifndef LIBAEGIS_INTROSPECTOR_VECTOR_H
	5	#define LIBAEGIS_INTROSPECTOR_VECTOR_H
	6
	7	+#include <sys/types.h>
	8	#include <libaegis/introspector.h>
	9
	10	/**

Return to bug 234881

Line 0 Link Here

(-)files/patch-common_ac_shared__ptr.h (+26 lines)
	1	--- common/ac/shared_ptr.h.orig 2012-12-04 02:03:33 UTC
	2	+++ common/ac/shared_ptr.h
	3	@@ -21,23 +21,6 @@
	4	#define COMMON_AC_SHARED_PTR_H
	5
	6	#include <common/config.h>
	7	-
	8	-#ifdef HAVE_TR1_MEMORY
	9	-
	10	-#include <tr1/memory>
	11	-
	12	-#define aegis_shared_ptr std::tr1::shared_ptr
	13	-
	14	-#elif HAVE_BOOST_SHARED_PTR_HPP
	15	-
	16	-#include <boost/shared_ptr.hpp>
	17	-
	18	-#define aegis_shared_ptr boost::shared_ptr
	19	-
	20	-#else
	21	-
	22	#include <common/ac/shared_ptr/aegis.h>
	23
	24	-#endif
	25	-
	26	#endif // COMMON_AC_SHARED_PTR_H

Line 0 Link Here

(-)files/patch-common_ac_string.h (+15 lines)
	1	--- common/ac/string.h.orig 2012-12-04 02:03:33 UTC
	2	+++ common/ac/string.h
	3	@@ -128,10 +128,12 @@ size_t strlcat(char dst, const char sr
	4	char strendcpy(char dst, const char src, const char end);
	5	#endif
	6
	7	+/*
	8	#undef strcat
	9	#define strcat strcat_is_unsafe__use_strendcat_instead@
	10	#undef strcpy
	11	#define strcpy strcpy_is_unsafe__use_strendcpy_instead@
	12	+*/
	13
	14	#ifndef HAVE_MEMMEM
	15	void memmem(const void , size_t, const void *, size_t);

Line 0 Link Here

(-)files/patch-etc_configure.ac (+37 lines)
	1	--- etc/configure.ac.orig 2012-12-04 02:03:33 UTC
	2	+++ etc/configure.ac
	3	@@ -649,8 +649,8 @@ AC_CHECK_SIZEOF(int)
	4	AC_CHECK_SIZEOF(long)
	5	AC_CHECK_SIZEOF(long long)
	6
	7	-AC_COMPUTE_INT(ac_cv_long_bit, [sizeof(long) * CHAR_BIT], [#include <limits.h>],
	8	- [ac_cv_long_bit="sizeof(long) * CHAR_BIT"])
	9	+AC_COMPUTE_INT(ac_cv_long_bit, [LONG_BIT], [#include <limits.h>],
	10	+ [ac_cv_long_bit="LONG_BIT"])
	11	AC_DEFINE_UNQUOTED(LONG_BIT, [$ac_cv_long_bit],
	12	[Define this symbol to be the number of bits in a long.
	13	This is analogous to the standard CHAR_BIT define.])
	14	@@ -849,15 +849,15 @@ dnl!
	15	AC_MSG_CHECKING([for tm_zone in struct tm])
	16	AC_TRY_COMPILE([
	17	#include <stdio.h>
	18	-#ifdef TIME_WITH_SYS_TIME
	19	-#include <sys/time.h>
	20	-#include <time.h>
	21	-#else
	22	-#ifdef HAVE_SYS_TIME_H
	23	+dnl! #ifdef TIME_WITH_SYS_TIME
	24	#include <sys/time.h>
	25	-#else
	26	-#include <time.h>
	27	-#endif
	28	+dnl! #include <time.h>
	29	+dnl! #else
	30	+dnl! #ifdef HAVE_SYS_TIME_H
	31	+dnl! #include <sys/time.h>
	32	+dnl! #else
	33	+dnl! #include <time.h>
	34	+dnl! #endif
	35	#endif], [struct tm *tm;
	36	printf("%s\n", tm->tm_zone);],
	37	AC_DEFINE(HAVE_tm_zone,1,