[arch-commits] Commit in perl-tk/repos (8 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Sun May 19 21:33:54 UTC 2013
Date: Sunday, May 19, 2013 @ 23:33:54
Author: foutrelis
Revision: 185938
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
perl-tk/repos/staging-i686/
perl-tk/repos/staging-i686/0001-Fix-compilation-under-threaded-bleadperl.patch
(from rev 185937, perl-tk/trunk/0001-Fix-compilation-under-threaded-bleadperl.patch)
perl-tk/repos/staging-i686/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch
(from rev 185937, perl-tk/trunk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
perl-tk/repos/staging-i686/PKGBUILD
(from rev 185937, perl-tk/trunk/PKGBUILD)
perl-tk/repos/staging-x86_64/
perl-tk/repos/staging-x86_64/0001-Fix-compilation-under-threaded-bleadperl.patch
(from rev 185937, perl-tk/trunk/0001-Fix-compilation-under-threaded-bleadperl.patch)
perl-tk/repos/staging-x86_64/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch
(from rev 185937, perl-tk/trunk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
perl-tk/repos/staging-x86_64/PKGBUILD
(from rev 185937, perl-tk/trunk/PKGBUILD)
--------------------------------------------------------------------------------+
staging-i686/0001-Fix-compilation-under-threaded-bleadperl.patch | 32 +++++
staging-i686/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch | 47 ++++++++
staging-i686/PKGBUILD | 56 ++++++++++
staging-x86_64/0001-Fix-compilation-under-threaded-bleadperl.patch | 32 +++++
staging-x86_64/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch | 47 ++++++++
staging-x86_64/PKGBUILD | 56 ++++++++++
6 files changed, 270 insertions(+)
Copied: perl-tk/repos/staging-i686/0001-Fix-compilation-under-threaded-bleadperl.patch (from rev 185937, perl-tk/trunk/0001-Fix-compilation-under-threaded-bleadperl.patch)
===================================================================
--- staging-i686/0001-Fix-compilation-under-threaded-bleadperl.patch (rev 0)
+++ staging-i686/0001-Fix-compilation-under-threaded-bleadperl.patch 2013-05-19 21:33:54 UTC (rev 185938)
@@ -0,0 +1,32 @@
+From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos via RT <bug-Tk at rt.cpan.org>
+Date: Mon, 6 Aug 2012 17:42:14 -0400
+Subject: [PATCH] Fix compilation under threaded bleadperl
+
+ Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 >
+
+CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.)
+---
+ tkGlue.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/tkGlue.c b/tkGlue.c
+index 1b7c025..9079302 100644
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -4154,11 +4154,7 @@ int type;
+ SV *x = NULL;
+ int prefix = '?';
+ name = SvPV(sv,na);
+-#ifdef USE_ITHREADS
+- CopSTASHPV(PL_curcop) = NULL;
+-#else
+- CopSTASH(PL_curcop) = NULL;
+-#endif
++ CopSTASH_set(PL_curcop, NULL);
+ switch (type)
+ {
+ case TK_CONFIG_SCALARVAR:
+--
+1.8.2.3
+
Copied: perl-tk/repos/staging-i686/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch (from rev 185937, perl-tk/trunk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
===================================================================
--- staging-i686/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch (rev 0)
+++ staging-i686/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch 2013-05-19 21:33:54 UTC (rev 185938)
@@ -0,0 +1,47 @@
+From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <slaven at rezic.de>
+Date: Sat, 23 Mar 2013 14:00:58 +0100
+Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an
+ expression
+
+---
+ IO/IO.xs | 6 +-----
+ tkGlue.c | 5 +----
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/IO/IO.xs b/IO/IO.xs
+index 8ae2a57..42f7515 100644
+--- a/IO/IO.xs
++++ b/IO/IO.xs
+@@ -207,11 +207,7 @@ int offset
+ info.count = 0;
+ info.error = 0;
+ info.eof = 0;
+- if (!SvUPGRADE(buf, SVt_PV))
+- {
+- RETVAL = &PL_sv_undef;
+- return;
+- }
++ (void)SvUPGRADE(buf, SVt_PV);
+ SvPOK_only(buf); /* validate pointer */
+ Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info);
+ do
+diff --git a/tkGlue.c b/tkGlue.c
+index dd3d283..cdc53ad 100644
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -3830,10 +3830,7 @@ ClientData clientData;
+ return EXPIRE((interp, "Cannot trace readonly variable"));
+ }
+ }
+- if (!SvUPGRADE(sv, SVt_PVMG))
+- {
+- return EXPIRE((interp, "Trace SvUPGRADE failed"));
+- }
++ (void)SvUPGRADE(sv, SVt_PVMG);
+
+ if (SvTYPE(sv) == SVt_PVAV)
+ {
+--
+1.8.2.3
+
Copied: perl-tk/repos/staging-i686/PKGBUILD (from rev 185937, perl-tk/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-05-19 21:33:54 UTC (rev 185938)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer:
+# Contributor: François Charette <francois ατ archlinux δοτ org>
+# Contributor: Jason Chu <jchu at xentac.net>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=perl-tk
+_cpanname=Tk
+pkgver=804.030
+pkgrel=5
+pkgdesc="A graphical user interface toolkit for Perl"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/${_cpanname}"
+license=('PerlArtistic' 'GPL' 'custom')
+depends=('libpng' 'libjpeg' 'tk' 'perl')
+options=('!emptydirs')
+replaces=('perltk')
+provides=('perltk')
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz
+ 0001-Fix-compilation-under-threaded-bleadperl.patch
+ 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
+md5sums=('13275e85f99ee467a86d9598a437abff'
+ '361c34978746310e5c31b7a47c016b22'
+ '46448cdac9d7159f15f2d4b2719d171b')
+
+prepare() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+
+ # https://rt.cpan.org/Public/Bug/Display.html?id=78824
+ patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch"
+
+ # https://rt.cpan.org/Public/Bug/Display.html?id=82677
+ patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch"
+}
+
+build() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+#check() {
+# cd "$srcdir/${_cpanname}-$pkgver"
+# make test
+#}
+
+package() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+ make install DESTDIR="$pkgdir"
+
+ # license
+ install -D -m644 pTk/license.terms \
+ "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
+ install -D -m644 pTk/Tix.license \
+ "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
+}
Copied: perl-tk/repos/staging-x86_64/0001-Fix-compilation-under-threaded-bleadperl.patch (from rev 185937, perl-tk/trunk/0001-Fix-compilation-under-threaded-bleadperl.patch)
===================================================================
--- staging-x86_64/0001-Fix-compilation-under-threaded-bleadperl.patch (rev 0)
+++ staging-x86_64/0001-Fix-compilation-under-threaded-bleadperl.patch 2013-05-19 21:33:54 UTC (rev 185938)
@@ -0,0 +1,32 @@
+From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos via RT <bug-Tk at rt.cpan.org>
+Date: Mon, 6 Aug 2012 17:42:14 -0400
+Subject: [PATCH] Fix compilation under threaded bleadperl
+
+ Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 >
+
+CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.)
+---
+ tkGlue.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/tkGlue.c b/tkGlue.c
+index 1b7c025..9079302 100644
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -4154,11 +4154,7 @@ int type;
+ SV *x = NULL;
+ int prefix = '?';
+ name = SvPV(sv,na);
+-#ifdef USE_ITHREADS
+- CopSTASHPV(PL_curcop) = NULL;
+-#else
+- CopSTASH(PL_curcop) = NULL;
+-#endif
++ CopSTASH_set(PL_curcop, NULL);
+ switch (type)
+ {
+ case TK_CONFIG_SCALARVAR:
+--
+1.8.2.3
+
Copied: perl-tk/repos/staging-x86_64/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch (from rev 185937, perl-tk/trunk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
===================================================================
--- staging-x86_64/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch (rev 0)
+++ staging-x86_64/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch 2013-05-19 21:33:54 UTC (rev 185938)
@@ -0,0 +1,47 @@
+From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <slaven at rezic.de>
+Date: Sat, 23 Mar 2013 14:00:58 +0100
+Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an
+ expression
+
+---
+ IO/IO.xs | 6 +-----
+ tkGlue.c | 5 +----
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/IO/IO.xs b/IO/IO.xs
+index 8ae2a57..42f7515 100644
+--- a/IO/IO.xs
++++ b/IO/IO.xs
+@@ -207,11 +207,7 @@ int offset
+ info.count = 0;
+ info.error = 0;
+ info.eof = 0;
+- if (!SvUPGRADE(buf, SVt_PV))
+- {
+- RETVAL = &PL_sv_undef;
+- return;
+- }
++ (void)SvUPGRADE(buf, SVt_PV);
+ SvPOK_only(buf); /* validate pointer */
+ Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info);
+ do
+diff --git a/tkGlue.c b/tkGlue.c
+index dd3d283..cdc53ad 100644
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -3830,10 +3830,7 @@ ClientData clientData;
+ return EXPIRE((interp, "Cannot trace readonly variable"));
+ }
+ }
+- if (!SvUPGRADE(sv, SVt_PVMG))
+- {
+- return EXPIRE((interp, "Trace SvUPGRADE failed"));
+- }
++ (void)SvUPGRADE(sv, SVt_PVMG);
+
+ if (SvTYPE(sv) == SVt_PVAV)
+ {
+--
+1.8.2.3
+
Copied: perl-tk/repos/staging-x86_64/PKGBUILD (from rev 185937, perl-tk/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-05-19 21:33:54 UTC (rev 185938)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer:
+# Contributor: François Charette <francois ατ archlinux δοτ org>
+# Contributor: Jason Chu <jchu at xentac.net>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=perl-tk
+_cpanname=Tk
+pkgver=804.030
+pkgrel=5
+pkgdesc="A graphical user interface toolkit for Perl"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/${_cpanname}"
+license=('PerlArtistic' 'GPL' 'custom')
+depends=('libpng' 'libjpeg' 'tk' 'perl')
+options=('!emptydirs')
+replaces=('perltk')
+provides=('perltk')
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz
+ 0001-Fix-compilation-under-threaded-bleadperl.patch
+ 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
+md5sums=('13275e85f99ee467a86d9598a437abff'
+ '361c34978746310e5c31b7a47c016b22'
+ '46448cdac9d7159f15f2d4b2719d171b')
+
+prepare() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+
+ # https://rt.cpan.org/Public/Bug/Display.html?id=78824
+ patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch"
+
+ # https://rt.cpan.org/Public/Bug/Display.html?id=82677
+ patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch"
+}
+
+build() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+#check() {
+# cd "$srcdir/${_cpanname}-$pkgver"
+# make test
+#}
+
+package() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+ make install DESTDIR="$pkgdir"
+
+ # license
+ install -D -m644 pTk/license.terms \
+ "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
+ install -D -m644 pTk/Tix.license \
+ "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
+}
More information about the arch-commits
mailing list