rpms/cfdg/F-9 cfdg.spec, NONE, 1.1 contextfree-2.1-Makefile-nostrip.patch, NONE, 1.1 contextfree-2.1-SVGCanvas-includes.patch, NONE, 1.1 contextfree-2.1-builder-includes.patch, NONE, 1.1 contextfree-2.1-mktemp.patch, NONE, 1.1 contextfree-2.1-optflags.patch, NONE, 1.1 contextfree-2.1-posixSystem-includes.patch, NONE, 1.1 contextfree-2.1-tiledCanvas-includes.patch, NONE, 1.1 contextfree-2.1-yglue-includes.patch, NONE, 1.1 sources, 1.1, 1.2

Jon Ciesla limb at fedoraproject.org
Mon Oct 27 12:39:20 UTC 2008


Author: limb

Update of /cvs/pkgs/rpms/cfdg/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21867

Modified Files:
	sources 
Added Files:
	cfdg.spec contextfree-2.1-Makefile-nostrip.patch 
	contextfree-2.1-SVGCanvas-includes.patch 
	contextfree-2.1-builder-includes.patch 
	contextfree-2.1-mktemp.patch contextfree-2.1-optflags.patch 
	contextfree-2.1-posixSystem-includes.patch 
	contextfree-2.1-tiledCanvas-includes.patch 
	contextfree-2.1-yglue-includes.patch 
Log Message:
Initial import.



--- NEW FILE cfdg.spec ---
Name: cfdg
Version:  2.1
Release:  5%{?dist}
Summary: Context Free Design Grammar

Group: Amusements/Games 
License: GPLv2+
URL: http://www.contextfreeart.org/

Source0: ContextFreeSource%{version}.tar.gz
#Source0: http://www.contextfreeart.org/download/ContextFreeSource%{version}.tgz
#Modified tarball due to licensing issues, to be fixed in 2.2
#To create from upstream:
#gunzip ContextFreeSource2.1.tgz
#tar -xf ContextFreeSource2.1.tar
#rm ContextFreeSource2.1/src-common/test.cpp 
#rm ContextFreeSource2.1/src-common/test.h
#rm ContextFreeSource2.1/src-common/test-test.cpp 
#tar -cf ContextFreeSource2.1.tar ContextFreeSource2.1
#gzip ContextFreeSource2.1.tar

#GCC 4.3 compatibility patches.  Submitted upstream via email 2008-06-25.
Patch0: contextfree-2.1-builder-includes.patch
Patch1: contextfree-2.1-yglue-includes.patch
Patch2: contextfree-2.1-SVGCanvas-includes.patch
Patch3: contextfree-2.1-tiledCanvas-includes.patch
Patch4: contextfree-2.1-posixSystem-includes.patch
#Strip patch.
Patch5: contextfree-2.1-Makefile-nostrip.patch
Patch6: contextfree-2.1-mktemp.patch
Patch7: contextfree-2.1-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: libpng-devel, byacc, flex

%description
Context Free is a program that generates images from written instructions 
called a grammar. The program follows the instructions in a few seconds to 
create images that can contain millions of shapes.

%prep
%setup -qn ContextFreeSource%{version}

%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch7 -p0

%build

