[arch-commits] Commit in codeblocks/repos/community-x86_64 (3 files)

[Antonio Rojas]

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

archrelease: copy trunk to community-x86_64

Added:
  codeblocks/repos/community-x86_64/PKGBUILD
    (from rev 1189981, codeblocks/trunk/PKGBUILD)
  codeblocks/repos/community-x86_64/codeblocks-gcc11.patch
    (from rev 1189981, codeblocks/trunk/codeblocks-gcc11.patch)
Deleted:
  codeblocks/repos/community-x86_64/PKGBUILD

------------------------+
 PKGBUILD               |   80 ++++++++++++++++++++++++-----------------------
 codeblocks-gcc11.patch |   13 +++++++
 2 files changed, 55 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-25 07:11:25 UTC (rev 1189981)
+++ PKGBUILD	2022-04-25 07:11:37 UTC (rev 1189982)
@@ -1,38 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Robert Hollencamp <rhollencamp at gmail.com>
-# Contributor: Daniel J Griffiths <griffithsdj at inbox.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Roman Mikhayloff <rimf at inbox.ru>
-
-pkgname=codeblocks
-pkgver=20.03
-pkgrel=1
-pkgdesc='Cross-platform C/C++ IDE'
-arch=('x86_64')
-url='http://codeblocks.org/'
-license=('GPL3')
-depends=('boost-libs' 'wxgtk3' 'hunspell')
-makedepends=('boost' 'imagemagick' 'zip')
-source=("https://downloads.sourceforge.net/codeblocks/$pkgname-$pkgver.tar.xz")
-sha256sums=('15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5')
-
-prepare() {
-  cd $pkgname-$pkgver
-  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}
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-contrib-plugins=all,-FileManager --with-wx-config=/usr/bin/wx-config-gtk3
-  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: codeblocks/repos/community-x86_64/PKGBUILD (from rev 1189981, codeblocks/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-25 07:11:37 UTC (rev 1189982)
@@ -0,0 +1,42 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Robert Hollencamp <rhollencamp at gmail.com>
+# Contributor: Daniel J Griffiths <griffithsdj at inbox.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Roman Mikhayloff <rimf at inbox.ru>
+
+pkgname=codeblocks
+pkgver=20.03
+pkgrel=2
+pkgdesc='Cross-platform C/C++ IDE'
+arch=('x86_64')
+url='http://codeblocks.org/'
+license=('GPL3')
+depends=('boost-libs' 'wxgtk3' 'hunspell')
+makedepends=('boost' 'imagemagick' 'zip')
+source=("https://downloads.sourceforge.net/codeblocks/$pkgname-$pkgver.tar.xz"
+         codeblocks-gcc11.patch)
+sha256sums=('15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5'
+            '10b2b08440adc447d1d23eb122fa37beff1f26b9d7588b83f8435721586f4ed1')
+
+prepare() {
+  cd $pkgname-$pkgver
+  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() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --with-contrib-plugins=all,-FileManager --with-wx-config=/usr/bin/wx-config-gtk3
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: codeblocks/repos/community-x86_64/codeblocks-gcc11.patch (from rev 1189981, codeblocks/trunk/codeblocks-gcc11.patch)
===================================================================
--- codeblocks-gcc11.patch	                        (rev 0)
+++ codeblocks-gcc11.patch	2022-04-25 07:11:37 UTC (rev 1189982)
@@ -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;