[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2024-03-09 Thread Sam James
commit: 1942cc9d811e65d8488108b1ef0948058c53f213
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Mar  9 18:46:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  9 20:53:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1942cc9d

dev-util/codeblocks: 20.03-r7, fix DoxyBlocks plugin startup segfault

Closes: https://bugs.gentoo.org/925955

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r7.ebuild | 97 ++
 ...cks-20.03_fix_DoxyBlocks_startup_segfault.patch | 61 ++
 2 files changed, 158 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
new file mode 100644
index ..a3c08cf9ffa1
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+   https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+   https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+   https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+   
https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   dev-libs/glib:2
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-arch/bzip2
+   app-text/hunspell:=
+   dev-libs/boost:=
+   dev-libs/libgamin
+   media-libs/fontconfig
+   sys-libs/zlib
+   )"
+
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-env.patch
+   "${WORKDIR}"/patches/
+   "${FILESDIR}"/${P}_fix_DoxyBlocks_startup_segfault.patch
+   )
+
+src_prepare() {
+   default
+   # Force to use bundled Squirrel-3.1 (patched version is used by 
upstream) due to it's API was changed
+   sed -i '/PKG_CHECK_MODULES(\[SQUIRREL\]/c\HAVE_SQUIRREL=no' 
configure.ac || die # Bug 884601
+   eautoreconf
+}
+
+src_configure() {
+   # Bug 858338
+   append-flags -fno-strict-aliasing
+
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   local myeconfargs=(
+   --disable-pch
+   $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)")
+   $(use_enable debug)
+   ${CONF_WITH_LST}
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}

diff --git 
a/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch
 
b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch
new file mode 100644
index ..d641dcb75f83
--- /dev/null
+++ 
b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch
@@ -0,0 +1,61 @@
+Upstream patch: https://sourceforge.net/p/codeblocks/code/12074/
+Upstream issue: https://sourceforge.net/p/codeblocks/tickets/839/
+Gentoo issue: https://bugs.gentoo.org/925955
+
+--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
 b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
+@@ -101,8 +101,8 @@
+ 
+ // constructor
+ DoxyBlocks::DoxyBlocks() :
+-m_pToolbar(0l),
+-m_DoxyBlocksLog(0l),
++m_pToolbar(nullptr),
++m_DoxyBlocksLog(nullptr),
+ m_LogPageIndex(0),
+ m_bAutoVersioning(false)
+ {
+@@ -234,8 +234,10 @@
+  */
+ void DoxyBlocks::OnUpdateUI(wxUpdateUIEvent& WXUNUSED(event))
+ {
+-if(Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0){
+-m_pToolbar->Enable(false);
++if (Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0)
++{
++  

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/

2024-03-09 Thread Sam James
commit: ea2b6a11aca27a11c87862518b9a536f8af94738
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Mar  9 18:49:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  9 20:53:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2b6a11

dev-util/codeblocks: 20.03-r7, fix Scintilla buffer over-read warning

Upstream patch: https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3
Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/

[sam: Revbump done in previous commit.]

Bug: https://bugs.gentoo.org/925955
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35687
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r7.ebuild |  1 +
 ..._buffer_over-read_with_absolute_reference.patch | 24 ++
 2 files changed, 25 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
index a3c08cf9ffa1..96c7e10e1ae8 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${P}-env.patch
"${WORKDIR}"/patches/
"${FILESDIR}"/${P}_fix_DoxyBlocks_startup_segfault.patch
+   
"${FILESDIR}"/${P}_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
)
 
 src_prepare() {

diff --git 
a/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
 
b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
new file mode 100644
index ..7ef01faf9cd2
--- /dev/null
+++ 
b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch
@@ -0,0 +1,24 @@
+Upstream patch: 
https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3c92a1371372bd601cd572a078d5e4041a4/
+Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/
+Codeblocks forum discussion: 
https://forums.codeblocks.org/index.php?topic=24505.0
+
+lexers/LexMMIXAL.cxxDiffSwitch to side-by-side view
+--- a/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx
 b/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx
+@@ -99,12 +99,11 @@
+   }
+   } else if (sc.state == SCE_MMIXAL_REF) {
// REF
+   if (!IsAWordChar(sc.ch) ) {
+-  char s[100];
+-  sc.GetCurrent(s, sizeof(s));
++  char s0[100];
++  sc.GetCurrent(s0, sizeof(s0));
++  const char *s = s0;
+   if (*s == ':') {// ignore base prefix 
for match
+-  for (size_t i = 0; i != sizeof(s); ++i) 
{
+-  *(s+i) = *(s+i+1);
+-  }
++  ++s;
+   }
+   if (special_register.InList(s)) {
+   sc.ChangeState(SCE_MMIXAL_REGISTER);



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2023-06-09 Thread Viorel Munteanu
commit: 869e227061b34bbf1f7e68e8a6045e9c51b8ee78
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jun  2 20:39:06 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Jun  9 11:05:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869e2270

dev-util/codeblocks: drop old 20.03-r4, 20.03-r5 revisions

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/31278
Signed-off-by: Viorel Munteanu  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r4.ebuild | 80 
 dev-util/codeblocks/codeblocks-20.03-r5.ebuild | 85 --
 2 files changed, 165 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
deleted file mode 100644
index 6f2f211771d4..
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
-"
-
-# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
-# that is delivered with Code::Blocks 20.03 source code.
-# https://sourceforge.net/projects/fortranproject
-# https://cbfortran.sourceforge.io
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.1-r2:0/3.1
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-admin/gamin
-   app-text/hunspell
-   dev-libs/boost:=
-   )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-env.patch
-   "${WORKDIR}"/patches/
-   )
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   # Bug 858338
-   append-flags -fno-strict-aliasing
-
-   setup-wxwidgets
-
-   # USE="contrib -fortran" setup:
-   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
-   # USE="contrib fortran" setup:
-   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-   # USE="-contrib fortran" setup:
-   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
-
-   econf \
-   --disable-static \
-   $(use_with contrib boost-libdir 
"${ESYSROOT}/usr/$(get_libdir)") \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-}
-
-pkg_postrm() {
-   xdg_pkg_postrm
-}

diff --git a/dev-util/codeblocks/codeblocks-20.03-r5.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
deleted file mode 100644
index ac379f1867b5..
--- a/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
-"
-
-# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
-# that is delivered with Code::Blocks 20.03 source code.
-# https://sourceforge.net/projects/fortranproject
-# https://cbfortran.sourceforge.io
-
-IUSE="contrib debug fortran"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.1-r2:0/3.1
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-admin/gamin
-   app-text/hunspell
-   dev-libs/boost:=
-   )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-env.patch
-   "${WORKDIR}"/patches/
-   )
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   # Bug 858338
-   append-flags -fno-strict-aliasing
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2023-05-03 Thread Arthur Zamarin
commit: a0f66b5e47a4bafd5d006251b3823fedc6f25772
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  4 04:24:01 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  4 04:24:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f66b5e

dev-util/codeblocks: Stabilize 20.03-r6 x86, #905663

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
index 87e9a39cc7da..fbdc320bcdc1 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2023-05-03 Thread Arthur Zamarin
commit: f1d7816992ecbc54ed6bbc58834c3a686e3d29b9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  4 04:23:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  4 04:23:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d78169

dev-util/codeblocks: Stabilize 20.03-r6 amd64, #905663

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
index 0e018ea8b99c..87e9a39cc7da 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2023-04-13 Thread Sam James
commit: 74506968d83ac1b83ba8f133a734c28a8aa85c78
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun Apr  2 19:35:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 01:05:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74506968

dev-util/codeblocks:  update; switch to wxGTK:3.2-gtk3

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/30449
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-.ebuild | 30 +-
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 6a574aa1d60e..9f4d81cecb69 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 
 inherit autotools flag-o-matic subversion wxwidgets xdg
 
@@ -22,16 +22,25 @@ IUSE="contrib debug"
 BDEPEND="virtual/pkgconfig"
 
 RDEPEND="app-arch/zip
+   dev-libs/glib:2
>=dev-libs/tinyxml-2.6.2-r3
>=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/gtk+:3
x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
app-admin/gamin
-   app-text/hunspell
+   app-arch/bzip2
+   app-text/hunspell:=
dev-libs/boost:=
+   dev-libs/libgamin
+   media-libs/fontconfig
+   sys-libs/zlib
)"
 
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
 
 PATCHES=( "${FILESDIR}/${P}-nodebug.diff" )
 
@@ -51,12 +60,15 @@ src_configure() {
 
setup-wxwidgets
 
-   econf \
-   --disable-pch \
-   --disable-static \
-   $(use_with contrib boost-libdir 
"${ESYSROOT}/usr/$(get_libdir)") \
-   $(use_enable debug) \
+   local myeconfargs=(
+   --disable-pch
+   --disable-static
+   $(use_enable debug)
+   $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)")
$(use_with contrib contrib-plugins all)
+   )
+
+   econf "${myeconfargs[@]}"
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2023-02-10 Thread Joonas Niilola
commit: b924a78400249ae434557c8dfb8a8f5a0eafdec2
Author: Matthew White  inventati  org>
AuthorDate: Fri Jan 20 08:09:58 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 10 08:56:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b924a784

dev-util/codeblocks: use bundled dev-lang/squirrel

Fix a compiling issue when dev-lang/squirrel is installed.

Upstream disabled the use of system wide squirrel in favor of the
bundled version.  Do not use the system's /usr/include/squirrel.h
header, since the API may have been changed.

r12418 | fuscated | 2021-05-09 14:50:21 +0200 (Sun, 09 May 2021) | 5 lines

$ svn checkout svn://svn.code.sf.net/p/codeblocks/code/trunk
$ cd trunk
$ svn log --diff configure.ac@r12418

In the ebuild, sed expression and comments by band-a-prend.

Closes: https://bugs.gentoo.org/884601
Package-Manager: portage-3.0.43-r1, pkgdev-0.2.4
Closes: https://github.com/gentoo/gentoo/pull/29186
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r6.ebuild | 94 ++
 1 file changed, 94 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
new file mode 100644
index ..33e87a9e4106
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+   https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+   https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+   https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+   
https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   dev-libs/glib:2
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-arch/bzip2
+   app-text/hunspell:=
+   dev-libs/libgamin
+   media-libs/fontconfig
+   sys-libs/zlib
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-env.patch
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   # Force to use bundled Squirrel-3.1 (patched version is used by 
upstream) due to it's API was changed
+   sed -i '/PKG_CHECK_MODULES(\[SQUIRREL\]/c\HAVE_SQUIRREL=no' 
configure.ac || die # Bug 884601
+   eautoreconf
+}
+
+src_configure() {
+   # Bug 858338
+   append-flags -fno-strict-aliasing
+
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   local myeconfargs=(
+   --disable-pch
+   $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)")
+   $(use_enable debug)
+   ${CONF_WITH_LST}
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2023-02-10 Thread Joonas Niilola
commit: 93bd8c0c7f6017c70f9cb1e44376761f7f78a25a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Feb 10 08:53:29 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 10 08:57:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93bd8c0c

dev-util/codeblocks: add few missing deps on 20.03-r6

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r6.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
index 33e87a9e4106..0e018ea8b99c 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
@@ -38,12 +38,14 @@ RDEPEND="app-arch/zip
app-admin/gamin
app-arch/bzip2
app-text/hunspell:=
+   dev-libs/boost:=
dev-libs/libgamin
media-libs/fontconfig
sys-libs/zlib
)"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"
 
 PATCHES=(
"${FILESDIR}"/${P}-env.patch



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2022-11-24 Thread Sam James
commit: a089be156319250f8799f46b48214ae886abec2f
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:41:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:41:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a089be15

dev-util/codeblocks: fix copyright header

Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
index c2a63be58acf..6f2f211771d4 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2022-11-24 Thread Sam James
commit: 61e04583514997c1e9291a45cbb4849c3e3ca252
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Jun  4 22:03:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:40:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e04583

dev-util/codeblocks: rm libtool files (.la) on src_install, drop masked USE=pch

Closes: https://bugs.gentoo.org/845303

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r5.ebuild | 82 ++
 dev-util/codeblocks/codeblocks-.ebuild |  9 ++-
 2 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r5.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
new file mode 100644
index ..2386d2f6729d
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-env.patch
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-pch \
+   --disable-static \
+   $(use_with contrib boost-libdir 
"${ESYSROOT}/usr/$(get_libdir)") \
+   $(use_enable debug) \
+   ${CONF_WITH_LST}
+}
+
+src_install() {
+   default
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 3ce6e1a69d71..4da29506d57b 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -17,7 +17,7 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
 ESVN_FETCH_CMD="svn checkout --ignore-externals"
 ESVN_UPDATE_CMD="svn update --ignore-externals"
 
-IUSE="contrib debug pch"
+IUSE="contrib debug"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -49,13 +49,18 @@ src_configure() {
setup-wxwidgets
 
econf \
+   --disable-pch \
--disable-static \
$(use_with contrib boost-libdir 
"${ESYSROOT}/usr/$(get_libdir)") \
$(use_enable debug) \
-   $(use_enable pch) \
$(use_with contrib contrib-plugins all)
 }
 
+src_install() {
+   default
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
 pkg_postinst() {
xdg_pkg_postinst
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2022-11-24 Thread Sam James
commit: 22bdf13582b47bb942ec7ba51660947e84fbc1f4
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Sep  2 12:18:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:40:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22bdf135

dev-util/codeblocks: pass '-fno-strict-aliasing' to fix compile error (lto)

The related reported upstream issue for dev-util/codeblocks-:
https://sourceforge.net/p/codeblocks/tickets/1303/

Closes: https://bugs.gentoo.org/858338

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/25758
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r4.ebuild | 5 -
 dev-util/codeblocks/codeblocks-20.03-r5.ebuild | 5 -
 dev-util/codeblocks/codeblocks-.ebuild | 5 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
index a4c49bac1afe..c2a63be58acf 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools wxwidgets xdg
+inherit autotools flag-o-matic wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
@@ -51,6 +51,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # Bug 858338
+   append-flags -fno-strict-aliasing
+
setup-wxwidgets
 
# USE="contrib -fortran" setup:

diff --git a/dev-util/codeblocks/codeblocks-20.03-r5.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
index 2386d2f6729d..ac379f1867b5 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools wxwidgets xdg
+inherit autotools flag-o-matic wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
@@ -51,6 +51,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # Bug 858338
+   append-flags -fno-strict-aliasing
+
setup-wxwidgets
 
# USE="contrib -fortran" setup:

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 4da29506d57b..6a574aa1d60e 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools subversion wxwidgets xdg
+inherit autotools flag-o-matic subversion wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
@@ -46,6 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # Bug 858338
+   append-flags -fno-strict-aliasing
+
setup-wxwidgets
 
econf \



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2022-05-13 Thread Sam James
commit: 174a1c6156dc5d6502bd944900b745f7f80959d1
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  8 22:38:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 13 20:03:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174a1c61

dev-util/codeblocks: update .ebuild

The USE-flag "pch" isn't droped this time due to
https://sourceforge.net/p/codeblocks/tickets/1266/

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/25393
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-.ebuild| 11 +--
 ...blocks-17.12-nodebug.diff => codeblocks--nodebug.diff} |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 580a1b03b545..3ce6e1a69d71 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
@@ -15,6 +15,7 @@ KEYWORDS=""
 SRC_URI=""
 ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
 ESVN_FETCH_CMD="svn checkout --ignore-externals"
+ESVN_UPDATE_CMD="svn update --ignore-externals"
 
 IUSE="contrib debug pch"
 
@@ -32,7 +33,7 @@ RDEPEND="app-arch/zip
 
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
+PATCHES=( "${FILESDIR}/${P}-nodebug.diff" )
 
 src_prepare() {
default
@@ -49,15 +50,13 @@ src_configure() {
 
econf \
--disable-static \
+   $(use_with contrib boost-libdir 
"${ESYSROOT}/usr/$(get_libdir)") \
$(use_enable debug) \
$(use_enable pch) \
$(use_with contrib contrib-plugins all)
 }
 
 pkg_postinst() {
-   elog "The Symbols Browser is disabled due to it causing crashes."
-   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
-
xdg_pkg_postinst
 }
 

diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff 
b/dev-util/codeblocks/files/codeblocks--nodebug.diff
similarity index 80%
rename from dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
rename to dev-util/codeblocks/files/codeblocks--nodebug.diff
index 7cbb678dda6a..1187f53539fc 100644
--- a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
+++ b/dev-util/codeblocks/files/codeblocks--nodebug.diff
@@ -1,7 +1,7 @@
 # Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug"
 diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4
 old/m4/acinclude.m42017-11-01 02:32:37.0 +0300
-+++ new/m4/acinclude.m42018-05-04 11:08:33.0 +0300
+--- old/m4/acinclude.m4
 new/m4/acinclude.m4
 @@ -91,8 +91,6 @@
  AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging 
(default is OFF)])],,
 enable_debug=$debug_default)



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/

2022-05-13 Thread Sam James
commit: a9e3756de249e709bc29ef602f2c099b88163c22
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  8 22:34:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 13 20:03:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e3756d

dev-util/codeblocks: cleanup old 17.12-r*, <=20.03-r3

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/Manifest   |  3 -
 dev-util/codeblocks/codeblocks-17.12-r303.ebuild   | 86 --
 dev-util/codeblocks/codeblocks-17.12-r304.ebuild   | 83 -
 dev-util/codeblocks/codeblocks-20.03-r1.ebuild | 76 ---
 dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 77 ---
 dev-util/codeblocks/codeblocks-20.03-r3.ebuild | 76 ---
 .../codeblocks-17.12-fix-crash-on-copypaste.patch  | 20 -
 .../codeblocks-20.03_gcc11_compatibility.patch | 12 ---
 8 files changed, 433 deletions(-)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 2c6b6a8da73e..86c03b3b4a25 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,8 +1,5 @@
-DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
-DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 
4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9
 SHA512 
b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz 52572 BLAKE2B 
4752a84f5471f68f2c1044df6c6c3c25dd61f03e916bfcff1d091fe66aec8911cd02c7d824431dd307267d00af209cfd0b614528fe091a2d3c4bccbc688e83ef
 SHA512 
acd79ffeed03023ac5e33fd685942f5593d0f7bc488b1d53e6c502618b980d565b1f2bc479da4de869ad2e839e263ddbff2a8847ef39b822aab69b87d5cd01a8
 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B 
df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61
 SHA512 
aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
 DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B 
c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8
 SHA512 
0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a
 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 
3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e
 SHA512 
06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B 
cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f
 SHA512 
f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
-DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
deleted file mode 100644
index 6c32f926facd..
--- a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
-   >=dev-libs/tinyxml-2.6.2-r3
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-12-06 Thread Agostino Sarubbo
commit: 1b5b89a75a58f34461d20e847a4e63b75129be30
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  6 11:30:25 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  6 11:30:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5b89a7

dev-util/codeblocks: x86 stable wrt bug #828357

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
index dbc699796440..a4c49bac1afe 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-12-06 Thread Agostino Sarubbo
commit: 56e90dc4fd97838b9c42f0437e955128e09552a3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  6 08:00:49 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  6 08:00:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e90dc4

dev-util/codeblocks: amd64 stable wrt bug #828357

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
index 2a412fb830c1..dbc699796440 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-11-02 Thread Sam James
commit: 701ccd19940c2feb049c9364fcce163368b69cc8
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Oct 30 13:10:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 11:00:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701ccd19

dev-util/codeblocks: Fix x32 contrib plugins. Add boost-libdir option

Closes: https://bugs.gentoo.org/820527

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/22763
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r4.ebuild | 77 ++
 1 file changed, 77 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
new file mode 100644
index 000..2a412fb830c
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-env.patch
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-static \
+   $(use_with contrib boost-libdir 
"${ESYSROOT}/usr/$(get_libdir)") \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-10-12 Thread Sam James
commit: 2d868d475e83d3c277dc2089d9d6c6fcb4f759a1
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun Aug 15 13:04:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 12 21:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d868d47

dev-util/codeblocks: 20.03 fix SymbolBrowser, update FortranProject

This commit adds patchsets that
- Fixes issue for SymbolBrowser plugin, enables it again for WXGTK-3.0;
  updates CodeCompletition plugin as well.
- Updates FortranProject plugin to v1.8:
  improved the C Pre-Processor directives and enables code-completion
  for code that uses such directives.

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/Manifest   |  2 +
 dev-util/codeblocks/codeblocks-20.03-r3.ebuild | 76 ++
 2 files changed, 78 insertions(+)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index af1c64a7447..2c6b6a8da73 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,6 +1,8 @@
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 
4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9
 SHA512 
