summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-05-07 11:27:16 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-05-07 11:27:16 +0200
commit99c4f2031c8af7dcc7af8cf7591c162cc566b7a4 (patch)
treecde9a5e483679488f6c66abb4b2d91057c38f0fb
parent8bd0515727f1ef914a2beee7109c463d64b40c31 (diff)
update to latest upstream
-rw-r--r--package/dillo/Makefile10
-rw-r--r--package/dillo/patches/patch-Makefile_in11
-rw-r--r--package/dillo/patches/patch-configure20
-rw-r--r--package/dillo/patches/patch-src_IO_Makefile_in11
4 files changed, 6 insertions, 46 deletions
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 42e806fc8..2c71d8dd5 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,13 +4,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= dillo
-PKG_VERSION:= 3.0.2
+PKG_VERSION:= 3.0.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 81b82112cefcc7d54fe2972a21f42930
+PKG_MD5SUM:= 726cd0b7a18c5e25f4d80ebeffe7607e
PKG_DESCR:= small graphical web browser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg
-PKG_DEPENDS+= libstdcxx
+PKG_DEPENDS+= libstdcxx libpthread libgcc
PKG_BUILDDEP:= fltk libXi libiconv jpeg libpng zlib
PKG_URL:= http://www.dillo.org/
PKG_SITES:= http://www.dillo.org/download/
@@ -25,11 +25,13 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
TARGET_LDFLAGS+= -liconv -lpng15
-CONFIGURE_ARGS+= --disable-xft
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
post-install:
$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/dillo $(IDIR_DILLO)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/dpid* $(IDIR_DILLO)/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in
deleted file mode 100644
index ff0c0c32f..000000000
--- a/package/dillo/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- dillo-3.0.orig/Makefile.in 2011-09-06 22:55:42.000000000 +0200
-+++ dillo-3.0/Makefile.in 2011-09-12 20:25:51.000482366 +0200
-@@ -242,7 +242,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lout dw dlib dpip src doc dpid dpi test
-+SUBDIRS = lout dw dlib dpip src doc dpid dpi
- EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h
- sysconf_DATA = dillorc
- all: config.h
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
deleted file mode 100644
index 6cf0ffc92..000000000
--- a/package/dillo/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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; } ;;
diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in
deleted file mode 100644
index 7c59b6168..000000000
--- a/package/dillo/patches/patch-src_IO_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- dillo-3.0.orig/src/IO/Makefile.in 2011-09-06 22:55:42.000000000 +0200
-+++ dillo-3.0/src/IO/Makefile.in 2011-09-12 20:24:41.527983361 +0200
-@@ -191,7 +191,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DDILLO_BINDIR='"$(bindir)/"'
-
--AM_CFLAGS = @LIBFLTK_CFLAGS@
-+AM_CFLAGS =
- AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
- noinst_LIBRARIES = libDiof.a
- libDiof_a_SOURCES = \