From 922340e94d6d06b22ec06d318dcadcd8f9523bbe Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 6 Sep 2010 10:26:44 +0200 Subject: [PATCH] fix perl plugin breakage --- build/xchat-wdk.iss | 8 ++++---- config.h | 2 +- xchat-wdk.patch | 20 +------------------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 97283af0..e97c89ff 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -1,9 +1,9 @@ [Setup] AppName=XChat-WDK -AppVerName=XChat-WDK 1464-5 -AppVersion=14.64.5 -VersionInfoVersion=14.64.5 -OutputBaseFilename=XChat-WDK 1464-5 +AppVerName=XChat-WDK 1464-6 +AppVersion=14.64.6 +VersionInfoVersion=14.64.6 +OutputBaseFilename=XChat-WDK 1464-6 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny diff --git a/config.h b/config.h index 13c2b637..051e58de 100644 --- a/config.h +++ b/config.h @@ -6,7 +6,7 @@ #define USE_GTKSPELL #endif*/ #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "1464-5" +#define PACKAGE_VERSION "1464-6" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 17f30238..b51b30d1 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -1,6 +1,6 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c --- xchat-wdk.orig/plugins/perl/perl.c 2010-08-26 04:18:04 +0200 -+++ xchat-wdk/plugins/perl/perl.c 2010-08-26 16:59:41 +0200 ++++ xchat-wdk/plugins/perl/perl.c 2010-09-06 10:25:57 +0200 @@ -22,12 +22,15 @@ #include #include @@ -39,24 +39,6 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi "Make sure perl's bin directory is in your PATH."); } } -@@ -1461,7 +1468,7 @@ - { - *name = "Perl"; - *desc = "Perl scripting interface"; -- *version = PACKAGE_VERSION; -+ *version = strcat (PACKAGE_VERSION, "/"PERL_REQUIRED_VERSION); - if (reserved) - *reserved = NULL; - } -@@ -1487,7 +1494,7 @@ - - *plugin_name = "Perl"; - *plugin_desc = "Perl scripting interface"; -- *plugin_version = PACKAGE_VERSION; -+ *plugin_version = strcat (PACKAGE_VERSION, "/"PERL_REQUIRED_VERSION); - - xchat_hook_command (ph, "load", XCHAT_PRI_NORM, perl_command_load, 0, 0); - xchat_hook_command (ph, "unload", XCHAT_PRI_NORM, perl_command_unload, 0, diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c --- xchat-wdk.orig/plugins/python/python.c 2010-05-16 06:31:54 +0200 +++ xchat-wdk/plugins/python/python.c 2010-08-26 15:53:53 +0200