summaryrefslogtreecommitdiff
path: root/print/ghostscript-gpl/patches/patch-ah
blob: f5acc1d28adeed317b20ab2d6aadc1518ad0b661 (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
$NetBSD: patch-ah,v 1.4 2014/05/01 04:11:01 richard Exp $

(1) First chunk to fix the X11_TYPE=native problem, which
    freetype2 in /usr/X11R7/ is way old, and work around to 
    use ghostscript-provided freetype2.
    This part is not necessary for NetBSD 6.0, 6.1.

(2) Second chunk for X11_TYPE=native, will have following problem without 
    this patch:
    |  Shared object "libpaper.so.1" not found

--- configure.orig	2012-08-08 08:04:57.000000000 +0000
+++ configure
@@ -3756,7 +3756,7 @@ $as_echo "$as_me: WARNING: disabling con
     ;;
     *)
 #     This is just an arbitrary file in contrib to check
-      if !(test -f contrib/gdevbjc_.c); then
+      if ! (test -f contrib/gdevbjc_.c); then
         enable_contrib=no
       fi
     ;;
@@ -3786,13 +3786,13 @@ case `uname` in
         ;;
         *BSD)
         if test $ac_cv_c_compiler_gnu = yes; then
-            CC_OPT_FLAGS_TO_TRY="-O2"
+            CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
             CC_DBG_FLAGS_TO_TRY="-g -O0"
         fi
         ;;
         Darwin*)
         if test $ac_cv_c_compiler_gnu = yes; then
-            CC_OPT_FLAGS_TO_TRY="-O2"
+            CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
             CC_DBG_FLAGS_TO_TRY="-g -O0"
         fi
         SET_DT_SONAME=""
@@ -5331,7 +5331,7 @@ fi
 fi
 
 if test x$with_libpaper != xno; then
-    LIBS="$LIBS -lpaper"
+    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
 
 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
 
@@ -6474,7 +6474,7 @@ done
                 LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
                 LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
                 if ( test x$with_pdftoraster != xno ); then
-                    if test "$CUPSVERSION" ">" "1.2"; then
+                    if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
                         CUPSPDFTORASTER="1"
                     fi
                 fi