rpms/nagi/FC-6 nagi-2.06-build_with_gcc-3.4.patch, NONE, 1.1 nagi-2.06-build_with_gcc-4.0.patch, NONE, 1.1 nagi-2.06-debian.patch, NONE, 1.1 nagi.sgml, NONE, 1.1 nagi.spec, NONE, 1.1 sources, 1.1, 1.2
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Tue May 22 14:35:01 UTC 2007
- Previous message (by thread): rpms/emacs/devel .cvsignore, 1.19, 1.20 emacs.spec, 1.93, 1.94 sources, 1.20, 1.21
- Next message (by thread): rpms/nagi/FC-5 nagi-2.06-build_with_gcc-3.4.patch, NONE, 1.1 nagi-2.06-build_with_gcc-4.0.patch, NONE, 1.1 nagi-2.06-debian.patch, NONE, 1.1 nagi.sgml, NONE, 1.1 nagi.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: limb
Update of /cvs/pkgs/rpms/nagi/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22343
Modified Files:
sources
Added Files:
nagi-2.06-build_with_gcc-3.4.patch
nagi-2.06-build_with_gcc-4.0.patch nagi-2.06-debian.patch
nagi.sgml nagi.spec
Log Message:
Initial import.
nagi-2.06-build_with_gcc-3.4.patch:
--- NEW FILE nagi-2.06-build_with_gcc-3.4.patch ---
--- src/objects.c 2002-11-01 11:32:28.000000000 +0100
+++ src/objects.c 2004-07-21 17:39:15.081471539 +0200
@@ -146,6 +146,7 @@
count = 0;
obj_continue:
+ continue;
}
// bung in a '\0' at the end if one doesn't exist
diff -urN ../tmp-orig/nagi-2.07b/src/ui/cmd_input.c ./src/ui/cmd_input.c
--- src/ui/cmd_input.c 2002-11-01 11:32:28.000000000 +0100
+++ src/ui/cmd_input.c 2004-07-21 17:44:08.445769637 +0200
@@ -94,7 +94,6 @@
case 10: // mouse
mouse_event_handle(si);
break;
- default:
}
si = control_key_map( event_read() );
}
diff -urN ../tmp-orig/nagi-2.07b/src/ui/events.c ./src/ui/events.c
--- src/ui/events.c 2002-11-01 11:32:30.000000000 +0100
+++ src/ui/events.c 2004-07-21 17:43:56.790022601 +0200
@@ -314,7 +314,6 @@
agi_event = event_mouse_button(event.button.button,event.button.x,event.button.y);
break;
- default:
}
}
diff -urN ../tmp-orig/nagi-2.07b/src/ui/list_box.c ./src/ui/list_box.c
--- src/ui/list_box.c 2002-11-01 11:32:30.000000000 +0100
+++ src/ui/list_box.c 2004-07-21 17:44:33.050013795 +0200
@@ -204,7 +204,6 @@
force = 2;
break;
- default:
}
if (item_cur < 0)
diff -urN ../tmp-orig/nagi-2.07b/src/ui/menu.c ./src/ui/menu.c
--- src/ui/menu.c 2002-11-01 11:32:30.000000000 +0100
+++ src/ui/menu.c 2004-07-21 17:44:22.444063864 +0200
@@ -357,7 +357,6 @@
menu_draw(si);
break;
- default: // NONE?
}
break;
}
diff -urN ../tmp-orig/nagi-2.07b/src/ui/msg.c ./src/ui/msg.c
--- src/ui/msg.c 2002-11-01 11:32:30.000000000 +0100
+++ src/ui/msg.c 2004-07-21 17:43:44.723354983 +0200
@@ -385,7 +385,6 @@
msg = r_display1f93(word_string[my_num], msg);
break;
- default:
}
break;
diff -urN ../tmp-orig/nagi-2.07b/src/view/obj_loop.c ./src/view/obj_loop.c
--- src/view/obj_loop.c 2002-11-01 11:32:30.000000000 +0100
+++ src/view/obj_loop.c 2004-07-21 17:43:09.498163644 +0200
@@ -62,7 +62,6 @@
else
c = max;
break;
- default:
}
obj_cel_set(v, c);
diff -urN ../tmp-orig/nagi-2.07b/src/view/obj_motion.c ./src/view/obj_motion.c
--- src/view/obj_motion.c 2002-11-01 11:32:30.000000000 +0100
+++ src/view/obj_motion.c 2004-07-21 17:43:20.072119818 +0200
@@ -66,7 +66,6 @@
case MT_MOVE:
obj_move_update(v);
break;
- default:
}
if (state.block_state == 0)
diff -urN ../tmp-orig/nagi-2.07b/src/view/obj_proximity.c ./src/view/obj_proximity.c
--- src/view/obj_proximity.c 2002-11-01 11:32:30.000000000 +0100
+++ src/view/obj_proximity.c 2004-07-21 17:42:50.886760996 +0200
@@ -40,6 +40,7 @@
return 1;
loc472e:
+ continue;
}
}
return 0;
nagi-2.06-build_with_gcc-4.0.patch:
--- NEW FILE nagi-2.06-build_with_gcc-4.0.patch ---
--- src/Makefile.common 2002-11-01 12:32:28.000000000 +0200
+++ src/Makefile.common 2005-01-03 18:13:52.000000000 +0200
@@ -59,7 +59,6 @@
#CFLAGS += -pg
CFLAGS += -O2
#CFLAGS += -finline-functions
-CFLAGS += -fwritable-strings
# Warnings
CFLAGS += -Wall -Winline -Wshadow -Wstrict-prototypes
diff -aurE old/nagi-2.07b/src/initialise.c src/initialise.c
--- src/initialise.c 2005-01-03 18:10:35.000000000 +0200
+++ src/initialise.c 2005-01-03 17:59:10.000000000 +0200
@@ -89,6 +89,7 @@
u8 env_value[50];
#endif
INI *ini_nagi;
+ char tmp[512];
memset( &state, 0, sizeof(AGI_STATE) );
state.word_13f = 0x0F;
@@ -103,7 +104,8 @@
// read nagi.ini
dir_preset_change(DIR_PRESET_NAGI);
- ini_nagi = ini_open("/etc/nagi/nagi.ini");
+ strcpy(tmp, "/etc/nagi/nagi.ini");
+ ini_nagi = ini_open(tmp);
config_load(config_nagi, ini_nagi);
ini_close(ini_nagi);
diff -aurE old/nagi-2.07b/src/sys/agi_file.c src/sys/agi_file.c
--- src/sys/agi_file.c 2002-11-01 12:32:28.000000000 +0200
+++ src/sys/agi_file.c 2005-01-03 18:02:43.000000000 +0200
@@ -121,12 +121,15 @@
-FILE *fopen_nocase(u8 *name)
+FILE *fopen_nocase(u8 *orig_name)
{
#ifdef RAD_LINUX
DIR *dir;
struct dirent *fileent;
FILE *ret;
+ char name[512];
+
+ strcpy(name, orig_name);
dir = opendir(".");
string_lower(name);
diff -aurE old/nagi-2.07b/src/sys/memory.c src/sys/memory.c
--- src/sys/memory.c 2002-11-01 12:32:28.000000000 +0200
+++ src/sys/memory.c 2005-01-03 13:02:46.000000000 +0200
@@ -84,7 +84,7 @@
}
return_ptr = mem_ptr;
- (u8 *)mem_ptr += size;
+ mem_ptr = (u8 *)mem_ptr + size;
update_var8();
if (mem_ptr > mem_max)
mem_max = mem_ptr;
diff -aurE old/nagi-2.07b/src/version/standard.c src/version/standard.c
--- src/version/standard.c 2005-01-03 18:10:35.000000000 +0200
+++ src/version/standard.c 2005-01-03 17:59:49.000000000 +0200
@@ -792,9 +792,11 @@
INI *ini_standard;
LIST *list_game;
GAMEINFO *game_selected;
+ char tmp[512];
dir_preset_change(DIR_PRESET_NAGI);
- ini_standard = ini_open("/etc/nagi/standard.ini");
+ strcpy(tmp, "/etc/nagi/standard.ini");
+ ini_standard = ini_open(tmp);
text_init();
// read in standard parameters
nagi-2.06-debian.patch:
--- NEW FILE nagi-2.06-debian.patch ---
--- src/initialise.c
+++ src/initialise.c
@@ -103,7 +103,7 @@
// read nagi.ini
dir_preset_change(DIR_PRESET_NAGI);
- ini_nagi = ini_open("nagi.ini");
+ ini_nagi = ini_open("/etc/nagi/nagi.ini");
config_load(config_nagi, ini_nagi);
ini_close(ini_nagi);
--- src/sys/chargen.c
+++ src/sys/chargen.c
@@ -93,8 +93,9 @@
{
u8 *token, *running;
u8 *list;
+ u8 *fullpath;
SIZE size;
FILE *pref_file = 0;
int pref_scale = 0;
@@ -106,7 +107,11 @@
while (token != 0)
{
//check token
- cur_file = fopen(token, "rb");
+ fullpath = malloc( strlen(token) + strlen("/usr/share/nagi/")+1 );
+ strcpy( fullpath, "/usr/share/nagi/" );
+ strcat( fullpath, token );
+ cur_file = fopen(fullpath, "rb");
+ free( fullpath );
if (cur_file != 0)
{
// FIXME .. doesn't check size
--- src/tools/savefont.c
+++ src/tools/savefont.c
@@ -62,8 +62,8 @@
u8 *ch_ptr;
u8 ch_check;
- file = fopen("font_4x8.fnt", "w");
-
+ file = fopen("/usr/share/nagi/font_4x8.fnt", "w");
+
this_font = &font_4x8;
--- src/version/standard.c
+++ src/version/standard.c
@@ -794,9 +794,9 @@
GAMEINFO *game_selected;
dir_preset_change(DIR_PRESET_NAGI);
- ini_standard = ini_open("standard.ini");
+ ini_standard = ini_open("/etc/nagi/standard.ini");
text_init();
// read in standard parameters
config_load(config_standard, ini_standard);
--- NEW FILE nagi.sgml ---
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY dhfirstname "<firstname>Jarno</firstname>">
<!ENTITY dhsurname "<surname>Elonen</surname>">
<!ENTITY dhdate "<date>2003-02-03</date>">
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>elonen at iki.fi</email>">
<!ENTITY dhusername "elonen">
<!ENTITY dhucpackage "<refentrytitle>nagi</refentrytitle>">
<!ENTITY dhpackage "nagi">
<!ENTITY debian "<productname>Debian</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
]>
<refentry>
<refentryinfo>
<address>
&dhemail;
</address>
<author>
&dhfirstname;
&dhsurname;
</author>
<copyright>
<year>2003</year>
<holder>&dhusername;</holder>
</copyright>
&dhdate;
</refentryinfo>
<refmeta>
&dhucpackage;
&dhsection;
</refmeta>
<refnamediv>
<refname>&dhpackage;</refname>
<refpurpose>Sierra Online (tm) AGI game interpreter</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>&dhpackage;</command>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>AGI, or the Adventure Game Interpreter, was developed and used by Sierra
Online for their games, most notably the famous "Quest-series" in the late
1980's. Nagi is an open source interpreter for playing AGI games.</para>
<para>To start playing an AGI game, change to the directory where the
AGI resources are and execute <command>nagi</command> without any
parameters.</para>
<para>Nagi supports a wide range of old Sierra games (you need the original
files) as well as new AGI resources developed with tools like the
Linux AGI Studio.</para>
<para>This manual page was written for the &debian; distribution
because the original program is bundled with neither a manual page
nor much documentation in other formats. For more information, visit
<ulink url="http://www.agidev.com/projects/nagi/">Nagi website</ulink>.
</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>sarien (1).</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; Free Documentation
License, Version 1.1 or any later version published by the Free
Software Foundation; with no Invariant Sections, no Front-Cover
Texts and no Back-Cover Texts.</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:2
sgml-indent-data:t
sgml-parent-document:nil
sgml-default-dtd-file:nil
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
-->
--- NEW FILE nagi.spec ---
Summary: An interpreter for AGI games
Name: nagi
Version: 2.06
Release: 3%{?dist}
Group: Amusements/Games
License: MIT
URL: http://www.agidev.com/projects/nagi/
Source0: http://www.agidev.com/dl_files/nagi/nagi_src_-_2002-11-14.tar.gz
Source1: nagi.sgml
Patch0: nagi-2.06-debian.patch
Patch1: nagi-2.06-build_with_gcc-3.4.patch
Patch2:nagi-2.06-build_with_gcc-4.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: docbook-utils, SDL-devel
%description
NAGI is an interpreter for AGI games, such as the early Space Quest,
Leisure Suit Larry and King's Quest games.
%prep
%setup -qcn nagi
%patch0 -p0
%patch1 -p0
%patch2 -p0
%build
export CFLAGS="$RPM_OPT_FLAGS"
cd src
make -f Makefile.linux
docbook2man %{SOURCE1}
cd ..
sed -i 's/\r//' license.txt
sed -i 's/\r//' readme.html
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir}
install -Dp -m755 bin/nagi %{buildroot}/%{_bindir}/nagi
mkdir -p %{buildroot}%{_datadir}/nagi
install -Dp -m644 bin/*.nbf %{buildroot}%{_datadir}/nagi/
mkdir -p %{buildroot}%{_sysconfdir}/nagi
install -Dp -m644 bin/nagi.ini %{buildroot}%{_sysconfdir}/nagi/
install -Dp -m644 bin/standard.ini %{buildroot}%{_sysconfdir}/nagi/
mkdir -p %{buildroot}%{_mandir}/man1
install -Dp -m644 src/nagi.1 %{buildroot}%{_mandir}/man1
%files
%defattr(-,root,root)
%doc license.txt readme.html
%{_bindir}/nagi
%{_datadir}/nagi/
%config(noreplace) %{_sysconfdir}/nagi/
%{_mandir}/man1/nagi.1.gz
%clean
rm -rf %{buildroot}
%changelog
* Thu May 17 2007 Jon Ciesla <limb at jcomserv.net> 2.06-3
- Fixed RPM_OPT_FLAGS.
- Fixed build path issues.
- Preserved timestamps.
* Thu May 17 2007 Jon Ciesla <limb at jcomserv.net> 2.06-2
- Changed to literal sed.
- Cleaned up dir creation.
- Corrected patch names.
* Thu May 17 2007 Jon Ciesla <limb at jcomserv.net> 2.06-1
- Fixed license tag, version.
* Tue May 15 2007 Jon Ciesla <limb at jcomserv.net> 0.1-20021114
- Fixed dos2unix/sed, SDL-devel BR.
* Tue May 01 2007 Jon Ciesla <limb at jcomserv.net> 0.1-20021114
- Inital packaging.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagi/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 May 2007 13:35:03 -0000 1.1
+++ sources 22 May 2007 14:34:26 -0000 1.2
@@ -0,0 +1 @@
+0ccbbc054608021938cc62296c58afed nagi_src_-_2002-11-14.tar.gz
- Previous message (by thread): rpms/emacs/devel .cvsignore, 1.19, 1.20 emacs.spec, 1.93, 1.94 sources, 1.20, 1.21
- Next message (by thread): rpms/nagi/FC-5 nagi-2.06-build_with_gcc-3.4.patch, NONE, 1.1 nagi-2.06-build_with_gcc-4.0.patch, NONE, 1.1 nagi-2.06-debian.patch, NONE, 1.1 nagi.sgml, NONE, 1.1 nagi.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list