oasis

commit: 898321096fe9138f600de955f6dcf2b56c302b2f
parent 675f5acf886d03dfcac21096efb5a19a9244f678
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 19 Jun 2019 21:37:22 -0700

libcss, libdom: Remove unnecessary _ALIGNED specifier

I'm not sure what this is supposed to do, or on what system it has
an effect, but with gcc it just causes a spurious global variable to
be created.

Diffstat:
M
.gitmodules
2
++
A
pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
25
+++++++++++++++++++++++++
M
pkg/netsurf/libcss/ver
2
+-
A
pkg/netsurf/libdom/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
25
+++++++++++++++++++++++++
M
pkg/netsurf/libdom/ver
2
+-

5 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -155,9 +155,11 @@
 [submodule "pkg/netsurf/libcss/src"]
 	path = pkg/netsurf/libcss/src
 	url = git://git.netsurf-browser.org/libcss.git
+	ignore = all
 [submodule "pkg/netsurf/libdom/src"]
 	path = pkg/netsurf/libdom/src
 	url = git://git.netsurf-browser.org/libdom.git
+	ignore = all
 [submodule "pkg/netsurf/libhubbub/src"]
 	path = pkg/netsurf/libhubbub/src
 	url = git://git.netsurf-browser.org/libhubbub.git
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
@@ -0,0 +1,25 @@
+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/ver b/pkg/netsurf/libcss/ver
@@ -1 +1 @@
-0.8.0
+0.8.0 r1
diff --git a/pkg/netsurf/libdom/patch/0001-Remove-_ALIGNED-after-struct-definition.patch b/pkg/netsurf/libdom/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
@@ -0,0 +1,25 @@
+From 568a13cb63d8d6a33c7ef77ec9c75e3abded1be3 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 19 Jun 2019 21:34:47 -0700
+Subject: [PATCH] Remove _ALIGNED after struct definition
+
+---
+ include/dom/core/string.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/dom/core/string.h b/include/dom/core/string.h
+index f2a6122..4c2da97 100644
+--- a/include/dom/core/string.h
++++ b/include/dom/core/string.h
+@@ -18,7 +18,7 @@
+ typedef struct dom_string dom_string;
+ struct dom_string {
+ 	uint32_t refcnt;
+-} _ALIGNED;
++};
+ 
+ 
+ /* Claim a reference on a DOM string */
+-- 
+2.20.1
+
diff --git a/pkg/netsurf/libdom/ver b/pkg/netsurf/libdom/ver
@@ -1 +1 @@
-0.3.3
+0.3.3 r1