b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
+DIST codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz 52572 BLAKE2B 
4752a84f5471f68f2c1044df6c6c3c25dd61f03e916bfcff1d091fe66aec8911cd02c7d824431dd307267d00af209cfd0b614528fe091a2d3c4bccbc688e83ef
 SHA512 
acd79ffeed03023ac5e33fd685942f5593d0f7bc488b1d53e6c502618b980d565b1f2bc479da4de869ad2e839e263ddbff2a8847ef39b822aab69b87d5cd01a8
 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B 
df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61
 SHA512 
aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
+DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B 
c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8
 SHA512 
0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a
 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 
3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e
 SHA512 
06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B 
cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f
 SHA512 
f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

diff --git a/dev-util/codeblocks/codeblocks-20.03-r3.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r3.ebuild
new file mode 100644
index 000..cfdd776089d
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 
[r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-10-12 Thread Sam James
commit: d19a4495d20fef45c9671922245f0ad609e7c0d7
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Oct  8 21:55:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 12 21:13:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19a4495

dev-util/codeblocks: add maintainer "proxy-maint" to metadata.xml

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/21996
Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/metadata.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 2c1b8b4c92f..0e17c4313d1 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -5,7 +5,11 @@
 torokhov-...@yandex.ru
 Sergey Torokhov
   
-  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+  
 wxwidg...@gentoo.org
 Gentoo wxWidgets Project
   



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-03-16 Thread Sam James
commit: c93bc45af0868e3839e8deaf5dd9ad6df6ccce4f
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 17 02:18:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 17 02:18:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93bc45a

dev-util/codeblocks: Stabilize 20.03-r2 x86, #775296

Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index cf1336f6f60..9e4061b5925 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2021-03-12 Thread Sam James
commit: 237323a8d3fb82f0c44847a8ad0d862db21fe9d1
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 12 15:22:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 12 15:24:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237323a8

dev-util/codeblocks: Stabilize 20.03-r2 amd64, #775296

Signed-off-by: Sam James  gentoo.org>

 dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index 16fbd94b772..cf1336f6f60 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2020-10-14 Thread Sergei Trofimovich
commit: 56d8bafba4d7c3431ebcbd05492f0b16b5ce8001
Author: band-a-prend  yandex  ru>
AuthorDate: Wed Oct 14 15:29:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Oct 14 18:35:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d8bafb

dev-util/codeblocks: fix gcc-11 compatibility

The GCC 11 now enforces that comparison objects be invocable as const.

Current patch to fix gcc-11 compatibility is proposed by
Sergei Trofimovich  gentoo.org>
and fix codeblocks "openfileslist" pligin compilation error.

Patch was sent to upstream :
https://sourceforge.net/p/codeblocks/tickets/1022/
so live-ebuild currently doesn't apply it.

Closes: https://bugs.gentoo.org/732818

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/17928
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r304.ebuild   | 83 ++
 dev-util/codeblocks/codeblocks-20.03-r2.ebuild | 77 
 .../codeblocks-20.03_gcc11_compatibility.patch | 12 
 3 files changed, 172 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r304.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
new file mode 100644
index 000..88841742c92
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.0.1-r1:0=
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
+   "${FILESDIR}"/${P}-nodebug.diff
+   "${FILESDIR}"/${PN}-20.03_gcc11_compatibility.patch
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   if has_version ">=dev-util/astyle-3.1" ; then
+   eapply 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   fi
+   sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = 
\$(datarootdir)/metainfo:" Makefile.am || die # bug 709450
+   sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = 
\$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 
709450
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   elog "The Symbols Browser is disabled due to it causing crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
+
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}

diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
new file mode 100644
index 000..16fbd94b772
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 
[r298])
+# that is delivered with Code::Blocks 20.03 source code.
+# 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-10-14 Thread Sergei Trofimovich
commit: ae53df895aa15e0f014e4fba335cdee7103888af
Author: band-a-prend  yandex  ru>
AuthorDate: Wed Oct 14 16:24:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Oct 14 18:35:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae53df89

dev-util/codeblocks: drop old revisions

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r302.ebuild | 83 
 dev-util/codeblocks/codeblocks-20.03.ebuild  | 75 -
 2 files changed, 158 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
deleted file mode 100644
index 47cecf4c74f..000
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.0.1-r1:0=
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-admin/gamin
-   app-text/hunspell
-   dev-libs/boost:=
-   )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
-   "${WORKDIR}"/patches/
-   )
-
-src_prepare() {
-   default
-   if has_version ">=dev-util/astyle-3.1" ; then
-   eapply 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
-   fi
-   eautoreconf
-}
-
-src_configure() {
-   setup-wxwidgets
-
-   # USE="contrib -fortran" setup:
-   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
-   # USE="contrib fortran" setup:
-   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-   # USE="-contrib fortran" setup:
-   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
-
-   econf \
-   --disable-static \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-   elog "The Symbols Browser is disabled due to it causing crashes."
-   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
-
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-}

diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild 
b/dev-util/codeblocks/codeblocks-20.03.ebuild
deleted file mode 100644
index c8915abb8e2..000
--- a/dev-util/codeblocks/codeblocks-20.03.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="https://codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 
[r277])
-# that is delivered with Code::Blocks 20.03 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="app-arch/zip
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.1-r2:0/3.1
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-admin/gamin
-   app-text/hunspell
-   dev-libs/boost:=
-   )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-env.patch
-   "${WORKDIR}"/patches/
-   )
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   setup-wxwidgets
-
-   # USE="contrib -fortran" setup:
-   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
-   # USE="contrib fortran" setup:
-   use fortran && 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-07-17 Thread Agostino Sarubbo
commit: 949d2443577cb391f77c6fbb35dff4fa4a53941c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 07:43:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 07:43:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949d2443

dev-util/codeblocks: x86 stable wrt bug #731782

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r303.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
index fa019151839..6c32f926fac 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 
https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-07-17 Thread Agostino Sarubbo
commit: b572d292a4a27bf545fbb5c232adf60fa8597535
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 07:19:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 07:19:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b572d292

dev-util/codeblocks: amd64 stable wrt bug #731782

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/Manifest | 4 ++--
 dev-util/codeblocks/codeblocks-17.12-r303.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 34dcb581521..af1c64a7447 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,6 +1,6 @@
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 
4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9
 SHA512 
b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
-DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
-DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 
3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e
 SHA512 
06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B 
df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61
 SHA512 
aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
+DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 
3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e
 SHA512 
06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B 
cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f
 SHA512 
f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
+DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
index 3a4c4727590..fa019151839 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 
https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-07-06 Thread Mart Raudsepp
commit: 84a1fba2e9170930aee9a31d98a16cb75a7774d4
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Jun  8 00:13:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jul  6 07:27:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a1fba2

dev-util/codeblocks: 20.03, update FortranProject plugin to 1.7 release

Additional patch set updates FortranProject plugin to release v1.7
that contains several bug fixes, new features and improvements.

Closes: https://github.com/gentoo/gentoo/pull/16114
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/Manifest   |  1 +
 dev-util/codeblocks/codeblocks-20.03-r1.ebuild | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 94ac45d31f8..34dcb581521 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -2,4 +2,5 @@ DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 
4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9
 SHA512 
b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 
3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e
 SHA512 
06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
+DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B 
df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61
 SHA512 
aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B 
cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f
 SHA512 
f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097

diff --git a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild 
b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
new file mode 100644
index 000..37605d50b64
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 
[r298])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-env.patch
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   elog "The Symbols Browser is disabled due to it causing crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/

2020-04-08 Thread Mart Raudsepp
commit: 8db46d60049775745930ef445cebe801d802932d
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Mar 31 01:59:27 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr  8 06:34:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db46d60

dev-util/codeblocks: 20.03 version bump

- Update CodeBLocks to 20.03 with new patch to build Fortranroject plugin;
- Now xdg eclass is used instead of xdg-utils eclass;
- FortranProject plugin update from [r270] to [r277] with some additional
  features before FortranProject v1.7 release. Patch from [r273] fixes
  the build issue for compiling with USE=pch.

Closes: https://github.com/gentoo/gentoo/pull/15182
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/Manifest   |  2 +
 dev-util/codeblocks/codeblocks-20.03.ebuild| 75 ++
 .../codeblocks/files/codeblocks-20.03-env.patch| 29 +
 3 files changed, 106 insertions(+)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index c685be7d1e5..94ac45d31f8 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,3 +1,5 @@
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 
4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9
 SHA512 
b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
+DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 
3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e
 SHA512 
06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
+DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B 
cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f
 SHA512 
f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097

diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild 
b/dev-util/codeblocks/codeblocks-20.03.ebuild
new file mode 100644
index 000..c8915abb8e2
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 
[r277])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-env.patch
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   elog "The Symbols Browser is disabled due to it causing crashes."
+   elog "For more information 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-04-08 Thread Mart Raudsepp
commit: 8132de135d13fba13c6679f98ec49ae18d000f49
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Mar 31 01:53:02 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr  8 06:34:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8132de13

dev-util/codeblocks: update live ebuild

- fix HOMEPAGE to use https
- replace xdg-utils eclass with xdg eclass

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-.ebuild | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 5350bd29d7c..580a1b03b54 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -5,10 +5,10 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools subversion wxwidgets xdg-utils
+inherit autotools subversion wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/;
+HOMEPAGE="https://codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
@@ -58,13 +58,9 @@ pkg_postinst() {
elog "The Symbols Browser is disabled due to it causing crashes."
elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
 
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
+   xdg_pkg_postinst
 }
 
 pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
+   xdg_pkg_postrm
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2020-03-22 Thread Mart Raudsepp
commit: 98cd643eb9453b7d80588428d97311d8caf2659a
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun Mar 15 17:58:44 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Mar 22 19:19:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cd643e

dev-util/codeblocks-17.12-r303: fix crash on paste; fix appdata-deprecated

- Fix crash on copy-paste from another applcation using upstream patch
https://sourceforge.net/p/codeblocks/code/11320/
from ticket
https://sourceforge.net/p/codeblocks/tickets/629/.

- Fix HOMEPAGE: from http://www to https://

- Fix installation into /usr/share/appdata that is deprecated

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/14969
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r303.ebuild   | 86 ++
 .../codeblocks-17.12-fix-crash-on-copypaste.patch  | 20 +
 2 files changed, 106 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
new file mode 100644
index 000..3a4c4727590
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.0.1-r1:0=
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
+   "${FILESDIR}"/${P}-nodebug.diff
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   if has_version ">=dev-util/astyle-3.1" ; then
+   eapply 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   fi
+   sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = 
\$(datarootdir)/metainfo:" Makefile.am || die # bug 709450
+   sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = 
\$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 
709450
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   elog "The Symbols Browser is disabled due to it causing crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
+
+   xdg_desktop_database_update
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+}

diff --git 
a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch 
b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
new file mode 100644
index 000..9918c58d8e8
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
@@ -0,0 +1,20 @@
+# Fix crashing on paste of copied text from other applications
+# https://sourceforge.net/p/codeblocks/tickets/629/
+diff -Nuar a/main.cpp b/main.cpp
+--- a/src/src/main.cpp 2017-11-01 02:32:38.0 +0300
 b/src/src/main.cpp 2020-03-13 21:59:25.0 +0300
+@@ -4321,7 +4321,13 @@
+ }
+ 
+ if (Manager::Get()->GetEditorManager() && event.GetEditor() == 
Manager::Get()->GetEditorManager()->GetActiveEditor())
+-DoUpdateStatusBar();
++{
++#if wxCHECK_VERSION(3, 0, 0)
++CallAfter(::DoUpdateStatusBar);
++#else
++DoUpdateStatusBar();
++#endif // wxCHECK_VERSION(3, 0, 0)
++}
+ 
+ event.Skip();

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-03-07 Thread Mart Raudsepp
commit: bdf1acfaba56068ff6ade47a56068c3561cbeece
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar  7 20:26:24 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar  7 20:26:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf1acfa

dev-util/codeblocks: drop ~arm keywords

Closes: https://bugs.gentoo.org/705024
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r300.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
index 7c6e5b47787..6ad8e09ea00 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C++ IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
 
 # USE="fortran" enables FortranProject plugin (v1.5)



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-03-07 Thread Mart Raudsepp
commit: c759ced29f59962d2f9988445d32b7bec914c516
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar  7 20:26:48 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar  7 20:26:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c759ced2

dev-util/codeblocks: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r300.ebuild | 80 --
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 84 
 2 files changed, 164 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
deleted file mode 100644
index 6ad8e09ea00..000
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-text/hunspell
-   dev-libs/boost:=
-   dev-libs/libgamin
-   )"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
-   "${WORKDIR}"/patches/
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   setup-wxwidgets
-
-   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-   # USE="contrib -fortran" setup:
-   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
-   # USE="contrib fortran" setup:
-   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-   # USE="-contrib fortran" setup:
-   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
-
-   econf \
-   --with-wx-config="${WX_CONFIG}" \
-   --disable-static \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-   if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-   elog "The symbols browser is disabled due to it causing 
crashes."
-   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
-   fi
-
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
deleted file mode 100644
index 93cfa9d4979..000
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-admin/gamin
-   app-text/hunspell
-   dev-libs/boost:=
-   )"
-
-DEPEND="${RDEPEND}
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.0.1-r1:0=
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
-   "${WORKDIR}"/patches/
-   )
-
-src_prepare() {
-   default
-   if has_version ">=dev-util/astyle-3.1" ; then
-   epatch 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
-   fi
-   eautoreconf
-}
-
-src_configure() {
-   setup-wxwidgets
-
-   # USE="contrib 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-03-06 Thread Agostino Sarubbo
commit: 5dcac2c16b9e6aaac962ed6172c4c68415eb4abc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar  6 12:31:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar  6 12:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dcac2c1

dev-util/codeblocks: x86 stable wrt bug #711574

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r302.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
index 04510d42041..47cecf4c74f 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 
https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-03-06 Thread Agostino Sarubbo
commit: b7cf5dbe75abc4fe27e9483f28556f6216358dc6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar  6 11:35:16 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar  6 11:35:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7cf5dbe

dev-util/codeblocks: amd64 stable wrt bug #711574

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r302.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
index e7e1bf80857..04510d42041 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 
https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-01-20 Thread Mart Raudsepp
commit: b8fe3d55b8e12e0977a7289d9e64e7eb95374f1e
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun Jan 12 20:47:12 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jan 20 10:10:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fe3d55

dev-util/codeblocks: bump 17.12-r302 to migrate to EAPI-7 and to fix RDEPEND

Closes: https://github.com/gentoo/gentoo/pull/14305
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r302.ebuild | 83 
 1 file changed, 83 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
new file mode 100644
index 000..e7e1bf80857
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="http://www.codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.0.1-r1:0=
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-admin/gamin
+   app-text/hunspell
+   dev-libs/boost:=
+   )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
+   "${WORKDIR}"/patches/
+   )
+
+src_prepare() {
+   default
+   if has_version ">=dev-util/astyle-3.1" ; then
+   eapply 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   fi
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   elog "The Symbols Browser is disabled due to it causing crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
+
+   xdg_desktop_database_update
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-01-20 Thread Mart Raudsepp
commit: e81939abcc4b91034596311f7f6944f1dba52256
Author: band-a-prend  yandex  ru>
AuthorDate: Mon Jan 20 08:31:42 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jan 20 10:10:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81939ab

dev-util/codeblocks: remove revisions depend on gtk2

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild | 84 --
 dev-util/codeblocks/codeblocks-17.12.ebuild| 80 
 2 files changed, 164 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
deleted file mode 100644
index 07ab74227ea..000
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-admin/gamin
-   app-text/hunspell
-   dev-libs/boost:=
-   )"
-
-DEPEND="${RDEPEND}
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.0.1-r1:0=
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
-   "${WORKDIR}"/patches/
-   )
-
-src_prepare() {
-   default
-   if has_version ">=dev-util/astyle-3.1" ; then
-   epatch 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
-   fi
-   eautoreconf
-}
-
-src_configure() {
-   setup-wxwidgets
-
-   # USE="contrib -fortran" setup:
-   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
-   # USE="contrib fortran" setup:
-   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-   # USE="-contrib fortran" setup:
-   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
-
-   econf \
-   --disable-static \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   ${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-   if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-   elog "The symbols browser is disabled due to it causing 
crashes."
-   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
-   fi
-
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}

diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild 
b/dev-util/codeblocks/codeblocks-17.12.ebuild
deleted file mode 100644
index c8361792943..000
--- a/dev-util/codeblocks/codeblocks-17.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-text/hunspell
-   dev-libs/boost:=
-   dev-libs/libgamin
-   )"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
-   "${WORKDIR}"/patches/
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   setup-wxwidgets
-
-   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-   # USE="contrib -fortran" setup:
-   use fortran || 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-01-20 Thread Mart Raudsepp
commit: 8a11bf42abe8a4c21620f3f5f2c60fb8c4b8bd30
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Jan 11 13:10:02 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jan 20 10:09:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a11bf42

dev-util/codeblocks: update live-ebuild with switch to WXGTK-3.0-gtk3

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/codeblocks/codeblocks-.ebuild | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 1763fdfc078..5350bd29d7c 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 
-inherit autotools gnome2-utils subversion wxwidgets xdg-utils
+inherit autotools subversion wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
@@ -14,10 +14,15 @@ SLOT="0"
 KEYWORDS=""
 SRC_URI=""
 ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
+ESVN_FETCH_CMD="svn checkout --ignore-externals"
 
 IUSE="contrib debug pch"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="app-arch/zip
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
app-admin/gamin
@@ -25,10 +30,7 @@ RDEPEND="app-arch/zip
dev-libs/boost:=
)"
 
-DEPEND="${RDEPEND}
-   >=dev-libs/tinyxml-2.6.2-r3
-   >=dev-util/astyle-3.1-r2:0/3.1
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
 
@@ -53,18 +55,16 @@ src_configure() {
 }
 
 pkg_postinst() {
-   if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-   elog "The symbols browser is disabled due to it causing 
crashes."
-   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
-   fi
+   elog "The Symbols Browser is disabled due to it causing crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
 
xdg_desktop_database_update
+   xdg_icon_cache_update
xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
 }
 
 pkg_postrm() {
xdg_desktop_database_update
+   xdg_icon_cache_update
xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2020-01-09 Thread Agostino Sarubbo
commit: 3b543f1b3cac15f11023064c988c12f94b63afa3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jan  9 12:46:27 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jan  9 12:46:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b543f1b

dev-util/codeblocks: amd64 stable wrt bug #704140

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 090c2ad4eb0..fe3befad34b 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 
https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: f40dcb8cf98c034cfe49d6cbffc7c93f086f152b
Author: band-a-prend  yandex  ru>
AuthorDate: Sat May 26 20:44:43 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:27:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40dcb8c

dev-util/codeblocks: remove "--with-wx-config"

Remove --with-wx-config="${WX_CONFIG}" from "econf" in "src_configure()" 
section.

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild   | 1 -
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index 98e7a842748..753d1c631d0 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -55,7 +55,6 @@ src_configure() {
use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
 
econf \
-   --with-wx-config="${WX_CONFIG}" \
--disable-static \
$(use_enable debug) \
$(use_enable pch) \

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index adc17cb8ea6..4ac4c6b6992 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -55,7 +55,6 @@ src_configure() {
use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
 
econf \
-   --with-wx-config="${WX_CONFIG}" \
--disable-static \
$(use_enable debug) \
$(use_enable pch) \



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 7ebb127a960fcd7722e6285ecdb840264416c673
Author: band-a-prend  yandex  ru>
AuthorDate: Tue May 29 22:40:45 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebb127a

dev-util/codeblocks: rm '-fno-delete-null-pointer-checks' flag

Remove '-fno-delete-null-pointer-checks' compiler flag.
This flag was added to allow to run Codeblocks after compiling codeblocks-16.01
with gcc-6.1 [1] and this issue was fixed in upstream on 2016-07-16 in ticket 
10875 [2].
On the 2017-03-24 in upstream ticket 11033 [3] this flag was removed as no 
needed anymore:
'linux: Partially Revert rev 10875 because we no longer do null pointer checks'.

Refs:
[1] http://forums.codeblocks.org/index.php?topic=21283.0
[2] https://sourceforge.net/p/codeblocks/code/10875/
[3] https://sourceforge.net/p/codeblocks/code/11033/

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild   | 4 +---
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index 26d07421017..d6592a32274 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 WX_GTK_VER="3.0"
 
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+inherit autotools gnome2-utils wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
@@ -50,8 +50,6 @@ src_prepare() {
 src_configure() {
setup-wxwidgets
 
-   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
# USE="contrib -fortran" setup:
use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
# USE="contrib fortran" setup:

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index cae914fdec3..ccc5d2c786a 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+inherit autotools gnome2-utils wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
@@ -50,8 +50,6 @@ src_prepare() {
 src_configure() {
setup-wxwidgets
 
-   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
# USE="contrib -fortran" setup:
use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
# USE="contrib fortran" setup:



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 26e8882689badaea13b36e58c5abae1387b272d7
Author: band-a-prend  yandex  ru>
AuthorDate: Tue May 29 22:38:16 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26e88826

dev-util/codeblocks: replace dep libgamin to gamin

Replace contrib plugin dependency from dev-libs/libgamin to app-admin/gamin
as in some cases it cause Codeblocks craches of FileManager plugin due to errors
'Failed to connect to socket /tmp/fam-elmar-' and 'failed to find gam_server'.

Ref: http://forums.codeblocks.org/index.php/topic,22641.0.html

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild   | 2 +-
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index 0c02036d954..26d07421017 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -24,9 +24,9 @@ IUSE="contrib debug fortran pch"
 RDEPEND="app-arch/zip
x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
+   app-admin/gamin
app-text/hunspell
dev-libs/boost:=
-   dev-libs/libgamin
)"
 
 DEPEND="${RDEPEND}

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 82d63b0809f..cae914fdec3 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -24,9 +24,9 @@ IUSE="contrib debug fortran pch"
 RDEPEND="app-arch/zip
x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
+   app-admin/gamin
app-text/hunspell
dev-libs/boost:=
-   dev-libs/libgamin
)"
 
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 27c7e3e956953056c4da2cac4521c40062687445
Author: band-a-prend  yandex  ru>
AuthorDate: Sat May 26 21:08:45 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c7e3e9

dev-util/codeblocks: unbundle dev-util/astyle lib

Unbundle the dev-util/astyle library in favor of system installed
by adding it as build dependency ( >=dev-util/astyle-3.0.1-r1:0= ):

1. patching (update) the Codeblocks Astyle plugin to be compatible with 
dev-util/astyle-3.1:
"codeblocks-17.12_update_astyle_plugin_to_v3.1.patch" that is taken from 
upstream:

https://sourceforge.net/p/codeblocks/code/11266/

  * updated astyle plugin to v3.1
  * removed obsolete astyle options
  * added new astyle options
  Authored by: jenslody 2018-01-15

(using conditional patching depends on if '>=dev-util/astyle-3.1' is installed 
in system);

2. use sub-sloting of dev-util/astyle to force rebuild Codeblocks on system 
update
if sub-slot of dev-util/astyle is changed;

3. remove KEYWORD "arm" to avoid repoman QA warning about "dependency.bad" and
"dependency.badindev" due to dev-util/astyle dependency doesn't have this 
KEYWORD.

Closes: https://bugs.gentoo.org/383037
Closes: https://bugs.gentoo.org/656758

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild |   8 +-
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild   |   8 +-
 ...blocks-17.12_update_astyle_plugin_to_v3.1.patch | 414 +
 3 files changed, 426 insertions(+), 4 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index daeb448b5c2..0c02036d954 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
 
 # USE="fortran" enables FortranProject plugin (v1.5)
@@ -31,15 +31,19 @@ RDEPEND="app-arch/zip
 
 DEPEND="${RDEPEND}
>=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.0.1-r1:0=
virtual/pkgconfig"
 
 PATCHES=(
"${FILESDIR}"/codeblocks-17.12-nodebug.diff
"${WORKDIR}"/patches/
-)
+   )
 
 src_prepare() {
default
+   if has_version ">=dev-util/astyle-3.1" ; then
+   epatch 
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   fi
eautoreconf
 }
 

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 164c9d11fd4..82d63b0809f 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and 
Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
 
 # USE="fortran" enables FortranProject plugin (v1.5)
@@ -31,15 +31,19 @@ RDEPEND="app-arch/zip
 
 DEPEND="${RDEPEND}
>=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.0.1-r1:0=
virtual/pkgconfig"
 
 PATCHES=(
"${FILESDIR}"/codeblocks-17.12-nodebug.diff
"${WORKDIR}"/patches/
-)
+   )
 
 src_prepare() {
default
+   if has_version ">=dev-util/astyle-3.1" ; then
+   epatch 
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   fi
eautoreconf
 }
 

diff --git 
a/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch 
b/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
new file mode 100644
index 000..c70cf083a44
--- /dev/null
+++ 
b/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
@@ -0,0 +1,414 @@
+# Patch from: https://sourceforge.net/p/codeblocks/code/11266/
+# * updated astyle plugin to v3.1
+# * removed obsolete astyle options
+# * added new astyle options
+# Authored by: jenslody 2018-01-15
+diff -Naur codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp 
codeblocks-code-11266-trunk/src/plugins/astyle/asstreamiterator.cpp
+--- codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp   2017-11-01 
02:32:42.0 +0300
 codeblocks-code-11266-trunk/src/plugins/astyle/asstreamiterator.cpp
2018-01-15 20:54:23.0 +0300
+@@ -2,9 +2,9 @@
+  * This file is part of the Code::Blocks IDE and licensed under the GNU 
General Public License, version 3
+  * http://www.gnu.org/licenses/gpl-3.0.html
+  *
+- * $Revision: 9995 $
+- * $Id: 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 31ffca401e7ae1076e7f828245f1435f06069b04
Author: band-a-prend  yandex  ru>
AuthorDate: Sat May 26 20:32:03 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:27:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ffca40

dev-util/codeblocks: init copy to 17-12-{r1,r301}

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild   | 80 
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 80 
 2 files changed, 160 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
new file mode 100644
index 000..ed606b14c4a
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-text/hunspell
+   dev-libs/boost:=
+   dev-libs/libgamin
+   )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
+   "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --with-wx-config="${WX_CONFIG}" \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+   elog "The symbols browser is disabled due to it causing 
crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
+   fi
+
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
+}

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
new file mode 100644
index 000..3b627ef7a23
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-text/hunspell
+   dev-libs/boost:=
+   dev-libs/libgamin
+   )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
+   "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 7cb12e41fb9ad7c68edacfe5d3f7509c912ca2c8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jul 14 18:40:40 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb12e41

dev-util/codeblocks: move large astyle patch to distfiles

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/codeblocks/Manifest   |   1 +
 dev-util/codeblocks/codeblocks-17.12-r1.ebuild |   6 +-
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild   |   6 +-
 ...blocks-17.12_update_astyle_plugin_to_v3.1.patch | 414 -
 4 files changed, 9 insertions(+), 418 deletions(-)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 7bfced6413f..c685be7d1e5 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,2 +1,3 @@
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
+DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 
4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9
 SHA512 
b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index d6592a32274..33bc6b02fc6 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -12,7 +12,9 @@ HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
 
 # USE="fortran" enables FortranProject plugin (v1.5)
 # that is delivered with Code::Blocks 17.12 source code.
@@ -42,7 +44,7 @@ PATCHES=(
 src_prepare() {
default
if has_version ">=dev-util/astyle-3.1" ; then
-   epatch 
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   epatch 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
fi
eautoreconf
 }

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index ccc5d2c786a..faf2dc26b2c 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -12,7 +12,9 @@ HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz;
 
 # USE="fortran" enables FortranProject plugin (v1.5)
 # that is delivered with Code::Blocks 17.12 source code.
@@ -42,7 +44,7 @@ PATCHES=(
 src_prepare() {
default
if has_version ">=dev-util/astyle-3.1" ; then
-   epatch 
"${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+   epatch 
"${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
fi
eautoreconf
 }

diff --git 
a/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch 
b/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
deleted file mode 100644
index c70cf083a44..000
--- 
a/dev-util/codeblocks/files/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-# Patch from: https://sourceforge.net/p/codeblocks/code/11266/
-# * updated astyle plugin to v3.1
-# * removed obsolete astyle options
-# * added new astyle options
-# Authored by: jenslody 2018-01-15
-diff -Naur codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp 
codeblocks-code-11266-trunk/src/plugins/astyle/asstreamiterator.cpp
 codeblocks-17.12/src/plugins/astyle/asstreamiterator.cpp   2017-11-01 
02:32:42.0 +0300
-+++ 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 4103b7a5e8370a790cf542208b1f2429845eafc0
Author: band-a-prend  yandex  ru>
AuthorDate: Tue May 29 23:07:09 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:32:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4103b7a5

dev-util/codeblocks: update codeblocks-.ebuild

Add updated codeblocks-.ebuild that is synced with 
codeblocks-17.12-r1.ebuild
(has updated dependencies) and allow to build Codeblocks from svn trunk.

The USE-flag 'fortran' removed in this ebuild-file as FortranProject plugin 
sources
downloads from external svn repo and could requires from time to time changes
of the autotools script patch to build successfully.

 dev-util/codeblocks/codeblocks-.ebuild | 44 ++
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 9296cc13443..1763fdfc078 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+
 WX_GTK_VER="3.0"
 
-inherit autotools eutils subversion wxwidgets
+inherit autotools gnome2-utils subversion wxwidgets xdg-utils
 
-DESCRIPTION="The open source, cross platform, free C++ IDE"
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
@@ -14,23 +15,25 @@ KEYWORDS=""
 SRC_URI=""
 ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
 
-IUSE="contrib debug pch static-libs"
+IUSE="contrib debug pch"
 
 RDEPEND="app-arch/zip
x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
+   app-admin/gamin
app-text/hunspell
dev-libs/boost:=
-   dev-libs/libgamin
)"
+
 DEPEND="${RDEPEND}
+   >=dev-libs/tinyxml-2.6.2-r3
+   >=dev-util/astyle-3.1-r2:0/3.1
virtual/pkgconfig"
 
-src_unpack() {
-   subversion_src_unpack
-}
+PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
 
 src_prepare() {
+   default
# Let's make the autorevision work.
subversion_wc_info
CB_LCD=$(LC_ALL=C svn info "${ESVN_WC_PATH}" | grep "^Last Changed 
Date:" | cut -d" " -f4,5)
@@ -40,21 +43,28 @@ src_prepare() {
 }
 
 src_configure() {
-   need-wxwidgets unicode
+   setup-wxwidgets
+
econf \
-   --with-wx-config="${WX_CONFIG}" \
+   --disable-static \
$(use_enable debug) \
$(use_enable pch) \
-   $(use_enable static-libs static) \
$(use_with contrib contrib-plugins all)
 }
 
-src_compile() {
-   emake clean-zipfiles
-   emake
+pkg_postinst() {
+   if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+   elog "The symbols browser is disabled due to it causing 
crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
+   fi
+
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
 }
 
-src_install() {
-   default
-   prune_libtool_files
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: f74b3be5193d4047d52e926f1dc289e57baffdb3
Author: band-a-prend  yandex  ru>
AuthorDate: Sat May 26 20:51:49 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:27:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f74b3be5

dev-util/codeblocks: unbundle dev-libs/tinyxml lib

Unbundle the dev-libs/tinyxml library in favor of system installed
by adding it as build dependency (>=dev-libs/tinyxml-2.6.2-r3).

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild   | 1 +
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index 753d1c631d0..daeb448b5c2 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="app-arch/zip
)"
 
 DEPEND="${RDEPEND}
+   >=dev-libs/tinyxml-2.6.2-r3
virtual/pkgconfig"
 
 PATCHES=(

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 4ac4c6b6992..164c9d11fd4 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -30,6 +30,7 @@ RDEPEND="app-arch/zip
)"
 
 DEPEND="${RDEPEND}
+   >=dev-libs/tinyxml-2.6.2-r3
virtual/pkgconfig"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-07-14 Thread Mart Raudsepp
commit: 7f3cebd5e98f0f04b38d879d3085cac56c65c7f4
Author: band-a-prend  yandex  ru>
AuthorDate: Sat May 26 20:37:29 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 14 19:27:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3cebd5

dev-util/codeblocks: update package DESCRIPTION

Update package DESCRIPTION to correspond that on codeblocks site.

 dev-util/codeblocks/codeblocks-17.12-r1.ebuild   | 2 +-
 dev-util/codeblocks/codeblocks-17.12-r301.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
index ed606b14c4a..98e7a842748 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -7,7 +7,7 @@ WX_GTK_VER="3.0"
 
 inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
 
-DESCRIPTION="The open source, cross platform, free C++ IDE"
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 3b627ef7a23..adc17cb8ea6 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -7,7 +7,7 @@ WX_GTK_VER="3.0-gtk3"
 
 inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
 
-DESCRIPTION="The open source, cross platform, free C++ IDE"
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/

2018-05-28 Thread Mart Raudsepp
commit: 34f9194950f67c0863fed71c61990f811cd3b395
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon May 28 22:04:50 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon May 28 22:04:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f91949

dev-util/codeblocks: remove old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-util/codeblocks/Manifest   |  1 -
 dev-util/codeblocks/codeblocks-16.01.ebuild| 45 --
 .../codeblocks/files/codeblocks-16.01-gcc7.patch   | 30 ---
 3 files changed, 76 deletions(-)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 4c4d964fdb7..7bfced6413f 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,3 +1,2 @@
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
-DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 
7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905
 SHA512 
496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild 
b/dev-util/codeblocks/codeblocks-16.01.ebuild
deleted file mode 100644
index 07a042e6263..000
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="2.8"
-
-inherit eutils flag-o-matic wxwidgets
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}.tar.gz"
-
-IUSE="contrib debug pch static-libs"
-
-S="${WORKDIR}/${P}.release"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-text/hunspell
-   dev-libs/boost:=
-   dev-libs/libgamin
-   )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
-
-src_configure() {
-   touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
-   setup-wxwidgets
-
-   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-   econf \
-   --with-wx-config="${WX_CONFIG}" \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   $(use_enable static-libs static) \
-   $(use_with contrib contrib-plugins all)
-}

diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch 
b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
deleted file mode 100644
index 84cbc88696c..000
--- a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug: https://bugs.gentoo.org/649248
-SVN Revision: https://sourceforge.net/p/codeblocks/code/11006
-GIT Commit: 
https://github.com/jenslody/codeblocks/commit/1fd6799ded8475fafaca17de9c23db767177d31b
-
-From 1fd6799ded8475fafaca17de9c23db767177d31b Mon Sep 17 00:00:00 2001
-From: jenslody 
-Date: Fri, 10 Feb 2017 20:56:25 +
-Subject: [PATCH] gcc7 build-fix: avoid template-related error
-

- src/include/scripting/sqplus/sqplus.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/include/scripting/sqplus/sqplus.h 
b/src/include/scripting/sqplus/sqplus.h
-index 73f37b24f..ae7d3c75f 100644
 a/src/include/scripting/sqplus/sqplus.h
-+++ b/src/include/scripting/sqplus/sqplus.h
-@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
- return safeStringCopy(s,_s.s,MaxLength);
-   }
-   bool operator == (const ScriptStringVar & _s) {
--return _strcmp(s,_s.s) == 0;
-+return strcmp(s,_s.s) == 0;
-   }
-   bool compareCaseInsensitive(const ScriptStringVar & _s) {
--return _stricmp(s,_s.s) == 0;
-+return strcasecmp(s,_s.s) == 0;
-   }
- };
- 



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-05-28 Thread Pacho Ramos
commit: 550ded86e5ce58fd5e6ba5fcd026a37d0eb95890
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon May 28 18:23:53 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon May 28 18:23:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550ded86

dev-util/codeblocks: Uses wxGTK:3.0 since 17.12 versions

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-util/codeblocks/codeblocks-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 4592ffeead9..9296cc13443 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-WX_GTK_VER="2.8"
+WX_GTK_VER="3.0"
 
 inherit autotools eutils subversion wxwidgets
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-05-05 Thread Mart Raudsepp
commit: 8597839fe14042f30a08c3d57574566ba8a5d8f7
Author: band-a-prend  yandex  ru>
AuthorDate: Fri Apr 27 00:51:57 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May  5 20:09:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8597839f

dev-util/codeblocks: ver. 17.12 for wxGTK:3.0-gtk3

Adding additional 'codeblocks-17.12-r300.ebuild' for building with 
wxGTK:3.0-gtk3
instead of wxGTK:2.8.

This also contains USE flag 'fortran' (introduced in codeblocks-17.12.ebuild )
which controls the building of 'FortranProject plugin' for Code::Blocks IDE
( https://sourceforge.net/projects/fortranproject/ )
after applying of 'FortranProject_autotools_build.diff' patch.

Bug: bugs.gentoo.org/643494

 dev-util/codeblocks/codeblocks-17.12-r300.ebuild | 85 
 1 file changed, 85 insertions(+)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
new file mode 100644
index 000..7470b026d37
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-text/hunspell
+   dev-libs/boost:=
+   dev-libs/libgamin
+   )"
+
+DEPEND="${RDEPEND}
+   sys-devel/autoconf:2.69
+   sys-devel/automake
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
+   "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --with-wx-config="${WX_CONFIG}" \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   ${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+   if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+   elog "KNOWN ISSUE:"
+   elog "The symbols browser is disabled in wx3.x builds due to it 
causes crashes."
+   elog "For more information see ticket 
https://sourceforge.net/p/codeblocks/tickets/225/;
+   elog "with related commits 
https://sourceforge.net/p/codeblocks/code/11027/;
+   elog "and https://sourceforge.net/p/codeblocks/code/11141/;
+   fi
+
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-05-05 Thread Mart Raudsepp
commit: 3391e6b07d5fb349c45ea637f19765cbada8cd98
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat May  5 19:45:09 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May  5 20:09:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3391e6b0

dev-util/codeblocks: Shorten the elog about symbol resolver

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-util/codeblocks/codeblocks-17.12-r300.ebuild | 7 ++-
 dev-util/codeblocks/codeblocks-17.12.ebuild  | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
index 3cee7431cee..3b627ef7a23 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -64,11 +64,8 @@ src_configure() {
 
 pkg_postinst() {
if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-   elog "KNOWN ISSUE:"
-   elog "The symbols browser is disabled in wx3.x builds due to it 
causes crashes."
-   elog "For more information see ticket 
https://sourceforge.net/p/codeblocks/tickets/225/;
-   elog "with related commits 
https://sourceforge.net/p/codeblocks/code/11027/;
-   elog "and https://sourceforge.net/p/codeblocks/code/11141/;
+   elog "The symbols browser is disabled due to it causing 
crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
fi
 
xdg_desktop_database_update

diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild 
b/dev-util/codeblocks/codeblocks-17.12.ebuild
index 283d6657788..ed606b14c4a 100644
--- a/dev-util/codeblocks/codeblocks-17.12.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -64,11 +64,8 @@ src_configure() {
 
 pkg_postinst() {
if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-   elog "KNOWN ISSUE:"
-   elog "The symbols browser is disabled in wx3.x builds due to it 
causes crashes."
-   elog "For more information see ticket 
https://sourceforge.net/p/codeblocks/tickets/225/;
-   elog "with related commits 
https://sourceforge.net/p/codeblocks/code/11027/;
-   elog "and https://sourceforge.net/p/codeblocks/code/11141/;
+   elog "The symbols browser is disabled due to it causing 
crashes."
+   elog "For more information see 
https://sourceforge.net/p/codeblocks/tickets/225/;
fi
 
xdg_desktop_database_update



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-05-05 Thread Mart Raudsepp
commit: f7a614059f8247d5da975f217f6c7da4aacffe76
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Thu Mar  1 09:24:22 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May  5 20:09:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a61405

dev-util/codeblocks: metadata.xml add maintainer

Adding an information about new co-maintainer of dev-util/codeblocks package.

 dev-util/codeblocks/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 147e365467f..0dcc7440843 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+  
+torokhov_...@mail.ru
+Sergey Torokhov
+  
   
 wxwidg...@gentoo.org
 Gentoo wxWidgets Project



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/

2018-05-05 Thread Mart Raudsepp
commit: be84553eb924219ec51e6fefb62f937a3f4eb697
Author: band-a-prend  yandex  ru>
AuthorDate: Fri Apr 27 00:45:56 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May  5 20:09:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be84553e

dev-util/codeblocks: version bump to 17.12

Code::Blocks IDE package version bump to 17.12 with
switching 'WX_GTK_VER' from x11-libs/wxGTK:2.8 to x11-libs/wxGTK:3.0

This also adds a new USE flag 'fortran' which controls the
building of 'FortranProject plugin' for Code::Blocks IDE
( https://sourceforge.net/projects/fortranproject/ )
after applying of 'FortranProject_autotools_build.diff' patch.

Add patch 'FortranProject_fix_build_gcc7_failed.patch'
from upstream that fix gcc7 compilation error
"call of overloaded ‘abs(unsigned int)’ is ambiguous"
for FortranProject plugin, i.e. when USE="fortran".

Remove USE=flag "static" with passing "--disable-static"
to econf within src_configure() section.

Remove directly passing "-g" compiler option to CFLAGS
and CXXFLAGS when USE="debug" by applying the patch
'codeblocks-17.12-nodebug.diff'.

Updating 'metadata.xml' file:
Adding 'fortran' USE-flag description for 'dev-util/codeblocks-17.12'.

Updating 'Manifest' file:
Adding size, blake2 and sha512 checksums for 'codeblocks_17.12.tar.xz' tarball

Bug: https://bugs.gentoo.org/643494
Closes: https://bugs.gentoo.org/643494

 dev-util/codeblocks/Manifest   |  2 +
 dev-util/codeblocks/codeblocks-17.12.ebuild| 85 ++
 .../codeblocks/files/codeblocks-17.12-nodebug.diff | 13 
 dev-util/codeblocks/metadata.xml   |  1 +
 4 files changed, 101 insertions(+)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 51d11daf5cd..4c4d964fdb7 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1 +1,3 @@
+DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 
58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224
 SHA512 
78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 
7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905
 SHA512 
496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
+DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 
871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b
 SHA512 
f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild 
b/dev-util/codeblocks/codeblocks-17.12.ebuild
new file mode 100644
index 000..030721ae5bf
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz 
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz;
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-text/hunspell
+   dev-libs/boost:=
+   dev-libs/libgamin
+   )"
+
+DEPEND="${RDEPEND}
+   sys-devel/autoconf:2.69
+   sys-devel/automake
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/codeblocks-17.12-nodebug.diff
+   "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+   # USE="contrib -fortran" setup:
+   use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins 
all,-FortranProject)
+   # USE="contrib fortran" setup:
+   use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+   # USE="-contrib fortran" setup:
+   use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins 
FortranProject)
+
+   econf \
+   --with-wx-config="${WX_CONFIG}" \
+   --disable-static \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2018-05-05 Thread Mart Raudsepp
commit: 96338dd36fda6d4aeebf9ba20e9282160c5554e8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat May  5 19:41:39 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May  5 20:09:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96338dd3

dev-util/codeblocks: remove automake/autoconf from DEPEND

autotools.eclass adds its own proper DEPEND (including libtool), no need
for us to do it with eautoreconf.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-util/codeblocks/codeblocks-17.12-r300.ebuild | 2 --
 dev-util/codeblocks/codeblocks-17.12.ebuild  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild 
b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
index 7470b026d37..3cee7431cee 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -30,8 +30,6 @@ RDEPEND="app-arch/zip
)"
 
 DEPEND="${RDEPEND}
-   sys-devel/autoconf:2.69
-   sys-devel/automake
virtual/pkgconfig"
 
 PATCHES=(

diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild 
b/dev-util/codeblocks/codeblocks-17.12.ebuild
index 030721ae5bf..283d6657788 100644
--- a/dev-util/codeblocks/codeblocks-17.12.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -30,8 +30,6 @@ RDEPEND="app-arch/zip
)"
 
 DEPEND="${RDEPEND}
-   sys-devel/autoconf:2.69
-   sys-devel/automake
virtual/pkgconfig"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/

2018-04-14 Thread Pacho Ramos
commit: 1ffb32396837505f577b5b18e0cb9e6d74bbc4b1
Author: Peter Levine  gmail  com>
AuthorDate: Sat Mar 24 22:04:04 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 14 16:08:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffb3239

dev-util/codeblocks: Fix building with GCC-7

Bug: https://bugs.gentoo.org/649248
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://bugs.gentoo.org/649248
Closes: https://bugs.gentoo.org/637126
Closes: https://github.com/gentoo/gentoo/pull/7600

 dev-util/codeblocks/codeblocks-16.01.ebuild|  4 ++-
 .../codeblocks/files/codeblocks-16.01-gcc7.patch   | 30 ++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild 
b/dev-util/codeblocks/codeblocks-16.01.ebuild
index 047fa097585..07a042e6263 100644
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ b/dev-util/codeblocks/codeblocks-16.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,8 @@ RDEPEND="app-arch/zip
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
+
 src_configure() {
touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
setup-wxwidgets

diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch 
b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
new file mode 100644
index 000..84cbc88696c
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/649248
+SVN Revision: https://sourceforge.net/p/codeblocks/code/11006
+GIT Commit: 
https://github.com/jenslody/codeblocks/commit/1fd6799ded8475fafaca17de9c23db767177d31b
+
+From 1fd6799ded8475fafaca17de9c23db767177d31b Mon Sep 17 00:00:00 2001
+From: jenslody 
+Date: Fri, 10 Feb 2017 20:56:25 +
+Subject: [PATCH] gcc7 build-fix: avoid template-related error
+
+---
+ src/include/scripting/sqplus/sqplus.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/include/scripting/sqplus/sqplus.h 
b/src/include/scripting/sqplus/sqplus.h
+index 73f37b24f..ae7d3c75f 100644
+--- a/src/include/scripting/sqplus/sqplus.h
 b/src/include/scripting/sqplus/sqplus.h
+@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
+ return safeStringCopy(s,_s.s,MaxLength);
+   }
+   bool operator == (const ScriptStringVar & _s) {
+-return _strcmp(s,_s.s) == 0;
++return strcmp(s,_s.s) == 0;
+   }
+   bool compareCaseInsensitive(const ScriptStringVar & _s) {
+-return _stricmp(s,_s.s) == 0;
++return strcasecmp(s,_s.s) == 0;
+   }
+ };
+ 



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2017-07-30 Thread David Seifert
commit: e25f6fa23f1f30b6b05489f07328a8cd5d7a2c68
Author: Peter Levine  gmail  com>
AuthorDate: Sat Jul 22 20:59:39 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul 30 16:04:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25f6fa2

dev-util/codeblocks: Fix segfault with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=625696
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5175

 dev-util/codeblocks/codeblocks-16.01.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild 
b/dev-util/codeblocks/codeblocks-16.01.ebuild
index 9f14a95f0a1..047fa097585 100644
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ b/dev-util/codeblocks/codeblocks-16.01.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
+
 WX_GTK_VER="2.8"
 
-inherit eutils wxwidgets
+inherit eutils flag-o-matic wxwidgets
 
 DESCRIPTION="The open source, cross platform, free C++ IDE"
 HOMEPAGE="http://www.codeblocks.org/;
@@ -29,8 +30,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
-
setup-wxwidgets
+
+   append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
econf \
--with-wx-config="${WX_CONFIG}" \
$(use_enable debug) \



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2016-11-25 Thread Pacho Ramos
commit: e32cdd7fae9ae02a5b7d18148cb2873cc2b4163c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 25 18:42:13 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 25 18:55:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32cdd7f

dev-util/codeblocks: Drop old

Package-Manager: portage-2.3.2

 dev-util/codeblocks/Manifest|  1 -
 dev-util/codeblocks/codeblocks-13.12.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 7115c89..8fe882e 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,2 +1 @@
-DIST codeblocks_13.12-1.tar.gz 17221056 SHA256 
772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610 SHA512 
f09ab25579a4c9addcebdcc748a23963a52751853f4a1c15da10196d522f94bb17e01b2470b96d4470f5fd98725f7760e3923762c2217bcc48051eb9f7286f58
 WHIRLPOOL 
cdf674bb9febd0d25ccfe84027b0c33f5fe9c5f1d19a1b32650487b71a6f110ee0657eaf67dceb758b192b5e5d3c2dd314f1a696491d7a70d0b334fd31a17ee3
 DIST codeblocks_16.01.tar.gz 20250097 SHA256 
30fb9d206df4ab3c2e2fec2451a0a7c9723bfed9a673cc9be71e881c529d5a03 SHA512 
496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
 WHIRLPOOL 
b908c7af182d37fc3ab0f2640f4b6033169cdc7964e276df9e57627806b156ba7acba25c43983ecfe2a0aeb3ef7e66652e4f2600e978599116b4d1c472866126

diff --git a/dev-util/codeblocks/codeblocks-13.12.ebuild 
b/dev-util/codeblocks/codeblocks-13.12.ebuild
deleted file mode 100644
index bfc9834..
--- a/dev-util/codeblocks/codeblocks-13.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WX_GTK_VER="2.8"
-
-inherit eutils wxwidgets
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz"
-
-IUSE="contrib debug pch static-libs"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:2.8[X]
-   contrib? (
-   app-text/hunspell
-   dev-libs/boost:=
-   dev-libs/libgamin
-   )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_configure() {
-   econf \
-   --with-wx-config="${WX_CONFIG}" \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   $(use_enable static-libs static) \
-   $(use_with contrib contrib-plugins all)
-}
-
-src_install() {
-   default
-   prune_libtool_files
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/

2016-11-17 Thread Michael Palimaka
commit: c57d92c7c443593c89d2033abe2dc9a3b7431d91
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Oct  6 16:59:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Nov 17 12:05:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57d92c7

dev-util/codeblocks: remove unused patches

 .../codeblocks/files/codeblocks-10.05-gcc47.patch  | 91 --
 .../files/codeblocks-10.05-wxChartCtrl-crash.patch | 34 
 2 files changed, 125 deletions(-)

diff --git a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch 
b/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
deleted file mode 100644
index 12dfe31..
--- a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
+++ /dev/null
@@ -1,91 +0,0 @@
 a/src/include/scripting/bindings/sc_base_types.h
-+++ b/src/include/scripting/bindings/sc_base_types.h
-@@ -33,6 +33,7 @@ DECLARE_INSTANCE_TYPE(wxPoint);
- DECLARE_INSTANCE_TYPE(wxSize);
- DECLARE_INSTANCE_TYPE(wxString);
- 
-+using SqPlus::GetTypeName;
- // C::B primitives and types
- DECLARE_INSTANCE_TYPE(ConfigManager);
- DECLARE_INSTANCE_TYPE(EditorManager);
-@@ -59,6 +60,7 @@ namespace SqPlus \
- inline T Get(TypeWrapper,HSQUIRRELVM v,int idx) { SQInteger i; 
SQPLUS_CHECK_GET(sq_getinteger(v,idx,)); return (T)i; } \
- }
- 
-+using SqPlus::Push;
- DECLARE_ENUM_TYPE(wxPathFormat);
- DECLARE_ENUM_TYPE(wxPathNormalize);
- DECLARE_ENUM_TYPE(PrintColourMode);
 /dev/null
-+++ b/src/include/scripting/squirrel/sqmem.h
-@@ -0,0 +1,8 @@
-+/*see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
 a/src/include/scripting/squirrel/sqstate.h
-+++ b/src/include/scripting/squirrel/sqstate.h
-@@ -136,8 +136,4 @@ extern SQObjectPtr _one_;
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec ,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
 a/src/include/scripting/squirrel/squtils.h
-+++ b/src/include/scripting/squirrel/squtils.h
-@@ -2,6 +2,7 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
- #define sq_new(__ptr,__type) {__ptr=(__type 
*)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) 
{__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));
 a/src/plugins/contrib/help_plugin/defs.h
-+++ b/src/plugins/contrib/help_plugin/defs.h
-@@ -289,7 +289,7 @@ class QMap : public std::map
- 
- if (i.second == false && overwrite)
- {
--find(k)->second = t;
-+this->find(k)->second = t;
- }
- 
- return i.first;
-@@ -297,7 +297,7 @@ class QMap : public std::map
- 
- int remove(const Key )
- {
--return erase(k);
-+return this->erase(k);
- }
- };
- 
 a/src/plugins/contrib/help_plugin/man2html.cpp
-+++ b/src/plugins/contrib/help_plugin/man2html.cpp
-@@ -123,7 +123,7 @@
- 
- #include 
- 
--//#include 
-+#include 
- #include 
- 
- #include 
 a/src/plugins/debuggergdb/gdb_driver.cpp
-+++ b/src/plugins/debuggergdb/gdb_driver.cpp
-@@ -72,6 +72,7 @@ static wxRegEx reChildPid3(_T("Thread[ \t]+[xA-Fa-f0-9-]+[ 
\t]+\\(LWP ([0-9]+)\\
- 
- 
- // scripting support
-+using SqPlus::Push;
- DECLARE_INSTANCE_TYPE(GDB_driver);
- 
- GDB_driver::GDB_driver(DebuggerGDB* plugin)

diff --git a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch 
b/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
deleted file mode 100644
index af95ac2..
--- a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-codeblocks crashes when a wxChartCtrl is added with wxSmith
-
-https://bugs.gentoo.org/show_bug.cgi?id=372837
-https://developer.berlios.de/bugs/?func=detailbug_id=18182_id=5358
-
-
 
a/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
-+++ 
b/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
-@@ -156,7 +156,13 @@ void wxChartWindow::DrawHLines(
- }
- 
- wxChartSizes *sizes = GetSizes();
--
-+
-+  // sizes may be NULL, in this case do nothing 
-+  // not sure if this is the right way to do things 
-+  //  gw.foss...@gmail.com 
-+  if (!sizes) 
-+  return; 
-+
- hp->SetPen( *wxBLACK_DASHED_PEN );
- 
- double current = lower;
-@@ -188,6 +194,10 @@ ChartValue wxChartWindow::GetVirtualWidth() const
- int iNodes = static_cast(ceil( GetVirtualMaxX() 

[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2016-06-23 Thread Ryan Hill
commit: 3ff560ac5cdc3f61690f5bb77e8a5654b9853998
Author: Ryan Hill  gentoo  org>
AuthorDate: Fri Jun 24 05:47:31 2016 +
Commit: Ryan Hill  gentoo  org>
CommitDate: Fri Jun 24 05:48:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff560ac

dev-util/codeblocks: Version bump (bug #576730).

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Ryan Hill  gentoo.org>

 dev-util/codeblocks/Manifest|  1 +
 dev-util/codeblocks/codeblocks-16.01.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index ac7ea20..7115c89 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1 +1,2 @@
 DIST codeblocks_13.12-1.tar.gz 17221056 SHA256 
772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610 SHA512 
f09ab25579a4c9addcebdcc748a23963a52751853f4a1c15da10196d522f94bb17e01b2470b96d4470f5fd98725f7760e3923762c2217bcc48051eb9f7286f58
 WHIRLPOOL 
cdf674bb9febd0d25ccfe84027b0c33f5fe9c5f1d19a1b32650487b71a6f110ee0657eaf67dceb758b192b5e5d3c2dd314f1a696491d7a70d0b334fd31a17ee3
+DIST codeblocks_16.01.tar.gz 20250097 SHA256 
30fb9d206df4ab3c2e2fec2451a0a7c9723bfed9a673cc9be71e881c529d5a03 SHA512 
496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
 WHIRLPOOL 
b908c7af182d37fc3ab0f2640f4b6033169cdc7964e276df9e57627806b156ba7acba25c43983ecfe2a0aeb3ef7e66652e4f2600e978599116b4d1c472866126

diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild 
b/dev-util/codeblocks/codeblocks-16.01.ebuild
new file mode 100644
index 000..0e88143
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-16.01.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/;
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}.tar.gz"
+
+IUSE="contrib debug pch static-libs"
+
+S="${WORKDIR}/${P}.release"
+
+RDEPEND="app-arch/zip
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   contrib? (
+   app-text/hunspell
+   dev-libs/boost:=
+   dev-libs/libgamin
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_configure() {
+   touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
+
+   setup-wxwidgets
+   econf \
+   --with-wx-config="${WX_CONFIG}" \
+   $(use_enable debug) \
+   $(use_enable pch) \
+   $(use_enable static-libs static) \
+   $(use_with contrib contrib-plugins all)
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2016-02-26 Thread Ryan Hill
commit: c375cf2e7d546f73b8addcfd7bc8be49ddbe2c4b
Author: Ryan Hill  gentoo  org>
AuthorDate: Sat Feb 27 02:46:12 2016 +
Commit: Ryan Hill  gentoo  org>
CommitDate: Sat Feb 27 02:46:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c375cf2e

dev-util/codeblocks: Revert "Support wxGTK:3.0" (Bug #575716)

Package-Manager: portage-2.2.27
Signed-off-by: Ryan Hill  gentoo.org>

 dev-util/codeblocks/codeblocks-13.12-r1.ebuild | 42 --
 dev-util/codeblocks/codeblocks-.ebuild |  4 +--
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-13.12-r1.ebuild 
b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild
deleted file mode 100644
index fa0a728..000
--- a/dev-util/codeblocks/codeblocks-13.12-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WX_GTK_VER="3.0"
-
-inherit eutils wxwidgets
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/;
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz"
-
-IUSE="contrib debug pch static-libs"
-
-RDEPEND="app-arch/zip
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   contrib? (
-   app-text/hunspell
-   dev-libs/boost:=
-   dev-libs/libgamin
-   )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_configure() {
-   need-wxwidgets unicode
-   econf \
-   --with-wx-config="${WX_CONFIG}" \
-   $(use_enable debug) \
-   $(use_enable pch) \
-   $(use_enable static-libs static) \
-   $(use_with contrib contrib-plugins all)
-}
-
-src_install() {
-   default
-   prune_libtool_files
-}

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index d103c98..6504279 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-WX_GTK_VER="3.0"
+WX_GTK_VER="2.8"
 
 inherit autotools eutils subversion wxwidgets
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

2015-10-25 Thread Pacho Ramos
commit: 5f8ae790e0077f24e129df45b6a833ace70e6bcb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 11:09:06 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 11:09:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f8ae790

dev-util/codeblocks: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 ...ocks-.ebuild => codeblocks-13.12-r1.ebuild} | 32 +-
 dev-util/codeblocks/codeblocks-.ebuild |  5 ++--
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild
similarity index 51%
copy from dev-util/codeblocks/codeblocks-.ebuild
copy to dev-util/codeblocks/codeblocks-13.12-r1.ebuild
index 878c44b..fa0a728 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-WX_GTK_VER="2.8"
+WX_GTK_VER="3.0"
 
-inherit autotools eutils subversion wxwidgets
+inherit eutils wxwidgets
 
 DESCRIPTION="The open source, cross platform, free C++ IDE"
 HOMEPAGE="http://www.codeblocks.org/;
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-SRC_URI=""
-ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz"
 
 IUSE="contrib debug pch static-libs"
 
 RDEPEND="app-arch/zip
-   x11-libs/wxGTK:2.8[X]
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
app-text/hunspell
dev-libs/boost:=
@@ -27,20 +26,8 @@ RDEPEND="app-arch/zip
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
-src_unpack() {
-   subversion_src_unpack
-}
-
-src_prepare() {
-   # Let's make the autorevision work.
-   subversion_wc_info
-   CB_LCD=$(LC_ALL=C svn info "${ESVN_WC_PATH}" | grep "^Last Changed 
Date:" | cut -d" " -f4,5)
-   echo "m4_define([SVN_REV], ${ESVN_WC_REVISION})" > revision.m4
-   echo "m4_define([SVN_DATE], ${CB_LCD})" >> revision.m4
-   eautoreconf
-}
-
 src_configure() {
+   need-wxwidgets unicode
econf \
--with-wx-config="${WX_CONFIG}" \
$(use_enable debug) \
@@ -49,11 +36,6 @@ src_configure() {
$(use_with contrib contrib-plugins all)
 }
 
-src_compile() {
-   emake clean-zipfiles
-   emake
-}
-
 src_install() {
default
prune_libtool_files

diff --git a/dev-util/codeblocks/codeblocks-.ebuild 
b/dev-util/codeblocks/codeblocks-.ebuild
index 878c44b..d103c98 100644
--- a/dev-util/codeblocks/codeblocks-.ebuild
+++ b/dev-util/codeblocks/codeblocks-.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-WX_GTK_VER="2.8"
+WX_GTK_VER="3.0"
 
 inherit autotools eutils subversion wxwidgets
 
@@ -18,7 +18,7 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
 IUSE="contrib debug pch static-libs"
 
 RDEPEND="app-arch/zip
-   x11-libs/wxGTK:2.8[X]
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
contrib? (
app-text/hunspell
dev-libs/boost:=
@@ -41,6 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
+   need-wxwidgets unicode
econf \
--with-wx-config="${WX_CONFIG}" \
$(use_enable debug) \