gentoo auto-resync : 06:09:2024 - 12:28:42

5 files changed, 74 insertions, 3 deletions

diff --git a/dev-perl/Wx-Scintilla/Manifest b/dev-perl/Wx-Scintilla/Manifest
index f72a66548273..76ae5b738f97 100644
--- a/dev-perl/Wx-Scintilla/Manifest
+++ b/dev-perl/Wx-Scintilla/Manifest
@@ -1,5 +1,8 @@
 AUX Wx-Scintilla-0.34-flags.patch 545 BLAKE2B ce7f59a2d369c522469679d79c81d5154e1ee0861712b2cc0d68892f941cf7536ad88300cb56a543a6cba043a1a7418e099d33afd6dad2e51715a053d4355006 SHA512 b1a12522cfd20dfd309a86da23214ace540f0365c3ac8753f081ad8bd7cff16f1f6f1b8345ac1cb3243208085c82a558e50e16ae0e4c556cc5bc2b9704d9a244
+AUX Wx-Scintilla-0.39-force-c++11.patch 401 BLAKE2B 83344e44a4d8c904251c1a2b50c348c512b280ea1a68ea100739ee8cec8b8e38d0a29b98ed8ed8b4a12e417e7875b30d537458cb2707fe98bb22ec7beb03514b SHA512 126e83eee6e6dabf92253a4ab74f5195bdebc8905a7fd6a6f1f11b3cc6e0df1a05988c28cdc38b254eb09e0f8946ac5310fdb9cfe02335b0456ead887119c694
 AUX Wx-Scintilla-0.39-gcc6.patch 1099 BLAKE2B 3b6531b42f6c83f6963ba1142d90b6073a941521b2b1c441f0916f505afff878c861bf9833c5d4e4fefe8752f2267ea7dfb51b7b24c42b53b5fcf492e68d62b5 SHA512 c5eceb13994cd0f156efacb0d505a95b873f954b6bea9f016d60d003fa24e82db8d13f440cad3b91188b2b4794c64d46ce077613516f2e78acbdfd06b93dd7de
+AUX Wx-Scintilla-0.39-respect-user-flags.patch 420 BLAKE2B b57539866660414188fe99ddd237f2d6dc4ff8e2b54c32a0fcbec288018a5f9928b366f78bfe2cc3ce7aca01437d50d2888db5e9c745384a0d6e84f34c0d706c SHA512 30aa3d1be42ba22e24b9a190e112ea2ee1e481dd23dd257eb638c26d448fa1c867ca617a693bd5c55f8c270e39b91a1e7218badb3948101e88ac425f1539bdbb
+AUX Wx-Scintilla-0.39-scrub-gtk2.patch 1160 BLAKE2B e28b2fa0d4f0d5c8e34329280c7617dd29f7fc19ec86644f933d784a2686f45c927b67d3a5cb84f17365a2006177c0f934d2f8e78de4fbc28cabcaf0c21feb59 SHA512 e7febfaa2783a40ac0895b203174e39637e656f7b383a512083ed1f8c91103e5de17575921045b874f21674ea915ab91a5712eec31561d3f000abc3af2c0bda9
 DIST Wx-Scintilla-0.39.tar.gz 848565 BLAKE2B e6404ebfa506ba63e6bd11f3a81321241ed69b58ccf59cfd37b58a14c9fd6ba8b954623c97e19f9d8d123c0aa352d1a80e0e527358d1de0e0d1e823f42fb8b7a SHA512 d9ecec347c1f1382788e5ed7708b0caf86f2ff87db0fdb2b8fa07460c96b1a7921a9402431105beee61f4627f3694a79db7515ceb76b1ae4fb3f95c807afb4d4
