Skip to contentSkip to conversation

dillo: new package

PATCH New Peter Seiderer 2 participants 3 messages May 27, 2014 – May 28, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dillo: new package

---
 package/Config.in       |  1 +
 package/dillo/Config.in | 21 ++++++++++++++++++++
 package/dillo/dillo.mk  | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 package/dillo/Config.in
 create mode 100644 package/dillo/dillo.mk
package/Config.in +1 -0
index 3bc8d24..5a92032 100644
@@ -224,6 +224,7 @@ source "package/x11r7/Config.in"
 comment "X applications"
 source "package/alsamixergui/Config.in"
 source "package/apitrace/Config.in"
+source "package/dillo/Config.in"
 source "package/docker/Config.in"
 source "package/feh/Config.in"
 source "package/freerdp/Config.in"
package/dillo/Config.in new file +21 -0
new file mode 100644
index 0000000..07198f1
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_DILLO
+	bool "dillo"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fltk fork()
+	select BR2_PACKAGE_FLTK
+
+	help
+	  Dillo is a multi-platform graphical web browser known
+	  for its speed and small footprint. 
+
+	  Enable jpeg and png packages to gain full feature image
+	  support.
+
+	  Enable openssl package to gain https support.
+
+	  http://www.dillo.org
+
+comment "dillo needs a toolchain w/ C++"
+        depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+        depends on !BR2_INSTALL_LIBSTDCPP
package/dillo/dillo.mk new file +51 -0

51 lines not on this page · raw message

Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 dillo: new package

Dear Peter Seiderer,

package/dillo/Config.in line 7

Quoted 13 lines · Peter Seiderer
package/dillo/Config.in new file +7 -0
new file mode 100644
index 0000000..07198f1
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_DILLO
+	bool "dillo"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fltk fork()
+	select BR2_PACKAGE_FLTK
+

No need for this empty line here.

package/dillo/Config.in line 13

Quoted 6 lines
package/dillo/Config.in new file +6 -0
+	help
+	  Dillo is a multi-platform graphical web browser known
+	  for its speed and small footprint. 
+
+	  Enable jpeg and png packages to gain full feature image
+	  support.

I believe this comment is not really necessary: fltk selects libpng and jpeg, so they will also be there.

package/dillo/Config.in line 15

Quoted 1 line
package/dillo/Config.in new file +1 -0
+	  Enable openssl package to gain https support.

However, this one is indeed useful.

Quoted 17 lines
package/dillo/Config.in new file +5 -0
+	  http://www.dillo.org
+
+comment "dillo needs a toolchain w/ C++"
+        depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+        depends on !BR2_INSTALL_LIBSTDCPP
package/dillo/dillo.mk new file +6 -0
new file mode 100644
index 0000000..f15a02a
@@ -0,0 +1,51 @@
+################################################################################
+#
+# dillo
+#
+################################################################################
+

package/dillo/dillo.mk line 16

Quoted 10 lines
package/dillo/dillo.mk new file +10 -0
+DILLO_VERSION = 3.0.4
+DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2
+DILLO_SITE = http://www.dillo.org/download
+DILLO_LICENSE = GPLv3+
+DILLO_LICENSE_FILES = COPYING
+
+DILLO_DEPENDENCIES = fltk
+
+# set additional path for fltk-config and libpng-config
+DILLO_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH)

It's not that nice to add $(STAGING_DIR)/usr/bin to the path, as it means that if there are target binaries in there, they will be picked up in preference to host binaries, which might break things. Instead, we prefer to explicitly point to fltk-config and libpng-config. For libpng:

DILLO_CONF_ENV = \
	PNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config

For fltk, you'd need to patch configure.ac a bit to make it use a variable like FLTK_CONFIG instead of hardcoding the use of fltk-config. Or better, make it use AC_PATH_PROG(), like:

AC_PATH_PROG(FLTK_CONFIG,fltk-config)

and then use $FLTK_CONFIG throughout the configure.ac, and pass ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config

This patch could then be submitted upstream.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 dillo: new package

Hello Thomas,

Quoted 10 lines

Gesendet: Mittwoch, 28. Mai 2014 um 08:14 Uhr
Von: "Thomas Petazzoni" <[email protected]>
An: "Peter Seiderer" <[email protected]>
Cc: buildroot at busybox.net
Betreff: Re: [Buildroot] [PATCH] dillo: new package

Dear Peter Seiderer,

On Wed, 28 May 2014 00:38:27 +0200, Peter Seiderer wrote:

Quoted 16 lines

package/dillo/Config.in line 7

Quoted 13 lines
package/dillo/Config.in new file +7 -0
new file mode 100644
index 0000000..07198f1
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_DILLO
+	bool "dillo"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fltk fork()
+	select BR2_PACKAGE_FLTK
+

No need for this empty line here.

o.k. will fix....

Quoted 10 lines

package/dillo/Config.in line 13

Quoted 6 lines
package/dillo/Config.in new file +6 -0
+	help
+	  Dillo is a multi-platform graphical web browser known
+	  for its speed and small footprint. 
+
+	  Enable jpeg and png packages to gain full feature image
+	  support.

I believe this comment is not really necessary: fltk selects libpng and jpeg, so they will also be there.

o.k. will fix it...

Quoted 38 lines

package/dillo/Config.in line 15

Quoted 1 line
package/dillo/Config.in new file +1 -0
+	  Enable openssl package to gain https support.

However, this one is indeed useful.

Quoted 17 lines
package/dillo/Config.in new file +5 -0
+	  http://www.dillo.org
+
+comment "dillo needs a toolchain w/ C++"
+        depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+        depends on !BR2_INSTALL_LIBSTDCPP
package/dillo/dillo.mk new file +6 -0
new file mode 100644
index 0000000..f15a02a
@@ -0,0 +1,51 @@
+################################################################################
+#
+# dillo
+#
+################################################################################
+

package/dillo/dillo.mk line 16

Quoted 10 lines
package/dillo/dillo.mk new file +10 -0
+DILLO_VERSION = 3.0.4
+DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2
+DILLO_SITE = http://www.dillo.org/download
+DILLO_LICENSE = GPLv3+
+DILLO_LICENSE_FILES = COPYING
+
+DILLO_DEPENDENCIES = fltk
+
+# set additional path for fltk-config and libpng-config
+DILLO_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH)

It's not that nice to add $(STAGING_DIR)/usr/bin to the path, as it means that if there are target binaries in there, they will be picked up in preference to host binaries, which might break things. Instead, we prefer to explicitly point to fltk-config and libpng-config. For libpng:

Quoted 3 lines
DILLO_CONF_ENV = \
	PNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config

o.k. will fix it...

Quoted 10 lines

For fltk, you'd need to patch configure.ac a bit to make it use a variable like FLTK_CONFIG instead of hardcoding the use of fltk-config. Or better, make it use AC_PATH_PROG(), like:

AC_PATH_PROG(FLTK_CONFIG,fltk-config)

and then use $FLTK_CONFIG throughout the configure.ac, and pass ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config

This patch could then be submitted upstream.

o.k. will (try) to fix...

Regards,

Peter

Quoted 9 lines

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com