rpms/mcpp/F-11 patch.mcpp.2.7.2.txt,NONE,1.1 mcpp.spec,1.8,1.9
mef
mef at fedoraproject.org
Tue Oct 13 13:37:01 UTC 2009
- Previous message (by thread): rpms/perl-Net-OAuth/devel .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/mcpp/F-12 patch.mcpp.2.7.2.txt,NONE,1.1 mcpp.spec,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mef
Update of /cvs/pkgs/rpms/mcpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3651/F-11
Modified Files:
mcpp.spec
Added Files:
patch.mcpp.2.7.2.txt
Log Message:
Incorporate patch from upstream Ice project
--- NEW FILE patch.mcpp.2.7.2.txt ---
diff -c -r -N ../mcpp-2.7.2-old/src/internal.H ./src/internal.H
*** ../mcpp-2.7.2-old/src/internal.H 2008-08-27 10:31:16.000000000 -0230
--- ./src/internal.H 2009-05-21 09:49:31.000000000 -0230
***************
*** 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 */
diff -c -r -N ../mcpp-2.7.2-old/src/main.c ./src/main.c
*** ../mcpp-2.7.2-old/src/main.c 2008-11-05 05:04:46.000000000 -0330
--- ./src/main.c 2009-05-21 09:47:50.000000000 -0230
***************
*** 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-old/src/system.c ./src/system.c
*** ../mcpp-2.7.2-old/src/system.c 2008-11-26 06:23:51.000000000 -0330
--- ./src/system.c 2009-05-21 09:48:50.000000000 -0230
***************
*** 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 ----
Index: mcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcpp/F-11/mcpp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mcpp.spec 26 Feb 2009 00:00:26 -0000 1.8
+++ mcpp.spec 13 Oct 2009 13:37:01 -0000 1.9
@@ -3,12 +3,14 @@
Summary: Alternative C/C++ preprocessor
Name: mcpp
Version: 2.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Development/Languages
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
URL: http://mcpp.sourceforge.net/
Patch0: mcpp-manual.html.patch
+# From http://www.zeroc.com/forums/patches/4445-patch-1-mcpp-2-7-2-a.html
+Patch1: patch.mcpp.2.7.2.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
@@ -28,6 +30,7 @@ shared library of mcpp and behaves indep
%prep
%setup -q
%patch0 -p0 -b -z.euc-jp
+%patch1 -p1
%build
%configure --enable-mcpplib --disable-static
@@ -93,6 +96,9 @@ This package provides an html manual for
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 13 2009 Mary Ellen Foster <mefoster at gmail.com> 2.7.2-3
+- Incorporate patch from Ice upstream project
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message (by thread): rpms/perl-Net-OAuth/devel .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/mcpp/F-12 patch.mcpp.2.7.2.txt,NONE,1.1 mcpp.spec,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list