[arch-commits] Commit in mcpp/repos/extra-x86_64 (6 files)
Allan McRae
allan at archlinux.org
Thu May 7 05:51:41 UTC 2020
Date: Thursday, May 7, 2020 @ 05:51:40
Author: allan
Revision: 382588
archrelease: copy trunk to extra-x86_64
Added:
mcpp/repos/extra-x86_64/PKGBUILD
(from rev 382587, mcpp/trunk/PKGBUILD)
mcpp/repos/extra-x86_64/fs28284.patch
(from rev 382587, mcpp/trunk/fs28284.patch)
mcpp/repos/extra-x86_64/namlen.patch
(from rev 382587, mcpp/trunk/namlen.patch)
Deleted:
mcpp/repos/extra-x86_64/PKGBUILD
mcpp/repos/extra-x86_64/fs28284.patch
mcpp/repos/extra-x86_64/namlen.patch
---------------+
PKGBUILD | 75 ++++++++++-----------
fs28284.patch | 200 ++++++++++++++++++++++++++++----------------------------
namlen.patch | 22 +++---
3 files changed, 148 insertions(+), 149 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-07 05:51:17 UTC (rev 382587)
+++ PKGBUILD 2020-05-07 05:51:40 UTC (rev 382588)
@@ -1,38 +0,0 @@
-# $Id$
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=mcpp
-pkgver=2.7.2
-pkgrel=6
-pkgdesc="Matsui's CPP implementation precisely conformed to standards"
-arch=('x86_64')
-license=('custom')
-url="http://mcpp.sourceforge.net"
-depends=('glibc')
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
- namlen.patch
- fs28284.patch)
-sha256sums=('3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864'
- 'ee8bf97c42150d2424a5984baec8227a44538e15c23cec93aabfc65daf9a6081'
- '27e42d8cae06327370cf0f9a8118d23a2f9368b87f24b38a9cb9c0c4eaeadb4e')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../namlen.patch
- patch -Np1 -i ../fs28284.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --enable-mcpplib --disable-static
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- ln -sf ../../doc/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: mcpp/repos/extra-x86_64/PKGBUILD (from rev 382587, mcpp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-07 05:51:40 UTC (rev 382588)
@@ -0,0 +1,37 @@
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=mcpp
+pkgver=2.7.2
+pkgrel=7
+pkgdesc="Matsui's CPP implementation precisely conformed to standards"
+arch=('x86_64')
+license=('custom')
+url="http://mcpp.sourceforge.net"
+depends=('glibc')
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ namlen.patch
+ fs28284.patch)
+sha256sums=('3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864'
+ 'ee8bf97c42150d2424a5984baec8227a44538e15c23cec93aabfc65daf9a6081'
+ '27e42d8cae06327370cf0f9a8118d23a2f9368b87f24b38a9cb9c0c4eaeadb4e')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../namlen.patch
+ patch -Np1 -i ../fs28284.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --enable-mcpplib --disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ ln -sf ../../doc/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: fs28284.patch
===================================================================
--- fs28284.patch 2020-05-07 05:51:17 UTC (rev 382587)
+++ fs28284.patch 2020-05-07 05:51:40 UTC (rev 382588)
@@ -1,100 +0,0 @@
-diff -c -r -N ../mcpp-2.7.2/src/internal.H ./src/internal.H
-*** ../mcpp-2.7.2/src/internal.H 2008-08-27 10:31:16.000000000 -0230
---- ./src/internal.H 2009-12-17 21:01:35.000000000 -0330
-***************
-*** 390,395 ****
---- 390,397 ----
- 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,562 ****
- #endif
- #endif
-
-! #if HOST_HAVE_STPCPY
- extern char * stpcpy( char * dest, const char * src);
- #endif
---- 559,564 ----
- #endif
- #endif
-
-! #if HOST_HAVE_STPCPY && !defined(stpcpy)
- extern char * stpcpy( char * dest, const char * src);
- #endif
-diff -c -r -N ../mcpp-2.7.2/src/main.c ./src/main.c
-*** ../mcpp-2.7.2/src/main.c 2008-11-05 05:04:46.000000000 -0330
---- ./src/main.c 2009-12-17 20:42:42.000000000 -0330
-***************
-*** 326,331 ****
---- 326,333 ----
- = FALSE;
- option_flags.trig = TRIGRAPHS_INIT;
- option_flags.dig = DIGRAPHS_INIT;
-+ sh_file = NULL;
-+ sh_line = 0;
- }
-
- int mcpp_lib_main
-diff -c -r -N ../mcpp-2.7.2/src/support.c ./src/support.c
-*** ../mcpp-2.7.2/src/support.c 2008-06-10 06:02:33.000000000 -0230
---- ./src/support.c 2009-12-17 20:42:39.000000000 -0330
-***************
-*** 188,194 ****
- size_t length
- )
- {
-! if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */
- size_t size = MAX( BUF_INCR_SIZE, length);
-
- if (mem_buf_p->buffer == NULL) { /* 1st append */
---- 188,194 ----
- size_t length
- )
- {
-! 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,1727 ****
---- 1722,1729 ----
- 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 */
-diff -c -r -N ../mcpp-2.7.2/src/system.c ./src/system.c
-*** ../mcpp-2.7.2/src/system.c 2008-11-26 06:23:51.000000000 -0330
---- ./src/system.c 2009-12-17 20:42:42.000000000 -0330
-***************
-*** 3858,3863 ****
---- 3858,3866 ----
- }
- #endif
-
-+ FILEINFO* sh_file;
-+ int sh_line;
-+
- void sharp(
- FILEINFO * sharp_file,
- int flag /* Flag to append to the line for GCC */
-***************
-*** 3868,3875 ****
- * else (i.e. 'sharp_file' is NULL) 'infile'.
- */
- {
-- static FILEINFO * sh_file;
-- static int sh_line;
- FILEINFO * file;
- int line;
-
---- 3871,3876 ----
Copied: mcpp/repos/extra-x86_64/fs28284.patch (from rev 382587, mcpp/trunk/fs28284.patch)
===================================================================
--- fs28284.patch (rev 0)
+++ fs28284.patch 2020-05-07 05:51:40 UTC (rev 382588)
@@ -0,0 +1,100 @@
+diff -c -r -N ../mcpp-2.7.2/src/internal.H ./src/internal.H
+*** ../mcpp-2.7.2/src/internal.H 2008-08-27 10:31:16.000000000 -0230
+--- ./src/internal.H 2009-12-17 21:01:35.000000000 -0330
+***************
+*** 390,395 ****
+--- 390,397 ----
+ 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,562 ****
+ #endif
+ #endif
+
+! #if HOST_HAVE_STPCPY
+ extern char * stpcpy( char * dest, const char * src);
+ #endif
+--- 559,564 ----
+ #endif
+ #endif
+
+! #if HOST_HAVE_STPCPY && !defined(stpcpy)
+ extern char * stpcpy( char * dest, const char * src);
+ #endif
+diff -c -r -N ../mcpp-2.7.2/src/main.c ./src/main.c
+*** ../mcpp-2.7.2/src/main.c 2008-11-05 05:04:46.000000000 -0330
+--- ./src/main.c 2009-12-17 20:42:42.000000000 -0330
+***************
+*** 326,331 ****
+--- 326,333 ----
+ = FALSE;
+ option_flags.trig = TRIGRAPHS_INIT;
+ option_flags.dig = DIGRAPHS_INIT;
++ sh_file = NULL;
++ sh_line = 0;
+ }
+
+ int mcpp_lib_main
+diff -c -r -N ../mcpp-2.7.2/src/support.c ./src/support.c
+*** ../mcpp-2.7.2/src/support.c 2008-06-10 06:02:33.000000000 -0230
+--- ./src/support.c 2009-12-17 20:42:39.000000000 -0330
+***************
+*** 188,194 ****
+ size_t length
+ )
+ {
+! if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */
+ size_t size = MAX( BUF_INCR_SIZE, length);
+
+ if (mem_buf_p->buffer == NULL) { /* 1st append */
+--- 188,194 ----
+ size_t length
+ )
+ {
+! 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,1727 ****
+--- 1722,1729 ----
+ 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 */
+diff -c -r -N ../mcpp-2.7.2/src/system.c ./src/system.c
+*** ../mcpp-2.7.2/src/system.c 2008-11-26 06:23:51.000000000 -0330
+--- ./src/system.c 2009-12-17 20:42:42.000000000 -0330
+***************
+*** 3858,3863 ****
+--- 3858,3866 ----
+ }
+ #endif
+
++ FILEINFO* sh_file;
++ int sh_line;
++
+ void sharp(
+ FILEINFO * sharp_file,
+ int flag /* Flag to append to the line for GCC */
+***************
+*** 3868,3875 ****
+ * else (i.e. 'sharp_file' is NULL) 'infile'.
+ */
+ {
+- static FILEINFO * sh_file;
+- static int sh_line;
+ FILEINFO * file;
+ int line;
+
+--- 3871,3876 ----
Deleted: namlen.patch
===================================================================
--- namlen.patch 2020-05-07 05:51:17 UTC (rev 382587)
+++ namlen.patch 2020-05-07 05:51:40 UTC (rev 382588)
@@ -1,11 +0,0 @@
---- mcpp-2.7.2/src/mbchar.c 2008-03-08 13:06:13.000000000 +0000
-+++ mcpp-2.7.2/src/mbchar.c 2009-03-08 13:14:17.000000000 +0000
-@@ -345,7 +345,7 @@
- static size_t mb_read_utf8( int c1, char ** in_pp, char ** out_pp);
- /* For UTF8 mbchar encoding */
-
--#define NAMLEN 20
-+#define NAMLEN 40
- #define UPPER 1 /* To upper */
- #define LOWER 0 /* To lower */
-
Copied: mcpp/repos/extra-x86_64/namlen.patch (from rev 382587, mcpp/trunk/namlen.patch)
===================================================================
--- namlen.patch (rev 0)
+++ namlen.patch 2020-05-07 05:51:40 UTC (rev 382588)
@@ -0,0 +1,11 @@
+--- mcpp-2.7.2/src/mbchar.c 2008-03-08 13:06:13.000000000 +0000
++++ mcpp-2.7.2/src/mbchar.c 2009-03-08 13:14:17.000000000 +0000
+@@ -345,7 +345,7 @@
+ static size_t mb_read_utf8( int c1, char ** in_pp, char ** out_pp);
+ /* For UTF8 mbchar encoding */
+
+-#define NAMLEN 20
++#define NAMLEN 40
+ #define UPPER 1 /* To upper */
+ #define LOWER 0 /* To lower */
+
More information about the arch-commits
mailing list