rpms/fillets-ng/devel fillets-ng-0.8.0-fribidi.patch, NONE, 1.1 fillets-ng-0.8.0-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fillets-ng.spec, 1.13, 1.14 sources, 1.5, 1.6
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Sun Feb 24 12:53:53 UTC 2008
- Previous message (by thread): rpms/fillets-ng-data/devel .cvsignore, 1.4, 1.5 fillets-ng-data.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/hackedbox/devel hackedbox-0.8.5-gcc43.patch, NONE, 1.1 hackedbox.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4189
Modified Files:
.cvsignore fillets-ng.spec sources
Added Files:
fillets-ng-0.8.0-fribidi.patch fillets-ng-0.8.0-gcc43.patch
Log Message:
Update to 0.8.0.
fillets-ng-0.8.0-fribidi.patch:
--- NEW FILE fillets-ng-0.8.0-fribidi.patch ---
diff -Naupr fillets-ng-0.8.0.orig/src/effect/Font.cpp fillets-ng-0.8.0.fribidi/src/effect/Font.cpp
--- fillets-ng-0.8.0.orig/src/effect/Font.cpp 2006-01-05 22:55:24.000000000 +0100
+++ fillets-ng-0.8.0.fribidi/src/effect/Font.cpp 2008-02-24 13:44:37.000000000 +0100
@@ -26,7 +26,8 @@ Font::biditize(const std::string &text)
FriBidiChar *logicalString = new FriBidiChar[text.length() + 1];
FriBidiChar *visualString = new FriBidiChar[text.length() + 1];
- int ucsLength = fribidi_utf8_to_unicode(const_cast<char*>(text.c_str()),
+ int ucsLength = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
+ const_cast<char*>(text.c_str()),
text.length(), logicalString);
fribidi_boolean ok = fribidi_log2vis(logicalString, ucsLength, &base,
visualString, NULL, NULL, NULL);
@@ -37,7 +38,8 @@ Font::biditize(const std::string &text)
}
char *buffer = new char[text.length() + 1];
- int length = fribidi_unicode_to_utf8(visualString, ucsLength, buffer);
+ int length = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8,
+ visualString, ucsLength, buffer);
std::string result = std::string(buffer, length);
delete[] buffer;
delete[] visualString;
fillets-ng-0.8.0-gcc43.patch:
--- NEW FILE fillets-ng-0.8.0-gcc43.patch ---
diff -Naupr fillets-ng-0.8.0.orig/src/gengine/OptionAgent.cpp fillets-ng-0.8.0/src/gengine/OptionAgent.cpp
--- fillets-ng-0.8.0.orig/src/gengine/OptionAgent.cpp 2006-02-12 12:59:06.000000000 +0100
+++ fillets-ng-0.8.0/src/gengine/OptionAgent.cpp 2008-02-24 13:16:01.000000000 +0100
@@ -25,6 +25,8 @@
#include <string.h> //strlen
#include <locale.h> //setlocale
+#include <cstdlib> //getenv
+#include <climits>
#ifndef LC_MESSAGES
#define LC_MESSAGES LC_CTYPE
diff -Naupr fillets-ng-0.8.0.orig/src/gengine/StringTool.cpp fillets-ng-0.8.0/src/gengine/StringTool.cpp
--- fillets-ng-0.8.0.orig/src/gengine/StringTool.cpp 2007-06-30 16:55:12.000000000 +0200
+++ fillets-ng-0.8.0/src/gengine/StringTool.cpp 2008-02-24 13:26:09.000000000 +0100
@@ -9,6 +9,7 @@
#include "StringTool.h"
#include <sstream>
+#include <cstdlib>
//-----------------------------------------------------------------
/**
diff -Naupr fillets-ng-0.8.0.orig/src/level/Landslip.cpp fillets-ng-0.8.0/src/level/Landslip.cpp
--- fillets-ng-0.8.0.orig/src/level/Landslip.cpp 2004-08-27 13:37:56.000000000 +0200
+++ fillets-ng-0.8.0/src/level/Landslip.cpp 2008-02-24 13:49:24.000000000 +0100
@@ -11,6 +11,8 @@
#include "Rules.h"
#include "minmax.h"
+#include <cstring>
+
//-----------------------------------------------------------------
Landslip::Landslip(const ModelList &models)
: m_models(models)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 20 Jun 2007 11:39:42 -0000 1.5
+++ .cvsignore 24 Feb 2008 12:53:20 -0000 1.6
@@ -1 +1 @@
-fillets-ng-0.7.4.tar.gz
+fillets-ng-0.8.0.tar.gz
Index: fillets-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fillets-ng.spec 20 Feb 2008 04:04:43 -0000 1.13
+++ fillets-ng.spec 24 Feb 2008 12:53:20 -0000 1.14
@@ -1,15 +1,17 @@
Summary: Fish Fillets Next Generation, a puzzle game with 70 levels
Name: fillets-ng
-Version: 0.7.4
-Release: 4%{?dist}
+Version: 0.8.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
URL: http://fillets.sourceforge.net/
Source0: http://downloads.sf.net/fillets/fillets-ng-%{version}.tar.gz
Source1: fillets.desktop
Source2: fillets.png
+Patch0: fillets-ng-0.8.0-gcc43.patch
+Patch1: fillets-ng-0.8.0-fribidi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: fillets-ng-data >= 0.7.4
+Requires: fillets-ng-data >= 0.8.0
BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
BuildRequires: lua-devel, fribidi-devel, desktop-file-utils
@@ -24,6 +26,8 @@
%prep
%setup -q
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .fribidi
%build
@@ -70,7 +74,12 @@
%changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.4-4
+* Sun Feb 24 2008 Matthias Saou <http://freshrpms.net/> 0.8.0-1
+- Update to 0.8.0.
+- Include patch to fix build with gcc 4.3.
+- Include patch to fix build with fribidi 0.19.1.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
- Autorebuild for GCC 4.3
* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.7.4-3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 20 Jun 2007 11:39:42 -0000 1.5
+++ sources 24 Feb 2008 12:53:20 -0000 1.6
@@ -1 +1 @@
-912c146e70d90092a3dc89928e0be0f8 fillets-ng-0.7.4.tar.gz
+5daccbed195ae74cdfa54755ef62e3ce fillets-ng-0.8.0.tar.gz
- Previous message (by thread): rpms/fillets-ng-data/devel .cvsignore, 1.4, 1.5 fillets-ng-data.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/hackedbox/devel hackedbox-0.8.5-gcc43.patch, NONE, 1.1 hackedbox.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list