gentoo auto-resync : 22:06:2023 - 19:22:34

4 files changed, 66 insertions, 1 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index afd6de518064..15ab1bf87f7f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index fa9eca24fb55..47f439da6be1 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,6 @@
+AUX kdevelop-23.04.2-astyle-3.4.patch 2271 BLAKE2B 7e7b2124186836e7be43d562e2d1aeed6acb0ec4785d6233b40f7ada6a697b26bf12157e0aab3c198511f74bfe1a2dd1bf8c26d5ea78c318d0d4bf655618b184 SHA512 6fdcf49591eaefe68e831fe371077029ccf3a287bb9d3a9ad68488df381944b870259f466f57b1bdecd4de27d77045a3bda3a0d29d22bccdd72f32c6a9c77f37
 DIST kdevelop-23.04.0.tar.xz 8656872 BLAKE2B 10127854f56fc6d07e8ed974d5d9aacd33c74f6bc21c3ef77541ed446ae33562551708b8b46796bbd3cdc423642d3a6a07f719e81d56c7fd108fa30b671eae5c SHA512 1660f5e819302e3783358556c36d09197f5de4fc4acf25c597e86982ea0ff419f6fdabb718ed74e4a56d3cf9623758c32978f7a12afe0a619a97b626c8c04173
 DIST kdevelop-23.04.2.tar.xz 8660600 BLAKE2B e1f60965cab471dc43d9d1ebc2724f314c7ab67df60ade604b214f767147e7cc3bdf1c21c495301078767df8e6c4c83c73d379ce5f6c6b8fc9caf09ff603273a SHA512 1d971751c830f0d17590d7ae77d104699556bc079a1c74e63586f32eaa372a6462fd86135d405e3c673a229be93e9dbf30816216aa2ea717439ee2d524bcca91
 EBUILD kdevelop-23.04.0.ebuild 4100 BLAKE2B c9d4d4c0d9d10a2878ef03cd80a52aeb73f4f4dcb6e2b006467e7ffbaad880e1895bc35dbd486ef87f046e21899668f0b7c14c184cd2b667386d844798d15ad0 SHA512 8dfdf4e3346cfc31b65453dd6880f1e021a3d34e87545bbd560d05f57a963064ea94c9e8f981bf569b8e89b94e95240ac1b7aee842e5026ef4f554a2913c6e01
-EBUILD kdevelop-23.04.2.ebuild 4077 BLAKE2B db9536a6d865cb2da95a296d789544c9d1d661074546ceca14d35cf06e7a71fa756db6a50a072b0dbc600ebf128ebaa45f06f4a2b84b75f0a9e16dc7ee6f538e SHA512 57cc37d00a6e25472be438a0e27f7925bed1656f731bb68a4be5df6a08a606af6b805fe34be6d90d90d3be459ba01009c5436a269711cefbc882fb98f80786ab
+EBUILD kdevelop-23.04.2.ebuild 4139 BLAKE2B 9da307ee0234c877fcc08c90ba886af008cae55f560e6c3df52d8b27ccd41c4cc412bb28fe2615050d29169fed9753ec80fcf5305f6d01076cb4ae03dc77da12 SHA512 460c236b531233fc0b0aaaaa8b42276e61919a63ed88343227816441366b2122d034b9bdb565729c4f59c0229a2945f7183396430e84e0ac12e752b6ff6daccf
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/files/kdevelop-23.04.2-astyle-3.4.patch b/dev-util/kdevelop/files/kdevelop-23.04.2-astyle-3.4.patch
new file mode 100644
index 000000000000..e5a73298aa19
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-23.04.2-astyle-3.4.patch
@@ -0,0 +1,62 @@
+From 8ca40a6454f053a262926794b96024bd02e0cdc5 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Wed, 31 May 2023 09:31:02 +0200
+Subject: [PATCH] Fix compile with newer astyle
+
+astyle::streamoff was always just an alias for std::streamoff,
+see also the upstream commit [1] that removed the
+`using namespace std` in the `astyle` namespace which breaks this
+code of our here now.
+
+[1]: https://gitlab.com/saalen/astyle/-/commit/0add646b21ee329b231ef7c5ab6963a94fb8935b
+---
+ plugins/astyle/astyle_stringiterator.cpp | 4 ++--
+ plugins/astyle/astyle_stringiterator.h   | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/astyle/astyle_stringiterator.cpp b/plugins/astyle/astyle_stringiterator.cpp
+index 02f8fb4264..a611869581 100644
+--- a/plugins/astyle/astyle_stringiterator.cpp
++++ b/plugins/astyle/astyle_stringiterator.cpp
+@@ -22,7 +22,7 @@ AStyleStringIterator::~AStyleStringIterator()
+ {
+ }
+ 
+-astyle::streamoff AStyleStringIterator::tellg()
++std::streamoff AStyleStringIterator::tellg()
+ {
+   return m_is.pos();
+ }
+@@ -59,7 +59,7 @@ void AStyleStringIterator::peekReset()
+     m_peekStart = -1; // invalid
+ }
+ 
+-astyle::streamoff AStyleStringIterator::getPeekStart() const
++std::streamoff AStyleStringIterator::getPeekStart() const
+ {
+     // NOTE: we're not entirely sure if this is the correct implementation.
+     // we're trying to work-around https://bugs.kde.org/show_bug.cgi?id=399048
+diff --git a/plugins/astyle/astyle_stringiterator.h b/plugins/astyle/astyle_stringiterator.h
+index f63a59c611..713800c0f3 100644
+--- a/plugins/astyle/astyle_stringiterator.h
++++ b/plugins/astyle/astyle_stringiterator.h
+@@ -21,13 +21,14 @@ public:
+     explicit AStyleStringIterator(const QString &string);
+     ~AStyleStringIterator() override;
+ 
+-    astyle::streamoff tellg() override;
++    std::streamoff tellg() override;
+     int getStreamLength() const override;
+     bool hasMoreLines() const override;
+     std::string nextLine(bool emptyLineWasDeleted = false) override;
+     std::string peekNextLine() override;
+     void peekReset() override;
+-    astyle::streamoff getPeekStart() const override;
++    std::streamoff getPeekStart() const override;
++
+ private:
+     QString m_content;
+     QTextStream m_is;
+-- 
+GitLab
+
diff --git a/dev-util/kdevelop/kdevelop-23.04.2.ebuild b/dev-util/kdevelop/kdevelop-23.04.2.ebuild
index 2d0c7632d4a1..949487270abd 100644
--- a/dev-util/kdevelop/kdevelop-23.04.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.04.2.ebuild
@@ -95,6 +95,8 @@ RDEPEND="${COMMON_DEPEND}
 	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-astyle-3.4.patch" ) # bug 908977
+
 llvm_check_deps() {
 	has_version -d "sys-devel/clang:${LLVM_SLOT}"
 }