- Two patches to fix build for GCC4 and new Perl with config.h.

This commit is contained in:
Michael Schwendt 2005-04-11 21:26:34 +00:00
parent 28c2f0a97a
commit cd38bf5f9e
3 changed files with 32 additions and 1 deletions

12
irssi-0.8.9-gcc4.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nur irssi-0.8.9-orig/src/perl/ui/Formats.xs irssi-0.8.9/src/perl/ui/Formats.xs
--- irssi-0.8.9-orig/src/perl/ui/Formats.xs 2003-01-25 04:30:02.000000000 +0100
+++ irssi-0.8.9/src/perl/ui/Formats.xs 2005-04-11 23:18:40.000000000 +0200
@@ -3,7 +3,7 @@
static int magic_free_text_dest(pTHX_ SV *sv, MAGIC *mg)
{
TEXT_DEST_REC *dest = (TEXT_DEST_REC *) mg->mg_ptr;
- g_free((char *) dest->target);
+ g_free(dest->target);
g_free(dest);
mg->mg_ptr = NULL;
sv_setiv(sv, 0);

View File

@ -0,0 +1,12 @@
diff -Nur irssi-0.8.9-orig/src/common.h irssi-0.8.9/src/common.h
--- irssi-0.8.9-orig/src/common.h 2002-12-10 18:45:02.000000000 +0100
+++ irssi-0.8.9/src/common.h 2005-04-11 23:15:59.000000000 +0200
@@ -14,7 +14,7 @@
#define DEFAULT_SERVER_ADD_PORT 6667
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../config.h"
#endif
#include <stdio.h>

View File

@ -3,7 +3,7 @@
Summary: Modular text mode IRC client with Perl scripting
Name: irssi
Version: 0.8.9
Release: 6
Release: 7
License: GPL
Group: Applications/Communications
@ -13,6 +13,8 @@ Source1: http://wouter.coekaerts.be/irssi/scripts/replace.pl
Source2: http://wouter.coekaerts.be/irssi/scripts/trigger.pl
Source3: http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
Patch1: convert-replace-trigger.pl-fixpath-patch
Patch2: irssi-0.8.9-include-config.h.patch
Patch3: irssi-0.8.9-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: ncurses-devel openssl-devel zlib-devel pkgconfig gc-devel
%{?_with_glib1:BuildRequires: glib-devel}
@ -31,6 +33,8 @@ being maintained.
%setup -q
install -m 0644 %{SOURCE3} .
%patch1 -p0
%patch2 -p1 -b .include-config.h
%patch3 -p1 -b .gcc4
%build
@ -79,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Apr 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.8.9-7
- Two patches to fix build for GCC4 and new Perl with config.h.
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt