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

(-)Makefile (-1 lines)
Lines 18-24 Link Here
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"
(-)files/patch-common_ac_shared__ptr.h (+26 lines)
Line 0 Link Here
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
(-)files/patch-common_ac_string.h (+15 lines)
Line 0 Link Here
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);
(-)files/patch-etc_configure.ac (+37 lines)
Line 0 Link Here
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,
(-)files/patch-libaegis_introspector_time.h (+10 lines)
Line 0 Link Here
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
 
(-)files/patch-libaegis_introspector_vector.h (+10 lines)
Line 0 Link Here
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