gentoo auto-resync : 07:10:2024 - 04:26:50

6 files changed, 90 insertions, 2 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 3082c4f79de6..3c91b9d96580 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index e3982f8726ea..748e6388fd7b 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,3 +1,5 @@
+AUX qalculate-gtk-5.2.0-lto.patch 1398 BLAKE2B e6b4606a939db32a96ec648f66c378868961da41efc1fd2a3dcf8c857ce2412347da9e4648848f32bd4c7b8ebda2c5f1b10a033ecc8a5040a77f7d0bd10c1a04 SHA512 b3dceab54b5594cfa62341adb541986d8f6644c6036c28158bbbb0b2f1b4d9cd9e662180bb9fa09b2826afbb8ededeb42d11a1473513f7378a624dfbe897cc90
 DIST qalculate-gtk-5.2.0.tar.gz 2902354 BLAKE2B b52433538edb3c7840cf094ac56ebfcc6880ea704fd64e142af9c3965b0ccaadfa8ed7d764cce3a7d9d47d8cd620b685246e59ac5461160512b8eef7141cf092 SHA512 e65e8cd5ad505e2f20a1f917a831381cbb69a0b086e8e371685e918b8638a766f6f80be5420e73da6fcf347dc96c5bbf7fced6e694311b13b533a9bf279814c0
+EBUILD qalculate-gtk-5.2.0-r1.ebuild 966 BLAKE2B 6690b1858d592c98b259967b0453bea452a95c14de066766fa94745f982791ba37f48f8f839366e371b7378db102104bb947b31e321f490fb265ad95acdaae74 SHA512 832e5829bd7a1053d0f408c4f6bae5c32e4f594616180fea19959ee47f9495ff72029fd16f8b941b5f07c577e66e741cc563d542fda875a01962b2e8ed1086d1
 EBUILD qalculate-gtk-5.2.0.ebuild 913 BLAKE2B a228fdd6f676a62905e33161ce6993a7d6e4df10ba98fbfb31ddad76232832b6ece417ec1685f9c6101407ba6ae907309e7c26445a4b6074306027a532738e1f SHA512 4299ae766847465100ae23e0c1c41bf405ad54b04691808d77a4378e0cf6f42d0634c02b1a8adabd3cd042a41737651e3deee0e5c20a89432b1514563a3086be
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-5.2.0-lto.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-5.2.0-lto.patch
new file mode 100644
index 000000000000..c7bf190a6db3
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-5.2.0-lto.patch
@@ -0,0 +1,43 @@
+https://github.com/Qalculate/qalculate-gtk/pull/552
+
+From 5ac0d4264bdec99776fa27f9b6adeeb4965ab8d6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Oct 2024 08:34:21 +0100
+Subject: [PATCH] searchprovider: don't use conflicting type for
+ simplified_percentage
+
+Fixes the following warning with LTO:
+```
+interface.cc:186:13: error: type of 'simplified_percentage' does not match original declaration [-Werror=lto-type-mismatch]
+  186 | extern bool simplified_percentage;
+      |             ^
+callbacks.cc:231:5: note: type 'int' should match type 'bool'
+  231 | int simplified_percentage = -1;
+      |     ^
+```
+
+Bug: https://bugs.gentoo.org/940927
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/searchprovider.cc
++++ b/src/searchprovider.cc
+@@ -366,7 +366,7 @@ void load_preferences_search() {
+ 	search_ignore_locale = false;
+ 	search_adaptive_interval_display = true;
+ 
+-	bool simplified_percentage = true;
++	int simplified_percentage = 1;
+ 
+ 	CALCULATOR->useIntervalArithmetic(true);
+ 	CALCULATOR->useBinaryPrefixes(0);
+
+--- a/src/interface.cc
++++ b/src/interface.cc
+@@ -183,7 +183,7 @@ extern bool caret_as_xor;
+ extern int close_with_esc;
+ extern int visible_keypad;
+ extern bool auto_calculate, chain_mode;
+-extern bool simplified_percentage;
++extern int simplified_percentage;
+ extern bool complex_angle_form;
+ extern bool check_version;
+ extern int max_plot_time;
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.2.0-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..f2871e1a891f
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.2.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: bump with sci-libs/libqalculate and sci-calculators/qalculate-qt!
+
+inherit xdg
+
+DESCRIPTION="Modern multi-purpose calculator"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2
+	>=sci-libs/libqalculate-${PV}:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.0-lto.patch
+)
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/calendarconversion.ui
+		data/periodictable.ui
+	EOF
+
+	default
+}
diff --git a/sci-calculators/qalculate-qt/Manifest b/sci-calculators/qalculate-qt/Manifest
index 05fe6098aa38..807777e2d246 100644
--- a/sci-calculators/qalculate-qt/Manifest
+++ b/sci-calculators/qalculate-qt/Manifest
@@ -1,3 +1,3 @@
 DIST qalculate-qt-5.2.0.tar.gz 1763726 BLAKE2B a3d93e7740063b95ce19ff0006b11b15a38cdd5e8888e41dbf11ea896d016c8c9e1ccc56c90dc7c262852431b72332818ae39ec92f585839d97db64730cc08a1 SHA512 a25dbe16f29ad047f42c601729fdc1e79cd12f526975b358c1838085513c8fb7d70c313e258876b465a871eea0804ab6ea56e9c34eb6d9c01784a4f67f6cc6af
-EBUILD qalculate-qt-5.2.0-r1.ebuild 681 BLAKE2B 95e0c0af3f6f2f8f78a2b5ab8b33b6118bb099f1a2943897254ad54cf30a285c77ceedbfcc87f1c68baa2d124394c53808c6b7f91c43792cb8fdd62170031b21 SHA512 5e71e7f2b80312425631eb56e0f9d1e5b1e77eaf1978d4ce80ad4e977a513b59d0f63ad2b31160aa103cafd3a4df64c9d6a94b41ee6ccf8e4c101d8dc2790078
+EBUILD qalculate-qt-5.2.0-r1.ebuild 680 BLAKE2B e3d5fb557b9cf5b238122ac282dc939ec71045c2549cb016e6a5ce4db1979dea22ef2f25354209b49f3dba9f5b0271d81b8393647219092bbd5704523e93efe8 SHA512 8e12d5f7090fcab9e06f394273d5636090bf1a08e53b5c18f035b5a806028504057b410b3eaf69ae08370d11d41fb0c2def87e2d83b2ae774b99ae61c7f938f2
 MISC metadata.xml 594 BLAKE2B 92690b313743c9e6668288130f5abc5c8758c84eef02ecaff3fd905a3b560d61c8adf305a3bbc474ff2bf09cd74511e696516b5dd6ea07922ce4cde22b7993a8 SHA512 0c4cf89c2819d36f51e22b65d2c0740096598b38297d3fe33d006415b857cd26b7998bcc13b87b10d9862a2a37d563dbcfade63d899537a011b297df9d4fe40c
diff --git a/sci-calculators/qalculate-qt/qalculate-qt-5.2.0-r1.ebuild b/sci-calculators/qalculate-qt/qalculate-qt-5.2.0-r1.ebuild
index bc7487dc9484..866a19a24db5 100644
--- a/sci-calculators/qalculate-qt/qalculate-qt-5.2.0-r1.ebuild
+++ b/sci-calculators/qalculate-qt/qalculate-qt-5.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-qt/qtbase:6[gui,network,widgets]