rpms/perl-Tk/devel perl-Tk-seg.patch, 1.1, 1.2 perl-Tk.spec, 1.14, 1.15

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Mar 12 03:53:12 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/perl-Tk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22738

Modified Files:
	perl-Tk-seg.patch perl-Tk.spec 
Log Message:
rework Tk-seg patch

perl-Tk-seg.patch:

Index: perl-Tk-seg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk/devel/perl-Tk-seg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Tk-seg.patch	4 Jan 2008 23:24:38 -0000	1.1
+++ perl-Tk-seg.patch	12 Mar 2008 03:53:03 -0000	1.2
@@ -1,14 +1,13 @@
---- pTk/mTk/generic/tkConfig.c.orig	2008-01-04 18:50:58.000000000 +0100
-+++ pTk/mTk/generic/tkConfig.c	2008-01-05 00:15:15.000000000 +0100
-@@ -1210,11 +1210,12 @@
+diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c
+--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg	2008-03-11 23:29:39.000000000 -0400
++++ Tk-804.028/pTk/mTk/generic/tkConfig.c	2008-03-11 23:28:09.000000000 -0400
+@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt
       * First, check to see if the object already has the answer cached.
       */
  
 -    if (objPtr->typePtr == &tkOptionObjType) {
--        if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
 +/*    if (objPtr->typePtr == &tkOptionObjType) {
-+        if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr
-+	  && objPtr->internalRep.twoPtrValue.ptr2 != NULL) {
+         if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
              return (Option *) objPtr->internalRep.twoPtrValue.ptr2;
          }
 -    }
@@ -16,7 +15,7 @@
  
      /*
       * The answer isn't cached.
-@@ -2277,9 +2278,19 @@
+@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt
      if (optionPtr == NULL) {
  	return NULL;
      }
@@ -25,10 +24,6 @@
 +	return NULL;
 +    }
 +
-+    if (!optionPtr->specPtr->type) {
-+	return NULL;
-+    }
-+
      if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) {
  	optionPtr = optionPtr->extra.synonymPtr;
      }
@@ -36,13 +31,3 @@
      if (optionPtr->specPtr->objOffset >= 0) {
  	resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset));
  	if (resultPtr == NULL) {
---- pTk/mTk/generic/tkFrame.c.orig	2008-01-04 22:52:12.000000000 +0100
-+++ pTk/mTk/generic/tkFrame.c	2008-01-04 23:51:20.000000000 +0100
-@@ -769,6 +769,7 @@
- 	    result = TCL_ERROR;
- 	    goto done;
- 	}
-+
- 	objPtr = Tk_GetOptionValue(interp, (char *) framePtr,
- 		framePtr->optionTable, objv[2], framePtr->tkwin);
- 	if (objPtr == NULL) {


Index: perl-Tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk/devel/perl-Tk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Tk.spec	6 Feb 2008 02:37:56 -0000	1.14
+++ perl-Tk.spec	12 Mar 2008 03:53:03 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           perl-Tk
 Version:        804.028
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl Graphical User Interface ToolKit
 
 Group:          Development/Libraries
@@ -56,7 +56,7 @@
 # debian patch
 %patch1 -p1
 # patch to fix #235666 ... seems like caching code is broken
-%patch2
+%patch2 -p1 -b .seg
 %patch100
 
 %build
@@ -65,8 +65,8 @@
 make %{?_smp_mflags}
 
 # disable because they need an x screen
-#%check
-#make test
+%check
+# make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +102,9 @@
 %exclude %{perl_vendorarch}/Tk/reindex.pl
 
 %changelog
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 804.028-5
+- rework patch2 to fix menu and test case failures (bz 431330, upstream 33880)
+
 * Tue Feb 05 2008 Tom "spot" Callaway <tcallawa at redhat.com>
 - 804.028-4
 - rebuild for new perl




More information about the fedora-extras-commits mailing list