/pidgin/main: 21b6ce1aae13: win32: tidy up perl package, fix war...

[Tomasz Wasilczyk]

Changeset: 21b6ce1aae13900211a609e773af97debb6cb179
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-04-10 23:23 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/21b6ce1aae13

Description:

win32: tidy up perl package, fix warnings

diffstat:

 libpurple/plugins/perl/Makefile.mingw        |  4 ++--
 libpurple/plugins/perl/common/Makefile.mingw |  5 +++--
 libpurple/plugins/perl/common/Request.xs     |  2 +-
 libpurple/win32/global.mak                   |  2 +-
 pidgin/plugins/perl/common/Makefile.mingw    |  5 +++--
 pidgin/win32/prepare-workspace.sh            |  2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diffs (85 lines):

diff --git a/libpurple/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw
--- a/libpurple/plugins/perl/Makefile.mingw
+++ b/libpurple/plugins/perl/Makefile.mingw
@@ -24,11 +24,11 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(PERL_LIB_TOP)/CORE
+			-I$(PERL_LIB_TOP)/include
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
-			-L$(PERL_LIB_TOP)
+			-L$(PERL_LIB_TOP)/lib
 
 ##
 ##  SOURCES, OBJECTS
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -25,9 +25,10 @@ INCLUDE_PATHS +=		-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(PERL_LIB_TOP)/CORE
+			-I$(PERL_LIB_TOP)/include
 
-LIB_PATHS += 		-L$(PERL_LIB_TOP) \
+LIB_PATHS += \
+			-L$(PERL_LIB_TOP)/lib \
 			-L$(PERL_PLUGIN_TOP) \
 			-L$(PURPLE_TOP) \
 			-L$(GTK_TOP)/lib
diff --git a/libpurple/plugins/perl/common/Request.xs b/libpurple/plugins/perl/common/Request.xs
--- a/libpurple/plugins/perl/common/Request.xs
+++ b/libpurple/plugins/perl/common/Request.xs
@@ -631,7 +631,7 @@ void
 purple_request_fields_get_required(fields)
 	Purple::Request::Fields fields
 PREINIT:
-	GList *l;
+	const GList *l;
 PPCODE:
 	for (l = purple_request_fields_get_required(fields); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Request::Field")));
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -19,7 +19,7 @@ JSON_GLIB_TOP ?= $(WIN32_DEV_TOP)/json-g
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.13
-PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
+PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10
 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.5
 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
diff --git a/pidgin/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
@@ -33,9 +33,10 @@ INCLUDE_PATHS =		-I. \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(LIBSOUP_TOP)/include/libsoup-2.4 \
 			-I$(WEBKITGTK_TOP)/include/webkitgtk-1.0 \
-			-I$(PERL_LIB_TOP)/CORE
+			-I$(PERL_LIB_TOP)/include
 
-LIB_PATHS += 		-L$(PERL_LIB_TOP) \
+LIB_PATHS += \
+			-L$(PERL_LIB_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP) \
 			-L$(PURPLE_PERL_TOP) \
diff --git a/pidgin/win32/prepare-workspace.sh b/pidgin/win32/prepare-workspace.sh
--- a/pidgin/win32/prepare-workspace.sh
+++ b/pidgin/win32/prepare-workspace.sh
@@ -86,7 +86,7 @@ ARCHIVES+="ARC_INT "
 ARC_MWH="${DOWNLOAD_HOST}mingw32-meanwhile-devel-1.0.2-2.6.noarch.rpm;meanwhile;1.0.2-2.6;1a1ceda731486c28aca0b866e4746992bc7ba121;${OBS_SKIP};meanwhile-1.0"
 ARCHIVES+="ARC_MWH "
 
-ARC_PRL="${DOWNLOAD_HOST}perl_5-10-0.tar.gz;Perl;5.10.0;863b2f879698a5407a3edb73a310bdfc9dea8f12;perl-5.10.0;perl-5.10.0"
+ARC_PRL="${DOWNLOAD_HOST}perl-5.10.0.tar.gz;Perl;5.10.0;f7cb9e70260962fac8e186bfa9a108da3acd4621;perl-5.10.0;perl-5.10"
 ARCHIVES+="ARC_PRL "
 
 ARC_SIL="${DOWNLOAD_HOST}silc-toolkit-1.1.10.tar.gz;SILC Toolkit;1.1.10;42f835ed28d9567acde8bd3e553c8a5c94b799c5;silc-toolkit-1.1.10;silc-toolkit-1.1.10"