gentoo resync : 25.11.2020

3 files changed, 68 insertions, 0 deletions

diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 48ef66e36c0e..ea34c85ca473 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,3 +1,5 @@
+AUX galculator-2.1.4-fno-common.patch 2030 BLAKE2B 288c04e137cb93da6a7b49e074998621d1f40153ba6b2dfa4cb94f1f6244920a66913d866e5939f84c8a1469576ba3c5138604badcac495d6411a186b0d1e155 SHA512 9cdddad238c0b4c4ee57934cdcd742ee24efb6df80452462f447d0deed6039a6238e48d25933a8c69fe031e1fb5a57d464b7f0913010a3feda275b1ebde85378
 DIST galculator-2.1.4.tar.bz2 472989 BLAKE2B 2fa40aa0d04880e46aad89c79ebb221a13fca815af3540c159205690a65dae6c5ec9e52e48c110ecadc4a18b86d5bd5d363f9d77c162717c8bfd2a60b71d0896 SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa
+EBUILD galculator-2.1.4-r1.ebuild 741 BLAKE2B 549abc4c4b4d5b88035dffad18963a7736029dd232722a6b804e9b9377819e3c5169ee292bae5bbc8f09726b6895fbc0b82e1a2440bdea2ddb534c7b6978c94f SHA512 2d67628a5bee70d0f8eb4ad9985672efa263c75598fd7ff74e7cf530a2217568415b8c3baaecd9998dbe0ad637118f9c0df8603d6a5a2f7d9602a57bff9fb37e
 EBUILD galculator-2.1.4.ebuild 624 BLAKE2B dcc01eb2f31ef7e8e2d1d1ba879bd9a2ed62cdf30d02aba755ad89322ac0a6b6caf22e07e71d6259cfcb958baedccb4b2fa8bd1370dff1249ef85981a45f2bcc SHA512 d7dd39dbfd73edbe497d5e3e4dfc335d329d5ca8007211d1be175fb3da93e91d39f2285add768a820d53b09100ef9fc50aa46f23eb3569e5b4fcb9998bc86fc6
 MISC metadata.xml 394 BLAKE2B 4fa1374c3ac91ea4c4212455d7ff63a35705444c3df485c6f327d6b5ebae90afcc345030c69e7a256759277f18253a20c3b7ff11036e0cd8ababa918212d9ce5 SHA512 fc850474030836be72c5a81983052b0af11312a3b3ef815b6b5eaf7a95a1b7bdbf5b1f25b5e0b2c32786b6fc5958993ff859bd2c9c818dc7df68dbecb4b61800
diff --git a/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch b/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch
new file mode 100644
index 000000000000..32fa609d19c9
--- /dev/null
+++ b/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch
@@ -0,0 +1,27 @@
+From 501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6 Mon Sep 17 00:00:00 2001
+From: Kentaro Hayashi <kenhys@gmail.com>
+Date: Sat, 1 Aug 2020 22:25:37 +0900
+Subject: [PATCH] Fix multiple definition of `prefs` compile error with GCC-10
+
+This commit fixes the following error:
+
+  libtool: link: gcc -pthread -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -O2 -fdebug-prefix-map=/workspace/galculator-2.1.4=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o galculator galculator-main.o galculator-math_functions.o galculator-display.o galculator-general_functions.o galculator-calc_basic.o galculator-config_file.o galculator-callbacks.o galculator-ui.o galculator-flex_parser.o -Wl,--export-dynamic  -Wl,--as-needed -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm -lquadmath -pthread
+/usr/bin/ld: galculator-config_file.o:./src/config_file.c:42: multiple definition of `prefs'; galculator-main.o:./src/main.c:52: first defined here
+  collect2: error: ld returned 1 exit status
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 10d0868..d22fea0 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -49,7 +49,7 @@
+ 
+ #define MASK_NUMLOCK GDK_MOD2_MASK
+ 
+-s_preferences		prefs;
++extern s_preferences		prefs;
+ s_current_status 	current_status = {0, 0, 0, 0, FALSE, FALSE, TRUE};
+ s_array				memory;
+ s_constant 			*constant;
diff --git a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..6a7c796d3cfa
--- /dev/null
+++ b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="GTK+ based algebraic and RPN calculator"
+HOMEPAGE="http://galculator.mnim.org/"
+SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare() {
+	default
+
+	# bug 566290
+	echo "src/flex_parser.c" >> po/POTFILES.skip || die
+}
+
+src_install() {
+	default
+	dodoc doc/shortcuts
+}