Browse Source

update to latest upstream

Waldemar Brodkorb 12 years ago
parent
commit
22f8ce521a
2 changed files with 24 additions and 3 deletions
  1. 4 3
      package/dillo/Makefile
  2. 20 0
      package/dillo/patches/patch-configure

+ 4 - 3
package/dillo/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
-PKG_VERSION:=		3.0
+PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		448f44a923222270cb0c84e55adc1be1
+PKG_MD5SUM:=		81b82112cefcc7d54fe2972a21f42930
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
@@ -25,7 +25,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-liconv -lpng
+TARGET_LDFLAGS+=	-liconv -lpng15
+CONFIGURE_ARGS+=	--disable-xft
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin

+ 20 - 0
package/dillo/patches/patch-configure

@@ -0,0 +1,20 @@
+--- dillo-3.0.2.orig/configure	2011-11-30 12:08:21.000000000 +0100
++++ dillo-3.0.2/configure	2012-09-22 19:06:27.000000000 +0200
+@@ -5690,7 +5690,7 @@ if test "x$enable_png" = "xyes"; then
+ $as_echo_n "checking for libpng-config... " >&6; }
+ 
+   if test -z "$PNG_CONFIG"; then
+-    PNG_CONFIG=`which libpng14-config`
++    PNG_CONFIG=`which libpng-config`
+     if test -z "$PNG_CONFIG"; then
+       PNG_CONFIG=`which libpng12-config`
+     fi
+@@ -5717,7 +5717,7 @@ $as_echo "missing" >&6; }
+ $as_echo_n "checking for libpng version... " >&6; }
+     png_version=`$PNG_CONFIG --version`
+     case $png_version in
+-      1.4.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
++      1.5.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
+ $as_echo "$png_version (newer version)" >&6; } ;;
+       1.2.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
+ $as_echo "$png_version (newer version)" >&6; } ;;