Skip to contentSkip to conversation

libcroco: new package

PATCH New Gustavo Zacarias 2 participants 3 messages Dec 14, 2015 – Dec 15, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 libcroco: new package

It's required for the librsvg upgrade (ditto host variant).

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: new libcroco version

 package/Config.in              |  1 +
 package/libcroco/Config.in     | 19 +++++++++++++++++++
 package/libcroco/libcroco.hash |  2 ++
 package/libcroco/libcroco.mk   | 20 ++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 package/libcroco/Config.in
 create mode 100644 package/libcroco/libcroco.hash
 create mode 100644 package/libcroco/libcroco.mk
package/Config.in +1 -0
index f2f46de..1c7c64b 100644
@@ -1119,6 +1119,7 @@ menu "Other"
 	source "package/libcap-ng/Config.in"
 	source "package/libcgroup/Config.in"
 	source "package/libcofi/Config.in"
+	source "package/libcroco/Config.in"
 	source "package/libcrossguid/Config.in"
 	source "package/libdaemon/Config.in"
 	source "package/libee/Config.in"
package/libcroco/Config.in new file +19 -0
new file mode 100644
index 0000000..d3c529f
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBCROCO
+	bool "libcroco"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	help
+	  Libcroco is a standalone css2 parsing and manipulation
+	  library. The parser provides a low level event driven SAC like
+	  api and a css object model like api.
+	  Libcroco provides a CSS2 selection engine and an experimental
+	  xml/css rendering engine.
+
+	  https://github.com/GNOME/libcroco
+
+comment "libcroco needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/libcroco/libcroco.hash new file +2 -0
new file mode 100644
index 0000000..20328e4
@@ -0,0 +1,2 @@
+# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.10.sha256sum
+sha256	72066611df77f5c4fb28268cfc7306ecc1517212a6182c2ea756c326a154246c	libcroco-0.6.10.tar.xz
package/libcroco/libcroco.mk new file +20 -0
new file mode 100644
index 0000000..2376684
@@ -0,0 +1,20 @@
+################################################################################
+#
+# libcroco
+#
+################################################################################
+
+LIBCROCO_VERSION_MAJOR = 0.6
+LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).10
+LIBCROCO_SITE = http://ftp.gnome.org/pub/gnome/sources/libcroco/$(LIBCROCO_VERSION_MAJOR)
+LIBCROCO_SOURCE = libcroco-$(LIBCROCO_VERSION).tar.xz
+LIBCROCO_INSTALL_STAGING = YES
+LIBCROCO_DEPENDENCIES = host-pkgconf libglib2 libxml2
+LIBCROCO_CONFIG_SCRIPTS = croco-$(LIBCROCO_VERSION_MAJOR)-config
+# NEWS states that it's only LGPL
+# Source code says v2.1+ even though COPYING.LIB is v2
+LIBCROCO_LICENSE = LGPLv2.1+
+LIBCROSO_LICENSE_FILES = COPYING.LIB
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 1 line
2.4.10
author
#1 lore raw

PATCH 2/2 librsvg: bump to version 2.40.12

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: no change

 package/librsvg/Config.in    |  7 ++++---
 package/librsvg/librsvg.hash |  4 ++--
 package/librsvg/librsvg.mk   | 21 +++++++++------------
 3 files changed, 15 insertions(+), 17 deletions(-)
package/librsvg/Config.in +4 -3
index 94ef2ed..03e5cf3 100644
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_LIBRSVG
 	bool "librsvg"
-	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
-	select BR2_PACKAGE_PANGO
-	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GDK_PIXBUF
+	select BR2_PACKAGE_LIBCROCO
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_PANGO
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
package/librsvg/librsvg.hash +2 -2
index 7572d6c..2920487 100644
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.26/librsvg-2.26.3.sha256sum
-sha256	3761e3d446a9c2f4ebe52431289e15976f1d447f64ed33bb7f35cb1c430eac49	librsvg-2.26.3.tar.gz
+# From http://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.40/librsvg-2.40.12.sha256sum
+sha256	ffe40c4378bf3899f4d679a475726bab03a127a5bdccddec86404cc329ffb550	librsvg-2.40.12.tar.xz
package/librsvg/librsvg.mk +9 -12
index 5c385dc..90c0a7d 100644
@@ -4,21 +4,18 @@
 #
 ################################################################################
 
-LIBRSVG_VERSION_MAJOR = 2.26
-LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).3
-LIBRSVG_SITE = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
+LIBRSVG_VERSION_MAJOR = 2.40
+LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).12
+LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
+LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
 LIBRSVG_INSTALL_STAGING = YES
-LIBRSVG_CONF_OPTS = --disable-tools
-LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 gdk-pixbuf
-HOST_LIBRSVG_DEPENDENCIES = host-libxml2 host-cairo host-pango host-libglib2 host-gdk-pixbuf
+LIBRSVG_CONF_OPTS = --disable-tools --enable-introspection=no
+HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no
+LIBRSVG_DEPENDENCIES = cairo gdk-pixbuf libcroco libglib2 libxml2 pango \
+	$(if $(BR2_PACKAGE_LIBGTK3),libgtk3)
+HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango
 LIBRSVG_LICENSE = LGPLv2+
 LIBRSVG_LICENSE_FILES = COPYING.LIB
 
-# If we have Gtk2, let's build it first to benefit from librsvg Gtk
-# support.
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-LIBRSVG_DEPENDENCIES += libgtk2
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.4.10
#2 lore raw

PATCH 1/2 libcroco: new package

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 5 lines · Gustavo Zacarias

It's required for the librsvg upgrade (ditto host variant).

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: new libcroco version

Both applied.

Next time, don't forget to include a v2 in the [PATCH ...] part of the e-mail title.

Thanks :)

Thomas

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