summaryrefslogtreecommitdiff
path: root/graphics/inkscape/patches/patch-ac
blob: 8fba8dcaa0c57eaacfbbae7654a0b43727451c8b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
$NetBSD: patch-ac,v 1.10 2014/07/29 07:03:27 adam Exp $

--- configure.orig	2014-06-20 22:05:43.000000000 +0000
+++ configure
@@ -7483,7 +7483,6 @@ fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for -Werror=format-security" >&5
 $as_echo_n "checking compiler support for -Werror=format-security... " >&6; }
   ink_svd_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="-Werror=format-security $CPPFLAGS"
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7686,7 +7685,7 @@ cat >>confdefs.h <<_ACEOF
 #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
 _ACEOF
 
-ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi fr ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
 
    for ac_header in locale.h
 do :
@@ -8553,11 +8552,11 @@ for ax_openmp_flag in $ax_openmp_flags; 
 #ifdef __cplusplus
 extern "C"
 #endif
-char omp_set_num_threads ();
+#include <omp.h>
 int
 main ()
 {
-return omp_set_num_threads ();
+return omp_get_num_threads ();
   ;
   return 0;
 }
@@ -9731,11 +9730,11 @@ fi
 
 
 if test "x$with_python" = "xyes"; then
-    checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
+    checkPYTHON_CFLAGS=`${PYTHON} -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
     if test "$?" -gt "0"; then
         with_python="no"
     else
-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+        checkPYTHON_LIBS=`${PYTHON} -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
         if test "$?" -gt "0"; then
             with_python="no"
         else
@@ -9795,7 +9794,7 @@ if test "x$enable_lcms" = "xno"; then
     have_lcms2=no
 else
     # Have to test LittleCms presence
-    if test "x${platform_osx}" != "xyes"; then
+    if test "x" != "xyes"; then
        # lcms 2.2 & 2.3 have problems on OSX
 
 pkg_failed=no
@@ -11356,7 +11355,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
 
 fi
 
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl"
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2"
 if test "x$openmp_ok" = "xyes"; then
 	INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi