[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/, dev-cpp/libmcpp/files/
commit: e572c88554dd14921c39809f3b780cea49ce9c56 Author: Eli Schwartz gmail com> AuthorDate: Tue Mar 19 00:31:31 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 19 03:20:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e572c885 dev-cpp/libmcpp: add patches to build with Modern C Closes: https://bugs.gentoo.org/919186 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> .../libmcpp-2.7.2-incompatible-pointer-types.patch | 26 ++ dev-cpp/libmcpp/files/mcpp-c99.patch | 59 ++ dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild | 48 ++ 3 files changed, 133 insertions(+) diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-incompatible-pointer-types.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-incompatible-pointer-types.patch new file mode 100644 index ..fc84009d4366 --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-incompatible-pointer-types.patch @@ -0,0 +1,26 @@ +https://github.com/jbrandwood/mcpp/commit/3b274fe8f31d61996343b17402f30408a6e447cf + +From 3b274fe8f31d61996343b17402f30408a6e447cf Mon Sep 17 00:00:00 2001 +From: John Brandwood +Date: Fri, 15 Mar 2024 15:15:53 -0400 +Subject: [PATCH] Fix build with GCC 14.x by splitting a NULL assignment into 2 + lines. + +--- + src/expand.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/expand.c b/src/expand.c +index 08f829a..ea2d2a9 100644 +--- a/src/expand.c b/src/expand.c +@@ -710,7 +710,8 @@ static char * replace( + } else { + m_inf->locs.start_col = m_inf->locs.start_line = 0L; + } +-m_inf->args = m_inf->loc_args = NULL; /* Default args */ ++m_inf->args = NULL; /* Default args */ ++m_inf->loc_args = NULL; + for (num = 1, recurs = 0; num < m_num; num++) + if (mac_inf[ num].defp == defp) + recurs++; /* Recursively nested macro */ diff --git a/dev-cpp/libmcpp/files/mcpp-c99.patch b/dev-cpp/libmcpp/files/mcpp-c99.patch new file mode 100644 index ..e6538e7955f4 --- /dev/null +++ b/dev-cpp/libmcpp/files/mcpp-c99.patch @@ -0,0 +1,59 @@ +Florian Weimer's c99 patch from https://sourceforge.net/p/mcpp/patches/7/ + +Do not define and undefine _*_SOURCE macros. These have special +semantics to glibc. may include , and which +point the feature configuration gets frozen. Without this change, +when system.c includes , the feature macros are hard-coded +as baseline POSIX, which does not include readlink. This will lead to +compilation errors with future compilers. + +diff --git a/src/configed.H b/src/configed.H +index b4d1ebf3a6bfa280..bde16fc8db38a2c4 100644 +--- a/src/configed.H b/src/configed.H +@@ -295,20 +295,7 @@ + * ULONGMAX should be defined to the ULONG_MAX in . + */ + +-/* _POSIX_* only to get PATH_MAX*/ +-#define _POSIX_ 1 +-#define _POSIX_SOURCE 1 +-#ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 +-#define _POSIX_C_SOURCE_defined 1 +-#endif + #include"limits.h" +-#undef _POSIX_ +-#undef _POSIX_SOURCE +-#ifdef _POSIX_C_SOURCE_defined +-#undef _POSIX_C_SOURCE +-#undef _POSIX_C_SOURCE_defined +-#endif + #define CHARBIT CHAR_BIT + #define UCHARMAXUCHAR_MAX + #define USHRTMAXUSHRT_MAX +diff --git a/src/noconfig.H b/src/noconfig.H +index 6b634fe0b32ff67c..7c923c900c8865dd 100644 +--- a/src/noconfig.H b/src/noconfig.H +@@ -570,20 +570,7 @@ + #include"stdio.h" + + /* PATHMAX is the maximum length of path-list on the host system. */ +-/* _POSIX_* only to get PATH_MAX*/ +-#define _POSIX_ 1 +-#define _POSIX_SOURCE 1 +-#ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 +-#define _POSIX_C_SOURCE_defined 1 +-#endif + #include"limits.h" +-#undef _POSIX_ +-#undef _POSIX_SOURCE +-#ifdef _POSIX_C_SOURCE_defined +-#undef _POSIX_C_SOURCE +-#undef _POSIX_C_SOURCE_defined +-#endif + #ifdef PATH_MAX + #define PATHMAX PATH_MAX/* Posix macro */ + #else diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild new file mode 100644 index ..3d410d6d4019 --- /dev/null +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN=${PN/lib/} +MY_P=$(ver_cut 1-4 ${MY_PN}-${PV}) + +DESCRIPTION="A portable C++ preprocessor" +HOMEPAGE="http://mcpp.sourceforge.net"; +SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" +SRC_URI+=" mirror://debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos" + +PATCHES=( + # bug #718808 + "${WORKDIR}"/debian
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: f2f19c7e8054e82e254744619f68f4a59b1d4ba5 Author: WANG Xuerui gentoo org> AuthorDate: Fri Oct 13 10:43:19 2023 + Commit: WANG Xuerui gentoo org> CommitDate: Fri Oct 13 10:43:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f19c7e dev-cpp/libmcpp: keyword 2.7.2_p5-r1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild index 3a7308e3ad8d..51825fa12bb8 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv x86 ~x86-linux ~x64-macos" PATCHES=( # bug #718808
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: ed67ed0f827ca7f08b4d4dcd63cc182f62780495 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 18 18:49:01 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 18 18:49:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed67ed0f dev-cpp/libmcpp: Stabilize 2.7.2_p5-r1 amd64, #886685 Signed-off-by: Arthur Zamarin gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild index beab5412fb93..9be914c6a5a3 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos" PATCHES=( # bug #718808
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 98d71b1f6ff454065c8ac33bd5f59688cbdd5e0e Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 18 18:49:02 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 18 18:49:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d71b1f dev-cpp/libmcpp: Stabilize 2.7.2_p5-r1 x86, #886685 Signed-off-by: Arthur Zamarin gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild index 9be914c6a5a3..3a7308e3ad8d 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv x86 ~x86-linux ~x64-macos" PATCHES=( # bug #718808
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/, dev-cpp/libmcpp/files/
commit: 438a88bbd14a2e2909f0d416e113383f5e0bacd1 Author: Sam James gentoo org> AuthorDate: Fri Sep 9 09:31:33 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 9 09:31:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438a88bb dev-cpp/libmcpp: fix configure checks, EAPI 8 Signed-off-by: Sam James gentoo.org> .../files/libmcpp-2.7.2-fix-configure-checks.patch | 34 dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild | 46 ++ 2 files changed, 80 insertions(+) diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch new file mode 100644 index ..e7bb77d6cf41 --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch @@ -0,0 +1,34 @@ +https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch?id=6721430ca97aa98208cc1c450e4e8c4c274ca840 + +From c1e9f2f3d086e0df3c10a2468fd7b37fd0c5038c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 00:02:08 -0700 +Subject: [PATCH] configure: Fix checks for system headers + +Define _DEFAULT_SOURCE in system.c so unistd.h can expose readlink API + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- a/configure.ac b/configure.ac +@@ -152,7 +152,7 @@ fi + + dnl Checks for header files. + +-AC_CHECK_HEADERS( [unistd.h, stdint.h, inttypes.h]) ++AC_CHECK_HEADERS( [unistd.h stdint.h inttypes.h]) + + dnl Checks for typedefs, and compiler characteristics. + +--- a/src/system.c b/src/system.c +@@ -36,6 +36,8 @@ + * 1. specify the constants in "configed.H" or "noconfig.H", + * 2. append the system-dependent routines in this file. + */ ++ ++#define _DEFAULT_SOURCE + #if PREPROCESSED + #include"mcpp.H" + #else diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild new file mode 100644 index ..beab5412fb93 --- /dev/null +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN=${PN/lib/} +MY_P=$(ver_cut 1-4 ${MY_PN}-${PV}) + +DESCRIPTION="A portable C++ preprocessor" +HOMEPAGE="http://mcpp.sourceforge.net"; +SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" +SRC_URI+=" mirror://debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos" + +PATCHES=( + # bug #718808 + "${WORKDIR}"/debian/patches/ + + "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch + "${FILESDIR}"/${PN}-2.7.2-fix-configure-checks.patch +) + +src_prepare() { + default + + # bug #778461 + sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die + + eautoreconf +} + +src_configure() { + econf --enable-mcpplib +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: b5b61e019deed03f6b115fee767b51564dc1ace3 Author: matoro users noreply github com> AuthorDate: Fri Jul 22 18:55:58 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 23 19:44:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b61e01 dev-cpp/libmcpp: Keyword 2.7.2_p5 arm64, #811420 Signed-off-by: matoro users.noreply.github.com> Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index 5fb2e79d0396..18c335088d8a 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~ppc64 ~riscv x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv x86 ~x86-linux ~x64-macos" PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: bb5e87202f9e5a9103a1f790861a7bc9137e877b Author: Jakov Smolić gentoo org> AuthorDate: Wed Jun 8 07:56:37 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Jun 8 07:56:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5e8720 dev-cpp/libmcpp: Keyword 2.7.2_p5 ppc64, #849506 Signed-off-by: Jakov Smolić gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index ba098e11317f..5fb2e79d0396 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.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 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~riscv x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 ~ppc64 ~riscv x86 ~x86-linux ~x64-macos" PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 4d4414683ab178b1e30e332e941455fa4c7f3c00 Author: Yixun Lan gentoo org> AuthorDate: Sun Sep 12 12:15:55 2021 + Commit: Yixun Lan gentoo org> CommitDate: Sun Sep 12 14:23:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d441468 dev-cpp/libmcpp: QA: fix SRC_URI.mirror issue Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index 5d8068387d5..d9df48bf8cb 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -11,7 +11,7 @@ MY_P=$(ver_cut 1-4 ${MY_PN}-${PV}) DESCRIPTION="A portable C++ preprocessor" HOMEPAGE="http://mcpp.sourceforge.net"; SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" -SRC_URI+=" https://deb.debian.org/debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz"; +SRC_URI+=" mirror://debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz" S="${WORKDIR}"/${MY_P} LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 6d4c21c30c9ebd4620de0c884f75019df61ab11d Author: Yixun Lan gentoo org> AuthorDate: Sun Sep 12 12:17:45 2021 + Commit: Yixun Lan gentoo org> CommitDate: Sun Sep 12 14:23:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4c21c3 dev-cpp/libmcpp: keyword ~riscv Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index d9df48bf8cb..ba098e11317 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 ~riscv x86 ~x86-linux ~x64-macos" PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/files/, dev-cpp/libmcpp/
commit: 95af7c77e3687fb248aeec1c40682ae78d8e64b2 Author: John Helmert III gentoo org> AuthorDate: Sat Jun 12 17:29:35 2021 + Commit: John Helmert III gentoo org> CommitDate: Sat Jun 12 17:29:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95af7c77 dev-cpp/libmcpp: drop 2.7.2-r3 Bug: https://bugs.gentoo.org/718808 Signed-off-by: John Helmert III gentoo.org> dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch | 33 --- dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch | 75 dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 47 --- 3 files changed, 155 deletions(-) diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch deleted file mode 100644 index cb5aa6c345c..000 --- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Simple fixes - * Fix freeing unmalloced memory - The memory of 'in_file' is not malloced, but points to argv[]. - It is wrong to free it. - * When there is no input file specified by argv, it causes error - and fp_in == NULL. Check is needed to call fclose for fp_in. -Author: NIIBE Yutaka - -## Fixes the issue reported at: -## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/ - -Index: mcpp-2.7.2/src/main.c -=== mcpp-2.7.2.orig/src/main.c 2013-07-09 03:03:05.610947658 + -+++ mcpp-2.7.2/src/main.c 2013-07-09 03:03:05.534947624 + -@@ -428,16 +428,11 @@ - - fatal_error_exit: - #if MCPP_LIB --/* Free malloced memory */ --if (mcpp_debug & MACRO_CALL) { --if (in_file != stdin_name) --free( in_file); --} - clear_filelist(); - clear_symtable(); - #endif - --if (fp_in != stdin) -+if (fp_in && fp_in != stdin) - fclose( fp_in); - if (fp_out != stdout) - fclose( fp_out); diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch deleted file mode 100644 index fff5d321fe9..000 --- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: Fixes by ZeroC, Inc. -Author: ZeroC, Inc. -Bug-Debian: http://bugs.debian.org/611749 - mcpp-2.7.2.orig/src/main.c -+++ mcpp-2.7.2/src/main.c -@@ -326,6 +326,8 @@ static void init_main( void) - = FALSE; - option_flags.trig = TRIGRAPHS_INIT; - option_flags.dig = DIGRAPHS_INIT; -+sh_file = NULL; -+sh_line = 0; - } - - int mcpp_lib_main mcpp-2.7.2.orig/src/support.c -+++ mcpp-2.7.2/src/support.c -@@ -188,7 +188,7 @@ static char * append_to_buffer( - size_t length - ) - { --if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ -+if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) {/* 1st append */ -@@ -1722,6 +1722,8 @@ com_start: - sp -= 2; - while (*sp != '\n') /* Until end of line*/ - mcpp_fputc( *sp++, OUT); -+mcpp_fputc( '\n', OUT); -+wrong_line = TRUE; - } - goto end_line; - default:/* Not a comment*/ mcpp-2.7.2.orig/src/internal.H -+++ mcpp-2.7.2/src/internal.H -@@ -390,6 +390,8 @@ extern char * const work_end; /* E - extern char identifier[]; /* Lastly scanned name */ - extern IFINFO ifstack[]; /* Information of #if nesting */ - extern char work_buf[]; -+extern FILEINFO * sh_file; -+extern int sh_line; - /* Temporary buffer for directive line and macro expansion */ - - /* main.c */ -@@ -557,6 +559,6 @@ extern void init_system( void); - #endif - #endif - --#if HOST_HAVE_STPCPY -+#if HOST_HAVE_STPCPY && !defined(stpcpy) - extern char * stpcpy( char * dest, const char * src); - #endif mcpp-2.7.2.orig/src/system.c -+++ mcpp-2.7.2/src/system.c -@@ -3858,6 +3858,9 @@ static int chk_dirp( - } - #endif - -+FILEINFO* sh_file; -+int sh_line; -+ - voidsharp( - FILEINFO * sharp_file, - int flag/* Flag to append to the line for GCC */ -@@ -3868,8 +3871,6 @@ voidsharp( - * else (i.e. 'sharp_file' is NULL) 'infile'. - */ - { --static FILEINFO * sh_file; --static int sh_line; - FILEINFO * file; - int line; - diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild deleted file mode 100644 index b2aa110f188..000 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 6da94e0be81955e6fcea26d10be34222fde2 Author: Sam James gentoo org> AuthorDate: Thu Apr 22 03:00:04 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 22 03:00:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da94e0b dev-cpp/libmcpp: Stabilize 2.7.2_p5 amd64, #718808 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index 0b7d50cec86..5d8068387d5 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: f77545373cecebfb217e773906b9745696394ac5 Author: Sam James gentoo org> AuthorDate: Thu Apr 22 02:57:26 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 22 02:57:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7754537 dev-cpp/libmcpp: Stabilize 2.7.2_p5 x86, #718808 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index ca5877298ab..0b7d50cec86 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 7d648ad70a40bea4789f3d6bbda485078ebffd09 Author: Sam James gentoo org> AuthorDate: Sat Mar 27 04:50:35 2021 + Commit: Sam James gentoo org> CommitDate: Sat Mar 27 04:51:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d648ad7 dev-cpp/libmcpp: drop static-libs from 2.7.2_p5 May as well take the opportunity. Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild index bc6a9a1d233..ca5877298ab 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -17,7 +17,6 @@ S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" -IUSE="static-libs" PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch @@ -38,13 +37,11 @@ src_prepare() { src_configure() { econf \ --enable-mcpplib \ - $(use_enable static-libs static) + --disable-static } src_install() { default - if ! use static-libs; then - find "${D}" -name '*.la' -delete || die - fi + find "${ED}" -name '*.la' -delete || die }
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: ad7f93d52342c57be176764b89aed9ae401c7f8a Author: Sam James gentoo org> AuthorDate: Sat Mar 27 01:27:41 2021 + Commit: Sam James gentoo org> CommitDate: Sat Mar 27 02:57:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7f93d5 dev-cpp/libmcpp: (security) bump to 2.7.2_p5 (Debian) Easier to just use the Debian patchset here. Bug: https://bugs.gentoo.org/718808 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/Manifest| 1 + dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 50 + 2 files changed, 51 insertions(+) diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest index c70198b721e..cc1df396280 100644 --- a/dev-cpp/libmcpp/Manifest +++ b/dev-cpp/libmcpp/Manifest @@ -1 +1,2 @@ DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235 +DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild new file mode 100644 index 000..bc6a9a1d233 --- /dev/null +++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_PN=${PN/lib/} +MY_P=$(ver_cut 1-4 ${MY_PN}-${PV}) + +DESCRIPTION="A portable C++ preprocessor" +HOMEPAGE="http://mcpp.sourceforge.net"; +SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" +SRC_URI+=" https://deb.debian.org/debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz"; +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +IUSE="static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch +) + +src_prepare() { + default + + # bug #718808 + eapply "${WORKDIR}"/debian/patches/*.patch + + # bug #778461 + sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-mcpplib \ + $(use_enable static-libs static) +} + +src_install() { + default + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 457a911091c74bf83dc65df389cc857538d5ac87 Author: Sam James gentoo org> AuthorDate: Sat Mar 27 01:17:46 2021 + Commit: Sam James gentoo org> CommitDate: Sat Mar 27 02:57:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457a9110 dev-cpp/libmcpp: port to EAPI 7 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild index d22a2e028a4..d23fe35ce3e 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -10,14 +10,13 @@ MY_P=${P/lib/} DESCRIPTION="A portable C++ preprocessor" HOMEPAGE="http://mcpp.sourceforge.net"; SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" IUSE="static-libs" -S=${WORKDIR}/${MY_P} - PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch "${FILESDIR}"/${PN}-2.7.2-zeroc.patch
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 7ea64cfeb89cfad5518b2c3b1a15487f792dd4c6 Author: Sam James gentoo org> AuthorDate: Sat Mar 27 01:19:27 2021 + Commit: Sam James gentoo org> CommitDate: Sat Mar 27 02:57:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea64cfe dev-cpp/libmcpp: fix build with slibtool Thanks-to: orbea riseup.net> Closes: https://bugs.gentoo.org/778461 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild index d23fe35ce3e..b2aa110f188 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild @@ -25,6 +25,10 @@ PATCHES=( src_prepare() { default + + # bug #778461 + sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die + eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 3137d6fec880255982218827d800c83d1716a58d Author: Sam James gentoo org> AuthorDate: Sun Dec 20 17:35:09 2020 + Commit: Sam James gentoo org> CommitDate: Sun Dec 20 17:35:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3137d6fe dev-cpp/libmcpp: cleanup old Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild | 43 - 1 file changed, 43 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild deleted file mode 100644 index 0f8a8f23a82..000 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MY_P=${P/lib/} - -DESCRIPTION="A portable C++ preprocessor" -HOMEPAGE="http://mcpp.sourceforge.net"; -SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" -IUSE="static-libs" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/${MY_P} - -PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --enable-mcpplib \ - $(use_enable static-libs static) -} - -src_install() { - default - - if ! use static-libs; then - find "${D}" -name '*.la' -delete || die - fi -}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 03c9cb488099319bbae155feeb8fbdcdc944da02 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Dec 20 16:04:42 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Dec 20 16:30:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c9cb48 dev-cpp/libmcpp: x86 stable (bug #760453) Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild index 5ff3436a29e..d22a2e028a4 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" IUSE="static-libs" S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: ce8fd76fc1163c7ae3b03bd77f9324e67952e4d0 Author: Sam James gentoo org> AuthorDate: Sat Dec 19 19:34:57 2020 + Commit: Sam James gentoo org> CommitDate: Sat Dec 19 19:34:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8fd76f dev-cpp/libmcpp: Stabilize 2.7.2-r3 amd64, #760453 Signed-off-by: Sam James gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild index 69aa4062136..5ff3436a29e 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.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 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" IUSE="static-libs" S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/, dev-cpp/libmcpp/files/
commit: aa225a5d3f8c225e3639ebe87a84cf05d28f7a72 Author: Jose zeroc com> AuthorDate: Thu Apr 5 08:23:22 2018 + Commit: David Seifert gentoo org> CommitDate: Wed Apr 18 17:02:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa225a5d dev-cpp/libmcpp: Add missing patches * r3 include two new patches already in debian distributions, and mcpp forums. - libmcpp-2.7.2-zeroc: patch is required for dev-libs/Ice to work propertly - libmcpp-2.7.2-gniibe: patch include two simple security fixes Closes: https://github.com/gentoo/gentoo/pull/7820 dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch | 33 +++ dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch | 75 dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 44 ++ 3 files changed, 152 insertions(+) diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch new file mode 100644 index 000..cb5aa6c345c --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch @@ -0,0 +1,33 @@ +Description: Simple fixes + * Fix freeing unmalloced memory + The memory of 'in_file' is not malloced, but points to argv[]. + It is wrong to free it. + * When there is no input file specified by argv, it causes error + and fp_in == NULL. Check is needed to call fclose for fp_in. +Author: NIIBE Yutaka + +## Fixes the issue reported at: +## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/ + +Index: mcpp-2.7.2/src/main.c +=== +--- mcpp-2.7.2.orig/src/main.c 2013-07-09 03:03:05.610947658 + mcpp-2.7.2/src/main.c 2013-07-09 03:03:05.534947624 + +@@ -428,16 +428,11 @@ + + fatal_error_exit: + #if MCPP_LIB +-/* Free malloced memory */ +-if (mcpp_debug & MACRO_CALL) { +-if (in_file != stdin_name) +-free( in_file); +-} + clear_filelist(); + clear_symtable(); + #endif + +-if (fp_in != stdin) ++if (fp_in && fp_in != stdin) + fclose( fp_in); + if (fp_out != stdout) + fclose( fp_out); diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch new file mode 100644 index 000..fff5d321fe9 --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch @@ -0,0 +1,75 @@ +Description: Fixes by ZeroC, Inc. +Author: ZeroC, Inc. +Bug-Debian: http://bugs.debian.org/611749 + +--- mcpp-2.7.2.orig/src/main.c mcpp-2.7.2/src/main.c +@@ -326,6 +326,8 @@ static void init_main( void) + = FALSE; + option_flags.trig = TRIGRAPHS_INIT; + option_flags.dig = DIGRAPHS_INIT; ++sh_file = NULL; ++sh_line = 0; + } + + int mcpp_lib_main +--- mcpp-2.7.2.orig/src/support.c mcpp-2.7.2/src/support.c +@@ -188,7 +188,7 @@ static char * append_to_buffer( + size_t length + ) + { +-if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ ++if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ + size_t size = MAX( BUF_INCR_SIZE, length); + + if (mem_buf_p->buffer == NULL) {/* 1st append */ +@@ -1722,6 +1722,8 @@ com_start: + sp -= 2; + while (*sp != '\n') /* Until end of line*/ + mcpp_fputc( *sp++, OUT); ++mcpp_fputc( '\n', OUT); ++wrong_line = TRUE; + } + goto end_line; + default:/* Not a comment*/ +--- mcpp-2.7.2.orig/src/internal.H mcpp-2.7.2/src/internal.H +@@ -390,6 +390,8 @@ extern char * const work_end; /* E + extern char identifier[]; /* Lastly scanned name */ + extern IFINFO ifstack[]; /* Information of #if nesting */ + extern char work_buf[]; ++extern FILEINFO * sh_file; ++extern int sh_line; + /* Temporary buffer for directive line and macro expansion */ + + /* main.c */ +@@ -557,6 +559,6 @@ extern void init_system( void); + #endif + #endif + +-#if HOST_HAVE_STPCPY ++#if HOST_HAVE_STPCPY && !defined(stpcpy) + extern char * stpcpy( char * dest, const char * src); + #endif +--- mcpp-2.7.2.orig/src/system.c mcpp-2.7.2/src/system.c +@@ -3858,6 +3858,9 @@ static int chk_dirp( + } + #endif + ++FILEINFO* sh_file; ++int sh_line; ++ + voidsharp( + FILEINFO * sharp_file, + int flag/* Flag to append to the line for GCC */ +@@ -3868,8 +3871,6 @@ voidsharp( + * else (i.e. 'sharp_file' is NULL) 'infile'. + */ + { +-static FILEINFO * sh_file; +-static int sh_line; + FILEINFO * file; + int line; + diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild new file mode 100644 index 000..69aa4062136
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: db98394263227def5664b2370b7d8e173771fa88 Author: David Seifert gentoo org> AuthorDate: Mon Jan 23 17:34:34 2017 + Commit: David Seifert gentoo org> CommitDate: Mon Jan 23 17:38:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db983942 dev-cpp/libmcpp: Remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-cpp/libmcpp/libmcpp-2.7.2-r1.ebuild | 37 - 1 file changed, 37 deletions(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r1.ebuild deleted file mode 100644 index 2cc7000.. --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -MY_P=${P/lib/} - -DESCRIPTION="A portable C++ preprocessor" -HOMEPAGE="http://mcpp.sourceforge.net"; -SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 x86 ~x64-macos ~x86-linux" -IUSE="static-libs" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --enable-mcpplib \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - rm -rf "${ED}/usr/share/doc" - dodoc ChangeLog NEWS README doc/*.pdf - dohtml doc/*.html - - use static-libs || rm -rf "${ED}"/usr/lib*/*.la -}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 359a2d61037f15fde503d78f096a7df9095abd53 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Jan 23 15:45:26 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Jan 23 15:45:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359a2d61 dev-cpp/libmcpp: x86 stable wrt bug #606830 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild index a99cc41..e3115d2 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" IUSE="static-libs" DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/
commit: 13296df9c5a8854d3336bf49eeed54258704ba37 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Jan 23 13:50:03 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Jan 23 13:51:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13296df9 dev-cpp/libmcpp: amd64 stable wrt bug #606830 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild index 05ac244..a99cc41 100644 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" IUSE="static-libs" DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libmcpp/, dev-cpp/libmcpp/files/
commit: 5223573e6f288a71744b8e486108b94ee9b9ca7f Author: David Seifert gentoo org> AuthorDate: Sun Jan 22 17:14:49 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 22 17:15:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5223573e dev-cpp/libmcpp: Bump to EAPI 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/libmcpp-2.7.2-fix-build-system.patch | 30 +++ dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild| 44 ++ 2 files changed, 74 insertions(+) diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-build-system.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-build-system.patch new file mode 100644 index ..95cefad --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-build-system.patch @@ -0,0 +1,30 @@ +Specify and install files using idiomatic Automake +conventions instead of manually installing with cp. + +--- a/Makefile.am b/Makefile.am +@@ -23,16 +23,12 @@ + $(top_srcdir)/test-c $(top_srcdir)/test-l $(top_srcdir)/tool \ + $(top_srcdir)/doc $(top_srcdir)/doc-jp + +-if ! REPLACE_CPP +-install-exec-hook: +- $(top_srcdir)/config/install-sh -d "$(DESTDIR)$(prefix)/share/doc/mcpp" +- cp -pf $(top_srcdir)/LICENSE $(top_srcdir)/README $(top_srcdir)/NEWS \ +-$(DESTDIR)$(prefix)/share/doc/mcpp +- cp -pf $(top_srcdir)/doc/mcpp-manual.html \ +-$(DESTDIR)$(prefix)/share/doc/mcpp +- cp -pf $(top_srcdir)/doc-jp/mcpp-manual.html \ +-$(DESTDIR)$(prefix)/share/doc/mcpp/mcpp-manual-jp.html +-uninstall-hook: +- rm -rf $(DESTDIR)$(prefix)/share/doc/mcpp +-endif ++dist_doc_DATA = README NEWS doc/mcpp-summary.pdf + ++dist_html_DATA = \ ++ doc/cpp-test.html \ ++ doc/mcpp-manual.html \ ++ doc/mcpp-porting.html ++ ++htmljadir = $(htmldir)/doc-jp ++dist_htmlja_DATA = doc-jp/mcpp-manual.html diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild new file mode 100644 index ..05ac244 --- /dev/null +++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +MY_P=${P/lib/} + +DESCRIPTION="A portable C++ preprocessor" +HOMEPAGE="http://mcpp.sourceforge.net"; +SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos" +IUSE="static-libs" + +DEPEND="" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-mcpplib \ + $(use_enable static-libs static) +} + +src_install() { + default + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +}