Hello community, here is the log from the commit of package perl-Tk for openSUSE:Factory checked in at Wed Apr 21 01:56:33 CEST 2010. -------- --- perl-Tk/perl-Tk.changes 2010-04-08 23:28:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Tk/perl-Tk.changes 2010-04-20 17:26:01.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 17:16:06 CEST 2010 - anicka@suse.cz + +- port utf fix for perl 5.12 from development version + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- Tk-804.028-perl5.12.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Tk.spec ++++++ --- /var/tmp/diff_new_pack.tVvSHR/_old 2010-04-21 01:56:28.000000000 +0200 +++ /var/tmp/diff_new_pack.tVvSHR/_new 2010-04-21 01:56:28.000000000 +0200 @@ -19,17 +19,16 @@ Name: perl-Tk -BuildRequires: libpng-devel xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-devel xorg-x11-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-scalable +BuildRequires: libpng-devel xkeyboard-config xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-devel xorg-x11-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-scalable %ifnarch s390 s390x BuildRequires: xorg-x11-server %endif License: Artistic ; Public Domain, Freeware Group: Development/Libraries/Perl Requires: perl = %{perl_version} -Provides: perl_tk -Obsoletes: perl_tk +AutoReqProv: on Version: 804.028 -Release: 54 +Release: 55 Summary: Perl Tk Url: http://cpan.org/modules/by-module/Tk/ Source: Tk-%{version}.tar.bz2 @@ -39,6 +38,7 @@ Patch3: Tk-%{version}-refcnt.diff Patch4: Tk-%{version}-CVE-2006-4484.diff Patch5: Tk-%{version}-event.diff +Patch6: Tk-%{version}-perl5.12.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,6 +79,7 @@ %patch3 %patch4 %patch5 +%patch6 -p1 %build find -name "*.orig" -exec rm {} \; @@ -109,8 +110,6 @@ mv t/browseentry2.t t/browseentry2.tt mv t/entry.t t/entry.tt mv t/listbox.t t/listbox.tt -#temporarily disable failing test -mv t/unicode.t t/unicode.tt perl Makefile.PL XFT=1 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -Wall -fpic" ++++++ Tk-804.028-lib64.diff ++++++ --- /var/tmp/diff_new_pack.tVvSHR/_old 2010-04-21 01:56:28.000000000 +0200 +++ /var/tmp/diff_new_pack.tVvSHR/_new 2010-04-21 01:56:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- myConfig +Index: myConfig +=================================================================== +--- myConfig.orig +++ myConfig -@@ -250,9 +250,9 @@ +@@ -299,9 +299,9 @@ if ($win_arch eq 'x') { } if (!defined($xlib) && defined($X11)) { @@ -12,7 +14,7 @@ # Special case for sun-machines unless (defined $xlib) -@@ -274,7 +274,7 @@ +@@ -331,7 +331,7 @@ if ($win_arch eq 'x') { # unless (defined $xlib) { ++++++ Tk-804.028-perl5.12.diff ++++++ Index: Tk-804.028/Event/pTkCallback.c =================================================================== --- Tk-804.028.orig/Event/pTkCallback.c +++ Tk-804.028/Event/pTkCallback.c @@ -315,7 +315,6 @@ SV *b; case SVt_PVGV: case SVt_PVCV: return 0; - case SVt_RV: case SVt_IV: case SVt_NV: case SVt_PV: Index: Tk-804.028/encGlue.c =================================================================== --- Tk-804.028.orig/encGlue.c +++ Tk-804.028/encGlue.c @@ -49,7 +49,7 @@ Tcl_UniChar Tcl_UniCharToUpper(int ch) { dTHX; - U8 tmpbuf[UTF8_MAXLEN_UCLC+1]; + U8 tmpbuf[UTF8_MAXBYTES_CASE+1]; STRLEN len; return Perl_to_uni_upper(aTHX_ ch, tmpbuf, &len); } @@ -58,7 +58,7 @@ Tcl_UniChar Tcl_UniCharToLower(int ch) { dTHX; - U8 tmpbuf[UTF8_MAXLEN_UCLC+1]; + U8 tmpbuf[UTF8_MAXBYTES_CASE+1]; STRLEN len; return Perl_to_uni_lower(aTHX_ ch, tmpbuf, &len); } @@ -183,7 +183,7 @@ Tcl_UniCharToUtfDString(wString, numChar */ oldLength = Tcl_DStringLength(dsPtr); - Tcl_DStringSetLength(dsPtr, (oldLength + numChars + 1) * UTF8_MAXLEN_UCLC); + Tcl_DStringSetLength(dsPtr, (oldLength + numChars + 1) * UTF8_MAXBYTES_CASE); string = Tcl_DStringValue(dsPtr) + oldLength; p = string; Index: Tk-804.028/tkGlue.c =================================================================== --- Tk-804.028.orig/tkGlue.c +++ Tk-804.028/tkGlue.c @@ -5225,7 +5225,7 @@ struct WrappedRegExp #else U32 flags; #endif - regexp *pat; + REGEXP *pat; SV *source; }; @@ -5318,12 +5318,12 @@ Tcl_GetRegExpFromObj(Tcl_Interp *interp, re->op.op_pmflags |= PMf_FOLD; } #else - re->flags = RXf_UTF8 | (flags & TCL_REG_NOCASE ? RXf_PMf_FOLD : 0); + re->flags = (flags & TCL_REG_NOCASE ? RXf_PMf_FOLD : 0); #endif if (mg) { - re->pat = (regexp *)mg->mg_obj; + re->pat = (REGEXP *)mg->mg_obj; /* Guess wildly ... */ ReREFCNT_inc(re->pat); } @@ -5388,7 +5388,8 @@ int index; CONST84 char **startPtr; CONST84 char **endPtr; { - regexp *re = wrap->pat; + REGEXP *rx = wrap->pat; + regexp *const re = (struct regexp *)SvANY(rx); #if USE_NEWSTYLE_REGEXP_STRUCT if (re->offs[index].start != -1 && re->offs[index].end != -1) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org