pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/42421: sysutils/py-gnome-menus bogus patch after recent update to 2.28.0.1 (+FIX)



        Note: There was a bad value `sw-bug | doc-bug | change-request | 
support ] (one line)>' for the field `Class'.
        It was set to the default value of `sw-bug'.

>Number:         42421
>Category:       pkg
>Synopsis:       sysutils/py-gnome-menus bogus patch after recent update to 
>2.28.0.1 (+FIX)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 07 13:00:00 +0000 2009
>Originator:     Robert Elz
>Release:        NetBSD 4.0   (pkgsrc current 2009-12-07)
>Organization:
        Prince of Songkla University
>Environment:
System: NetBSD jade.coe.psu.ac.th 4.0_STABLE NetBSD 4.0_STABLE 
(JADE-1.696-20080517) #9: Fri May 23 18:55:13 ICT 2008 
kre%jade.coe.psu.ac.th@localhost:/usr/obj/4/kernels/JADE i386
Architecture: i386
Machine: i386
>Description:
        The recent update of sysutils/py-gnome-menus (which I think
        went as a side effect of a similar update to a similar
        update of sysutils/gnome-menus) has grown a broken patch
        file.   It appears as if the diff that created the patch was
        from a file with th epatch already applied against a file
        with the patch applied twice.

>How-To-Repeat:
        Attempt to "make patch" in sysutils/py-gnome-menus

        Expect to see ...

===> Overriding tools for py25-gnome-menus-2.28.0.1
===> Extracting for py25-gnome-menus-2.28.0.1
===> Patching for py25-gnome-menus-2.28.0.1
=> Applying pkgsrc patches for py25-gnome-menus-2.28.0.1
1 out of 2 hunks failed--saving rejects to configure.rej
Patch /usr/pkgsrc/sysutils/py-gnome-menus/patches/patch-ab failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/sysutils/py-gnome-menus/patches/patch-ab
*** Error code 1

Stop.

        or by inspection of sysutils/py-gnome-menus/patches/patch-ab
        (the problem sticks out like a sore thumb, when you're looking
        for it...)

>Fix:

        Apply the following patch (which updates the patch file,
        and makes the corresponding update to the distinfo file)

Index: distinfo
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/sysutils/py-gnome-menus/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo    6 Dec 2009 22:45:50 -0000       1.9
+++ distinfo    7 Dec 2009 12:51:22 -0000
@@ -4,4 +4,4 @@
 RMD160 (gnome-menus-2.28.0.1.tar.bz2) = 
9d74e64375c4c14c347dbbbe010035ccb3a7b5b0
 Size (gnome-menus-2.28.0.1.tar.bz2) = 461356 bytes
 SHA1 (patch-aa) = 6196ca7fb0c988dd35a7d68c6efefc8bae783061
-SHA1 (patch-ab) = 9e5b33da02530689d0cd7b0c528b2d6137557e2b
+SHA1 (patch-ab) = edeab5999b5b1e0e892506df39573853e2ec444b
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/sysutils/py-gnome-menus/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- patches/patch-ab    6 Dec 2009 22:45:50 -0000       1.1
+++ patches/patch-ab    7 Dec 2009 12:51:18 -0000
@@ -11,10 +11,10 @@
    if test x`uname -s` != xDarwin; then
        PYTHON_LDFLAGS="-no-undefined"
        link_pymodules_libpython=true;
-@@ -16315,6 +16315,8 @@ do
+@@ -16313,6 +16313,8 @@ do
+   case $ac_option in
+   # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-       : Avoid regenerating within pkgsrc
-       exit 0
 +      : Avoid regenerating within pkgsrc
 +      exit 0
      ac_cs_recheck=: ;;



Home | Main Index | Thread Index | Old Index