[libcdk-perl] 02/03: Fix XS syntax, enforced by newer versions of ExtUtils::ParseXS. (Closes: #719578)

[Niko Tyni]

This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libcdk-perl.

commit cfd76198318853fbbbca2cf5fea7dae96af03063
Author: Niko Tyni <ntyni at debian.org>
Date:   Thu Aug 15 22:27:27 2013 +0300

    Fix XS syntax, enforced by newer versions of ExtUtils::ParseXS. (Closes: #719578)
---
 debian/changelog                                   |    3 +-
 ...ax-enforced-by-newer-versions-of-ExtUtils.patch |   64 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1ace645..3f300f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcdk-perl (20130717-2) UNRELEASED; urgency=low
 
-  * 
+  * Fix XS syntax, enforced by newer versions of ExtUtils::ParseXS.
+    (Closes: #719578)
 
  -- Niko Tyni <ntyni at debian.org>  Thu, 15 Aug 2013 22:13:20 +0300
 
diff --git a/debian/patches/0001-Fix-XS-syntax-enforced-by-newer-versions-of-ExtUtils.patch b/debian/patches/0001-Fix-XS-syntax-enforced-by-newer-versions-of-ExtUtils.patch
new file mode 100644
index 0000000..a2da4b2
--- /dev/null
+++ b/debian/patches/0001-Fix-XS-syntax-enforced-by-newer-versions-of-ExtUtils.patch
@@ -0,0 +1,64 @@
+From e0700c1621e41806fc59a0257de51ce0359a51f4 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Tue, 13 Aug 2013 18:12:57 +0000
+Subject: [PATCH] Fix XS syntax, enforced by newer versions of
+ ExtUtils::ParseXS
+
+This fixes errors like
+
+Cdk.c: In function 'XS_Cdk__Entry_New':
+  Cdk.c:5576:2: error: too few arguments to function 'sv2dtype'
+    int int_disptype = sv2dtype (/* not a parameter */);
+    ^
+  Cdk.xs:666:1: note: declared here
+   sv2dtype(SV * sv)
+   ^
+---
+ Cdk.xs | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Cdk.xs b/Cdk.xs
+index 890017a..1165221 100644
+--- a/Cdk.xs
++++ b/Cdk.xs
+@@ -2561,8 +2561,7 @@ New(title,label,min,max,fieldWidth,filler=".",disptype=vMIXED,xPos=CENTER,yPos=C
+ 	int		max
+ 	int		fieldWidth
+ 	chtype		filler = sv2chtype ($arg);
+-	int		int_disptype = sv2dtype ($arg);
+-	EDisplayType	disptype = (EDisplayType) int_disptype;
++	int		disptype = sv2dtype ($arg);
+ 	int		xPos = sv2int ($arg);
+ 	int		yPos = sv2int ($arg);
+ 	chtype		fieldattr = sv2chtype ($arg);
+@@ -2580,7 +2579,7 @@ New(title,label,min,max,fieldWidth,filler=".",disptype=vMIXED,xPos=CENTER,yPos=C
+ 
+ 	   entryWidget = newCDKEntry (GCDKSCREEN,xPos,yPos,
+ 					Title,label,
+-					fieldattr,filler,disptype,
++					fieldattr,filler,(EDisplayType) disptype,
+ 					fieldWidth,min,max,
+ 					Box,shadow);
+ 	   free (Title);
+@@ -2894,8 +2893,7 @@ New(title,label,min,physical,logical,fieldWidth,disptype=vMIXED,filler=".",xPos=
+ 	int		physical
+ 	int		logical
+ 	int		fieldWidth
+-	int		int_disptype = sv2dtype ($arg);
+-	EDisplayType	disptype = (EDisplayType) int_disptype;
++	int		disptype = sv2dtype ($arg);
+ 	chtype		filler = sv2chtype ($arg);
+ 	int		xPos = sv2int ($arg);
+ 	int		yPos = sv2int ($arg);
+@@ -2915,7 +2913,7 @@ New(title,label,min,physical,logical,fieldWidth,disptype=vMIXED,filler=".",xPos=
+ 	   mentryWidget = newCDKMentry (GCDKSCREEN,xPos,yPos,
+ 					Title,label,
+ 					fieldattr,filler,
+-					disptype,fieldWidth,
++					(EDisplayType) disptype,fieldWidth,
+ 					physical,logical,min,
+ 					Box,shadow);
+ 	   free (Title);
+-- 
+1.8.4.rc2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..03be8cc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-XS-syntax-enforced-by-newer-versions-of-ExtUtils.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcdk-perl.git