summaryrefslogtreecommitdiff
path: root/pkg/netsurf/libcss
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-07-21 12:02:12 -0700
committerMichael Forney <mforney@mforney.org>2019-07-29 18:03:01 -0700
commit1a8f020103290f3ff8f412320ce3f97bab80a449 (patch)
treec797697bfead213bbb4e17b47af8f8bc83173880 /pkg/netsurf/libcss
parente2d36d24c19e7439457ce4d9bf6ada6be9a9c129 (diff)
netsurf: Update to 3.9
Diffstat (limited to 'pkg/netsurf/libcss')
-rw-r--r--pkg/netsurf/libcss/gen.lua3
-rw-r--r--pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch25
m---------pkg/netsurf/libcss/src0
-rw-r--r--pkg/netsurf/libcss/ver2
4 files changed, 3 insertions, 27 deletions
diff --git a/pkg/netsurf/libcss/gen.lua b/pkg/netsurf/libcss/gen.lua
index 768a53e0..80a1925d 100644
--- a/pkg/netsurf/libcss/gen.lua
+++ b/pkg/netsurf/libcss/gen.lua
@@ -1,4 +1,5 @@
cflags{
+ [[-D '_ALIGNED=__attribute__((aligned))']],
'-I $srcdir/include',
'-I $srcdir/src',
'-I pkg/netsurf/libparserutils/src/include',
@@ -25,7 +26,7 @@ lib('libcss.a', [[src/(
charset/detect.c
lex/lex.c
parse/(
- parse.c language.c important.c propstrings.c font_face.c
+ parse.c language.c important.c propstrings.c font_face.c mq.c
properties/(
azimuth.c
background.c
diff --git a/pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch b/pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
deleted file mode 100644
index 62693b0b..00000000
--- a/pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c56708515c29edf097bcf1f021728dacf4173d69 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 19 Jun 2019 21:36:22 -0700
-Subject: [PATCH] Remove _ALIGNED after struct definition
-
----
- src/stylesheet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/stylesheet.h b/src/stylesheet.h
-index 18e077e..59632cc 100644
---- a/src/stylesheet.h
-+++ b/src/stylesheet.h
-@@ -120,7 +120,7 @@ struct css_rule {
- index : 16, /**< index in sheet */
- items : 8, /**< # items in rule */
- ptype : 1; /**< css_rule_parent_type */
--} _ALIGNED;
-+};
-
- typedef struct css_rule_selector {
- css_rule base;
---
-2.20.1
-
diff --git a/pkg/netsurf/libcss/src b/pkg/netsurf/libcss/src
-Subproject 4591e4851068ab16afdecbaef5eccacc71344ff
+Subproject ba1d79992750773e3decdf485b40b283d81837a
diff --git a/pkg/netsurf/libcss/ver b/pkg/netsurf/libcss/ver
index 368b3d7e..96bd60a6 100644
--- a/pkg/netsurf/libcss/ver
+++ b/pkg/netsurf/libcss/ver
@@ -1 +1 @@
-0.8.0 r1
+0.9.0 r0