-EBUILD Wx-Scintilla-0.390.0-r5.ebuild 755 BLAKE2B ec4eca2ddd53e29f0cf2376e81c926e83bd00e341c1d7e8bfeb37fc63d9a535efeac43cc0a7dfece7f9ebebb2b9f4bf4820a378de13dada45726c39d0e945ec3 SHA512 80fef809cdde81e084b81c6bd870e9d7aec48a50dec66ebf8f52be0071c7dc5db45a7383c8ee788917ea898e13d901393f157e0773e96905d7c3096ee30466f2
+EBUILD Wx-Scintilla-0.390.0-r5.ebuild 885 BLAKE2B 48409e514638ccf222826c323d9e7355173b917cff1975ffd30c475c0e0aa6148cdb31d22d773ad257771a30a0fe51e3dfe13f3591f40a5abeea86090a393d78 SHA512 eb3a31eda4a28fecd7b1cddadc191861823aa5427452171e0b59a82ee18511127c24e8b93965377082bd34447a7acefabc58818f5da7660a9a8001d152756791
 MISC metadata.xml 745 BLAKE2B e8c7f9a7c061268d1a8276bb49d8b86a23fa91eecffb7317caca3c8d06eb02626ab45a60e8b9d77c8e905b2d58fd3fbc694e9450dbca5644f3e3424588776b2d SHA512 c9c5bf090e0b5e34139022c93aa3e8d0c3e20fbf49b0df4e73b66ac746e565902a5a2a8a6d30085a017d3aac61bcde72402db4de1b6677fc35f82b6dd0318e90
diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
index 61c60e271dfb..ad41f943900f 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,6 @@ DESCRIPTION="Scintilla source code editing component for wxWidgets"
 LICENSE+=" HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-perl/Alien-wxWidgets
@@ -29,6 +28,9 @@ BDEPEND=${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.34-flags.patch
 	"${FILESDIR}"/${PN}-0.39-gcc6.patch
+	"${FILESDIR}"/${PN}-0.39-respect-user-flags.patch
+	"${FILESDIR}"/${PN}-0.39-force-c++11.patch
+	"${FILESDIR}"/${PN}-0.39-scrub-gtk2.patch
 )
 
 src_configure() {
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch
new file mode 100644
index 000000000000..92a5af0c4892
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch
@@ -0,0 +1,13 @@
+Uses std::auto_ptr which has been officially removed in C++17.
+While GCC still has it present LLVM has explicitly removed it.
+
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -50,6 +50,7 @@
+ 		'-o ' . $object_name,
+ 		'-O2',
+ 		'-Wall',
++		'-std=c++11',
+ 		$object_name !~ /((Plat|Scintilla)WX|scintilla)\.o/
+ 		? '-Wno-missing-braces -Wno-char-subscripts'
+ 		: '',
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch
new file mode 100644
index 000000000000..e92e644a7956
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch
@@ -0,0 +1,18 @@
+--- a/inc/Module/Build/Scintilla.pm
++++ b/inc/Module/Build/Scintilla.pm
+@@ -89,7 +89,7 @@
+ 
+ sub stc_ldflags {
+ 	my $self = shift;
+-	return Alien::wxWidgets->link_flags;
++	return Alien::wxWidgets->link_flags . $Config{ldflags};
+ }
+ 
+ sub stc_defines {
+@@ -119,6 +119,7 @@
+ 	my $flags   = qx($command);
+ 	chomp($flags);
+ 	$flags .= ' ' . Alien::wxWidgets->c_flags;
++	$flags .= ' ' . $Config{ccflags};
+ 	return $flags;
+ }
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch
new file mode 100644
index 000000000000..8c025f399926
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch
@@ -0,0 +1,35 @@
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -63,32 +64,6 @@
+ 	$self->_run_command( \@cmd );
+ }
+ 
+-sub stc_prebuild_check {
+-	my $self      = shift;
+-	my $ld        = Alien::wxWidgets->linker;
+-	my $libstring = $self->stc_extra_scintilla_libs;
+-	my $outfile   = 'stc_checkdepends.out';
+-	my $command   = qq($ld -fPIC -shared $libstring -o $outfile);
+-	if ( system($command) ) {
+-		unlink($outfile);
+-		print qq(Check for gtk2 development libraries failed.\n);
+-		print qq(Perhaps you need to install package libgtk2.0-dev or the equivalent for your system.\n);
+-		print qq(You can ofcourse uninstall it later after the installation is complete.\n);
+-		print qq(The build cannot continue.\n);
+-		exit(1);
+-	}
+-	unlink($outfile);
+-	return 1;
+-}
+-
+-sub stc_extra_scintilla_libs {
+-	my $self   = shift;
+-	my $extras = '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 ';
+-	$extras .= '-lgdk_pixbuf-2.0 -lm -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 ';
+-	$extras .= '-lgmodule-2.0 -lgthread-2.0 -lglib-2.0';
+-	return $extras;
+-}
+-
+ sub stc_link_scintilla_objects {
+        my ( $self, $shared_lib, $objects ) = @_;
+