summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/abiword-docs/abiword-docs-3.0.2.ebuild2
-rw-r--r--app-office/abiword/abiword-3.0.4.ebuild2
-rw-r--r--app-office/glabels/files/glabels-externs.patch24
-rw-r--r--app-office/glabels/glabels-3.4.1.ebuild4
4 files changed, 30 insertions, 2 deletions
diff --git a/app-office/abiword-docs/abiword-docs-3.0.2.ebuild b/app-office/abiword-docs/abiword-docs-3.0.2.ebuild
index 12f89ab44c8d..b2585f2daff3 100644
--- a/app-office/abiword-docs/abiword-docs-3.0.2.ebuild
+++ b/app-office/abiword-docs/abiword-docs-3.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/source/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND=">=app-office/abiword-${PV}"
diff --git a/app-office/abiword/abiword-3.0.4.ebuild b/app-office/abiword/abiword-3.0.4.ebuild
index 6a6cc2f7df06..ffaddf153734 100644
--- a/app-office/abiword/abiword-3.0.4.ebuild
+++ b/app-office/abiword/abiword-3.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips x86 ~amd64-linux ~x86-linux"
IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus"
# You need 'plugins' enabled if want to enable the extra plugins
REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )"
diff --git a/app-office/glabels/files/glabels-externs.patch b/app-office/glabels/files/glabels-externs.patch
new file mode 100644
index 000000000000..5722912154bb
--- /dev/null
+++ b/app-office/glabels/files/glabels-externs.patch
@@ -0,0 +1,24 @@
+diff -up glabels-3.4.1/src/font-history.h.f32 glabels-3.4.1/src/font-history.h
+--- glabels-3.4.1/src/font-history.h.f32 2016-03-04 05:01:15.000000000 +0100
++++ glabels-3.4.1/src/font-history.h 2020-02-03 08:41:46.371176433 +0100
+@@ -28,7 +28,7 @@
+ G_BEGIN_DECLS
+
+
+-glFontHistoryModel *gl_font_history;
++extern glFontHistoryModel *gl_font_history;
+
+
+ void gl_font_history_init (void);
+diff -up glabels-3.4.1/src/template-history.h.f32 glabels-3.4.1/src/template-history.h
+--- glabels-3.4.1/src/template-history.h.f32 2016-03-04 05:01:15.000000000 +0100
++++ glabels-3.4.1/src/template-history.h 2020-02-03 08:42:28.547175850 +0100
+@@ -28,7 +28,7 @@
+ G_BEGIN_DECLS
+
+
+-glTemplateHistoryModel *gl_template_history;
++extern glTemplateHistoryModel *gl_template_history;
+
+
+ void gl_template_history_init (void);
diff --git a/app-office/glabels/glabels-3.4.1.ebuild b/app-office/glabels/glabels-3.4.1.ebuild
index 23065b3be108..2f70ff77c791 100644
--- a/app-office/glabels/glabels-3.4.1.ebuild
+++ b/app-office/glabels/glabels-3.4.1.ebuild
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/glabels-externs.patch # Fix compilation with -fno-common/gcc10; patch from Fedora
+)
+
src_configure() {
gnome2_src_configure \
$(use_with eds libebook) \