From f7f6252da3f1c9970395e11e432797b993e3c80e Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Thu, 18 Feb 2010 09:58:09 +0100 Subject: [PATCH] dillo: updated to 2.2 --- dillo/.md5sum | 4 ++-- dillo/Pkgfile | 5 +++-- dillo/dillo-2.1.1.cross_compile.patch | 20 -------------------- dillo/dillo-2.2.cross_compile.patch | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 dillo/dillo-2.1.1.cross_compile.patch create mode 100644 dillo/dillo-2.2.cross_compile.patch diff --git a/dillo/.md5sum b/dillo/.md5sum index 096d724..b66ab2f 100644 --- a/dillo/.md5sum +++ b/dillo/.md5sum @@ -1,2 +1,2 @@ -2419e68558aa0877499fec80b60b7049 dillo-2.1.1.cross_compile.patch -93f674f2a42d90a1cdb88a6972325954 dillo-2.1.1.tar.bz2 +1f7c33b3ef84b9700d9923cbd0c402c2 dillo-2.2.cross_compile.patch +f8bcd62093f178bed81e46cc54e73f42 dillo-2.2.tar.bz2 diff --git a/dillo/Pkgfile b/dillo/Pkgfile index 1e5d6ae..d2a8974 100644 --- a/dillo/Pkgfile +++ b/dillo/Pkgfile @@ -5,8 +5,8 @@ # Depends on: fltk2 name=dillo -version=2.1.1 -release=2 +version=2.2 +release=1 source=(http://www.dillo.org/download/$name-$version.tar.bz2 \ $name-$version.cross_compile.patch) @@ -29,4 +29,5 @@ build () { make make DESTDIR=$PKG install + rm -rf $PKG/usr/share } diff --git a/dillo/dillo-2.1.1.cross_compile.patch b/dillo/dillo-2.1.1.cross_compile.patch deleted file mode 100644 index 5f5b26c..0000000 --- a/dillo/dillo-2.1.1.cross_compile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -purN dillo-2.1.1.orig/configure dillo-2.1.1/configure ---- dillo-2.1.1.orig/configure 2009-12-24 10:20:43.000000000 +0100 -+++ dillo-2.1.1/configure 2009-12-24 10:29:18.000000000 +0100 -@@ -9000,6 +9000,7 @@ fi - - { echo "$as_me:$LINENO: checking FLTK2" >&5 - echo $ECHO_N "checking FLTK2... $ECHO_C" >&6; } -+if test "x$LIBFLTK_LIBS" = "x"; then - if sh -c "fltk2-config --version" >/dev/null 2>&1 - then { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } -@@ -9012,7 +9013,7 @@ echo "${ECHO_T}no" >&6; } - echo "$as_me: error: FLTK2 must be installed!" >&2;} - { (exit 1); exit 1; }; } - fi -- -+fi - - if test "x$enable_jpeg" = "xyes"; then - if test "${ac_cv_header_jpeglib_h+set}" = set; then diff --git a/dillo/dillo-2.2.cross_compile.patch b/dillo/dillo-2.2.cross_compile.patch new file mode 100644 index 0000000..071391f --- /dev/null +++ b/dillo/dillo-2.2.cross_compile.patch @@ -0,0 +1,20 @@ +diff -purN dillo-2.2.orig/configure dillo-2.2/configure +--- dillo-2.2.orig/configure 2010-02-18 09:10:13.000000000 +0100 ++++ dillo-2.2/configure 2010-02-18 09:13:20.000000000 +0100 +@@ -6059,6 +6059,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking FLTK2" >&5 + $as_echo_n "checking FLTK2... " >&6; } ++if test "x$LIBFLTK_LIBS" = "x" && test "x$LIBFLTK_CFLAGS" != "x"; then + if sh -c "fltk2-config --version" >/dev/null 2>&1 + then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +@@ -6069,7 +6070,7 @@ else { $as_echo "$as_me:${as_lineno-$LIN + $as_echo "no" >&6; } + as_fn_error "FLTK2 must be installed!" "$LINENO" 5 + fi +- ++fi + + if test "x$enable_jpeg" = "xyes"; then + ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -- 2.26.2