commit a6e8d0d6efd392ae5326487b66a112890a1e97c0
Author: Jakub Bogusz <[email protected]>
Date: Thu Feb 16 22:45:58 2023 +0100
- added no-common patch, versioned Obsoletes, release 5 (libffi 3.4.x)
pnet-no-common.patch | 21 +++++++++++++++++++++
pnet.spec | 6 ++++--
2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/pnet.spec b/pnet.spec
index fe54024..90e23fa 100644
--- a/pnet.spec
+++ b/pnet.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8): Narzędzia Portable .NET z projektu
DotGNU
Summary(pt_BR.UTF-8): Ferramentas Portable .NET DotGNU
Name: pnet
Version: 0.8.0
-Release: 4
+Release: 5
License: GPL v2+
Group: Development/Languages
Source0:
http://download.savannah.gnu.org/releases/dotgnu-pnet/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch4: %{name}-info.patch
Patch5: %{name}-link.patch
Patch6: %{name}-opt.patch
Patch7: x32.patch
+Patch8: %{name}-no-common.patch
URL: http://www.gnu.org/software/dotgnu/pnet.html
BuildRequires: autoconf
BuildRequires: automake
@@ -136,7 +137,7 @@ Summary(pl.UTF-8): Pliki wspólne dla kompilatorów Portable
.NET
Group: Development/Languages
Requires: %{name}-interpreter = %{version}
Requires: ilasm
-Obsoletes: pnet-libgc
+Obsoletes: pnet-libgc < 0.6.2-3
%description compiler-common
The cscc compiler collection allows multiple input languages and
@@ -306,6 +307,7 @@ Header de desenvolviemnto da Portable .NET.
%patch6 -p1
%endif
%patch7 -p1
+%patch8 -p1
%{__rm} ilasm/ilasm_grammar.c
diff --git a/pnet-no-common.patch b/pnet-no-common.patch
new file mode 100644
index 0000000..2b0b9f8
--- /dev/null
+++ b/pnet-no-common.patch
@@ -0,0 +1,21 @@
+--- pnet-0.8.0/cscc/common/cc_main.h.orig 2004-07-08 01:47:37.000000000
+0200
++++ pnet-0.8.0/cscc/common/cc_main.h 2023-02-16 22:13:49.331652190 +0100
+@@ -137,7 +137,7 @@ extern ILScope *CCGlobalScope;
+ /*
+ * Pre-processor stream.
+ */
+-CCPreProc CCPreProcessorStream;
++extern CCPreProc CCPreProcessorStream;
+
+ /*
+ * Main entry point. Call this from the plugin's "main".
+--- pnet-0.8.0/csdoc/scanner.c.orig 2003-06-24 06:20:25.000000000 +0200
++++ pnet-0.8.0/csdoc/scanner.c 2023-02-16 22:17:51.579756587 +0100
+@@ -82,7 +82,6 @@ char tokenString[MAX_LENGTH]; // next t
+ char expandText[8]; // for
expanding special characters
+ int expandPosition = 0;
+ bool expand = FALSE;
+-int token; //
current token for scanner/parser
+ int error = NoError; // scanner
error code
+ bool inCcomment = FALSE; // true if parsing C
style comment
+ bool inCPPcomment = FALSE; // true if parsing C++ style
comment
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pnet.git/commitdiff/a6e8d0d6efd392ae5326487b66a112890a1e97c0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
