diff options
Diffstat (limited to 'x11-toolkits/pango/files')
-rw-r--r-- | x11-toolkits/pango/files/patch-ltmain.sh | 47 | ||||
-rw-r--r-- | x11-toolkits/pango/files/patch-pangoxft.h | 11 |
2 files changed, 21 insertions, 37 deletions
diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh index ec2f7e4ad88c..e9e312dfe402 100644 --- a/x11-toolkits/pango/files/patch-ltmain.sh +++ b/x11-toolkits/pango/files/patch-ltmain.sh @@ -1,32 +1,15 @@ ---- ltmain.sh.orig Fri Apr 26 05:23:44 2002 -+++ ltmain.sh Wed Jul 3 12:50:12 2002 -@@ -1056,14 +1056,14 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd*|*-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd*) -+ *-*-openbsd*|*-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Fri Nov 8 15:40:11 2002 ++++ ltmain.sh Tue Dec 3 18:47:10 2002 +@@ -1082,8 +1082,16 @@ continue ;; + -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; + -module) module=yes @@ -34,7 +17,7 @@ continue ;; -@@ -2399,6 +2407,9 @@ +@@ -2397,6 +2405,9 @@ # problems, so we reset it completely verstring="" ;; @@ -44,17 +27,7 @@ *) verstring="0.0" ;; -@@ -2502,6 +2513,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4286,10 +4300,12 @@ +@@ -4327,10 +4338,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-toolkits/pango/files/patch-pangoxft.h b/x11-toolkits/pango/files/patch-pangoxft.h new file mode 100644 index 000000000000..939194042b12 --- /dev/null +++ b/x11-toolkits/pango/files/patch-pangoxft.h @@ -0,0 +1,11 @@ +--- pango/pangoxft.h.orig Sun Oct 6 23:03:37 2002 ++++ pango/pangoxft.h Sun Oct 6 23:03:42 2002 +@@ -31,7 +31,7 @@ + #define _XFT_NO_COMPAT + #define _XFTCOMPAT_H_ + #include <X11/Xlib.h> +-#include <X11/Xft/Xft.h> ++#include <X11/Xft/Xft2.h> + #if defined(XftVersion) && XftVersion >= 20000 + #else + #error "must have Xft version 2 or newer" |