make OPTFLAGS='%{optflags}' %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -D -m 755 cfdg %{buildroot}%{_bindir}/cfdg

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/cfdg
%doc input/* LICENSE.txt README.txt

%changelog
* Fri Oct 24 2008 Jon Ciesla <limb at jcomserv.net> - 2.1-5
- Created modified tarball for licensing issue.

* Wed Oct 15 2008 Jon Ciesla <limb at jcomserv.net> - 2.1-4
- Optflag fix.
- Added smp flags.
- Simplified install process.
- Retconned initial changelog entry.
- Fixed URL.

* Tue Oct 14 2008 Jon Ciesla <limb at jcomserv.net> - 2.1-3
- Patched for mktemp error.

* Mon Aug 18 2008 Jon Ciesla <limb at jcomserv.net> - 2.1-2
- Annotated patches, append CFLAGS for review.

* Tue Jun 17 2008 Jon Ciesla <limb at jcomserv.net> - 2.1-1
- Create.

contextfree-2.1-Makefile-nostrip.patch:

--- NEW FILE contextfree-2.1-Makefile-nostrip.patch ---
--- Makefile	2008-06-17 14:45:50.000000000 -0500
+++ Makefile	2008-06-17 14:45:50.000000000 -0500
@@ -53,7 +53,7 @@
 
 cfdg: $(OBJS)
 	$(LINK.o) $^ -L/usr/local/lib -lstdc++ -lpng -lz -fexceptions -o $@
-	strip $@
+#	strip $@
 
 
 #

contextfree-2.1-SVGCanvas-includes.patch:

--- NEW FILE contextfree-2.1-SVGCanvas-includes.patch ---
--- src-common/SVGCanvas.cpp	2008-06-17 14:22:22.000000000 -0500
+++ src-common/SVGCanvas.cpp	2008-06-17 14:22:22.000000000 -0500
@@ -14,6 +14,7 @@
 #include <iostream>
 #include <sstream>
 #include "primShape.h"
+#include <string.h>
 
 using namespace std;
 

contextfree-2.1-builder-includes.patch:

--- NEW FILE contextfree-2.1-builder-includes.patch ---
--- src-common/builder.cpp	2008-06-17 14:15:23.000000000 -0500
+++ src-common/builder.cpp	2008-06-17 14:15:23.000000000 -0500
@@ -2,6 +2,8 @@
 
 #include "agg_trans_affine.h"
 #include "cfdgimpl.h"
+#include <string.h>
+#include <cstdlib>
 
 #ifdef WIN32
 #include "rand48.h"

contextfree-2.1-mktemp.patch:

--- NEW FILE contextfree-2.1-mktemp.patch ---
--- src-unix/posixSystem.cpp	2008-10-14 15:02:46.000000000 -0500
+++ src-unix/posixSystem.cpp	2008-10-14 15:02:46.000000000 -0500
@@ -54,7 +54,7 @@
 	
 	ofstream* f = 0;
 	
-	if (mktemp(b)) {
+	if (mkstemp(b)) {
 		f = new ofstream;
 		f->open(b, ios::binary);
 		prefixInNameOut = b;

contextfree-2.1-optflags.patch:

--- NEW FILE contextfree-2.1-optflags.patch ---
--- Makefile	2008-10-15 07:57:00.000000000 -0500
+++ Makefile	2008-10-15 07:57:00.000000000 -0500
@@ -102,8 +102,9 @@
 # Rules
 #
 
+OPTFLAGS = -03
 CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
-CPPFLAGS += -O3
+CPPFLAGS += $(OPTFLAGS)
 #CPPFLAGS += -ggdb
 
 $(OBJ_DIR)/%.o : %.cpp

contextfree-2.1-posixSystem-includes.patch:

--- NEW FILE contextfree-2.1-posixSystem-includes.patch ---
--- src-unix/posixSystem.cpp	2008-06-17 14:39:17.000000000 -0500
+++ src-unix/posixSystem.cpp	2008-06-17 14:39:17.000000000 -0500
@@ -2,8 +2,9 @@
 
 #include "stdarg.h"
 
-#include <string>
+#include <string.h>
 #include <fstream>
+#include <cstdlib>
 
 using namespace std;
 

contextfree-2.1-tiledCanvas-includes.patch:

--- NEW FILE contextfree-2.1-tiledCanvas-includes.patch ---
--- src-common/tiledCanvas.cpp	2008-06-17 14:31:18.000000000 -0500
+++ src-common/tiledCanvas.cpp	2008-06-17 14:31:18.000000000 -0500
@@ -11,6 +11,7 @@
 #include <math.h>
 #include "primShape.h"
 #include "bounds.h"
+#include <cstdlib>
 
 void tiledCanvas::start(bool clear, const agg::rgba& bk, int , int )
 {

contextfree-2.1-yglue-includes.patch:

--- NEW FILE contextfree-2.1-yglue-includes.patch ---
--- src-common/yglue.cpp	2008-06-17 14:19:29.000000000 -0500
+++ src-common/yglue.cpp	2008-06-17 14:19:29.000000000 -0500
@@ -11,6 +11,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <cstdlib>
 
 #include "builder.h"
 #include "cfdg.h"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Oct 2008 04:44:40 -0000	1.1
+++ sources	27 Oct 2008 12:39:20 -0000	1.2
@@ -0,0 +1 @@
+3b0b1eb495def73b8dfcbce3dfbe0985  ContextFreeSource2.1.tar.gz




More information about the scm-commits mailing list