[arch-commits] Commit in codeblocks/trunk (PKGBUILD codeblocks-gcc11.patch)

[Antonio Rojas]

    Date: Monday, April 25, 2022 @ 07:11:25
  Author: arojas
Revision: 1189981

CE0BDE71A759A87F23F0F7D8B61DBCE10901C163 key rebuild

Added:
  codeblocks/trunk/codeblocks-gcc11.patch
Modified:
  codeblocks/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   10 +++++++---
 codeblocks-gcc11.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-25 07:09:23 UTC (rev 1189980)
+++ PKGBUILD	2022-04-25 07:11:25 UTC (rev 1189981)
@@ -8,7 +8,7 @@
 
 pkgname=codeblocks
 pkgver=20.03
-pkgrel=1
+pkgrel=2
 pkgdesc='Cross-platform C/C++ IDE'
 arch=('x86_64')
 url='http://codeblocks.org/'
@@ -15,8 +15,10 @@
 license=('GPL3')
 depends=('boost-libs' 'wxgtk3' 'hunspell')
 makedepends=('boost' 'imagemagick' 'zip')
-source=("https://downloads.sourceforge.net/codeblocks/$pkgname-$pkgver.tar.xz")
-sha256sums=('15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5')
+source=("https://downloads.sourceforge.net/codeblocks/$pkgname-$pkgver.tar.xz"
+         codeblocks-gcc11.patch)
+sha256sums=('15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5'
+            '10b2b08440adc447d1d23eb122fa37beff1f26b9d7588b83f8435721586f4ed1')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -23,6 +25,8 @@
   convert src/mime/codeblocks.png +set date:create +set date:modify -background none -extent 64x64 src/mime/codeblocks.png
   sed -i 's|$(datadir)/pixmaps|$(datadir)/icons/hicolor/64x64/apps|' src/mime/Makefile.{am,in}
   sed -i 's|$(datarootdir)/appdata|$(datarootdir)/metainfo|' Makefile.{am,in} src/plugins/contrib/appdata/Makefile.{am,in}
+
+  patch -p1 < ../codeblocks-gcc11.patch # Fix build with GCC 11 (Fedora)
 }
 
 build() {

Added: codeblocks-gcc11.patch
===================================================================
--- codeblocks-gcc11.patch	                        (rev 0)
+++ codeblocks-gcc11.patch	2022-04-25 07:11:25 UTC (rev 1189981)
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h
+index 7fd7a95..87b08ee 100644
+--- a/src/plugins/openfileslist/openfileslistplugin.h
++++ b/src/plugins/openfileslist/openfileslistplugin.h
+@@ -23,7 +23,7 @@ struct TargetFilesData
+     // Functor for the std::set predicate to sort the opened editor files according to their tab order
+     struct compareLess
+     {
+-        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; }
++        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) const { return lhs->editorTabPos < rhs->editorTabPos; }
+     };
+     typedef std::set<ProjectFile*, compareLess> OpenFilesSet;
+     ProjectFile* activeFile;