From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- app-office/glabels/Manifest | 3 ++- app-office/glabels/files/glabels-externs.patch | 24 ++++++++++++++++++++++++ app-office/glabels/glabels-3.4.1.ebuild | 4 ++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app-office/glabels/files/glabels-externs.patch (limited to 'app-office/glabels') diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest index f1ba503a1608..db6f55de3057 100644 --- a/app-office/glabels/Manifest +++ b/app-office/glabels/Manifest @@ -1,3 +1,4 @@ +AUX glabels-externs.patch 834 BLAKE2B 3df1dbfedaf8773626c11c44676268a33696588dc91a87f7607a9e7ede7ed1883adc5a34ca0632d513cdd99782f58b0225dde1c5ca65b374d0c41e20eaacc469 SHA512 4f55e4e152e8b93b9f334ee84b319914d79a76f484a1a575e1c041b930c19af788a64df1316b4043d8c4b85edf81bde185bb4e0e61fb19e4d4229d22d1c27935 DIST glabels-3.4.1.tar.xz 3467992 BLAKE2B 87da586052995a61b1031c5598a21142e525851c5d94b2870e6f62b0d2a6227f44b55ce1aaf6a4c52bd6bb81d9005fde0e58befe26834acb37f4b6728a378cdd SHA512 d3cb98a3b8e33aaace5773a5715ebe45a28a046dd89443b97126078261954fe4713abdc70c38d0d2b932a37eef02ea266726fd28433153bb5aef33c5d5f8175f -EBUILD glabels-3.4.1.ebuild 860 BLAKE2B 629dea57fe50daff1c51c6f9bc6f4f80cfe1b2caf25426cb39b61d5995bbca66c2477a11addafb36527beb0db3c8dc94c9bdd321e3309cf6b4a08c68e700bb7a SHA512 35d3e9013e3bb87ddef2c04392ec445913e411658fcee3efa3a2c6986388c323dbb13506eb19966b014c9a6f15ede6a1a26a35b52ccefa6bc2d9e55276059c4c +EBUILD glabels-3.4.1.ebuild 970 BLAKE2B 43e2aabc81dbb708cd4cbd993199af756235b292b0c91552c92b2b893f78371d90483af437ac27d3325746bee120a077db5e4010aa4e9f8043439a3b0f10c6fa SHA512 b3a3f7b5372aacb6748ab766299660d0ad2dda5c4ef01910e4051995f61ca32ffad7cc60da8c66ebafccee38e41fc1e9546f1ad6d2105829331fe909b9573c9e MISC metadata.xml 628 BLAKE2B afeffa1b3692fcee50a89de00d3cd5c205b0a75516d8c92fbbc0270de1cc76f022043a6a4f59648f61dbd3a058abc964ca3a24c3f791755cc811999575026401 SHA512 d82beb6241d972fab78633ecab172c67145c6bab44cfaa458dcfaebae65f00f5200f8233e97d97b4cb2a555aa92a1bb2669726d93b0af1744408d7235c6c1e3e 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) \ -- cgit v1.2.3