pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Updating lesstif to 0.95.2 (2009).

Some patches can be removed.
I updated it because the scroll wheel was going the oposite direction in ddd.
https://bugs.launchpad.net/ubuntu/+source/ddd/+bug/37664

(cherry picked from commit 0115853aa97ec5d6acbdb48fd2f0db0df43258c1)

Lluís Batlle i Rossell b3609557 c1e962f1

+2 -104
-13
pkgs/development/libraries/lesstif/c-bad_integer_cast.patch
··· 1 - --- lesstif2-0.94.4.orig/include/Motif-2.1/XmI/XpmI.h 2 - +++ lesstif2-0.94.4/include/Motif-2.1/XmI/XpmI.h 3 - @@ -217,8 +217,8 @@ 4 - FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s)); 5 - FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data)); 6 - 7 - -#define HashAtomData(i) ((void *)i) 8 - -#define HashColorIndex(slot) ((unsigned int)((*slot)->data)) 9 - +#define HashAtomData(i) ((void *)(uintptr_t)i) 10 - +#define HashColorIndex(slot) ((uintptr_t)((*slot)->data)) 11 - #define USE_HASHTABLE (cpp > 2 && ncolors > 4) 12 - 13 - /* I/O utility */
-23
pkgs/development/libraries/lesstif/c-linkage.patch
··· 1 - --- a/include/Motif-2.1/Xm/VendorSP.h 2006-07-07 15:58:04.000000000 +0200 2 - +++ b/include/Motif-2.1/Xm/VendorSP.h 2006-07-07 15:58:19.000000000 +0200 3 - @@ -30,10 +30,6 @@ 4 - #include <Xm/VendorS.h> 5 - #include <X11/ShellP.h> 6 - 7 - -#ifdef __cplusplus 8 - -extern "C" { 9 - -#endif 10 - - 11 - XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources, 12 - Cardinal numResources, 13 - WidgetClass filterClass, 14 - @@ -57,9 +53,4 @@ 15 - 16 - XMLIBEXPORT extern VendorShellClassRec vendorShellClassRec; 17 - 18 - - 19 - -#ifdef __cplusplus 20 - -} 21 - -#endif 22 - - 23 - #endif /* _XM_VENDORSP_H */
-38
pkgs/development/libraries/lesstif/c-unsigned_int.patch
··· 1 - --- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmcreate.c 2 - +++ lesstif2-0.94.4/lib/Xm-2.1/Xpmcreate.c 3 - @@ -1265,10 +1265,10 @@ 4 - register char *src; 5 - register char *dst; 6 - register unsigned int *iptr; 7 - - register unsigned int x, y, i; 8 - + register unsigned int x, y; 9 - register char *data; 10 - Pixel pixel, px; 11 - - int nbytes, depth, ibu, ibpp; 12 - + int nbytes, depth, ibu, ibpp, i; 13 - 14 - data = image->data; 15 - iptr = pixelindex; 16 - --- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmscan.c 17 - +++ lesstif2-0.94.4/lib/Xm-2.1/Xpmscan.c 18 - @@ -672,8 +672,8 @@ 19 - char *dst; 20 - unsigned int *iptr; 21 - char *data; 22 - - unsigned int x, y, i; 23 - - int bits, depth, ibu, ibpp, offset; 24 - + unsigned int x, y; 25 - + int bits, depth, ibu, ibpp, offset, i; 26 - unsigned long lbt; 27 - Pixel pixel, px; 28 - 29 - @@ -684,6 +684,9 @@ 30 - ibpp = image->bits_per_pixel; 31 - offset = image->xoffset; 32 - 33 - + if (image->bitmap_unit < 0) 34 - + return (XpmNoMemory); 35 - + 36 - if ((image->bits_per_pixel | image->depth) == 1) { 37 - ibu = image->bitmap_unit; 38 - for (y = 0; y < height; y++)
-24
pkgs/development/libraries/lesstif/c-xim_chained_list_crash.patch
··· 1 - diff -ru lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c lesstif2-0.94.4/lib/Xm-2.1/XmIm.c 2 - --- lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c 2004-10-20 21:32:11.000000000 +0200 3 - +++ lesstif2-0.94.4/lib/Xm-2.1/XmIm.c 2007-03-28 14:39:27.000000000 +0200 4 - @@ -133,7 +133,10 @@ 5 - p->next = q->next; 6 - } 7 - 8 - - XtFree((char *)stuff); 9 - + /* if count!=0 then someone uses the stuff as orig_xim 10 - + so unlink it but not free it */ 11 - + if (!stuff->count) 12 - + XtFree((char *)stuff); 13 - } 14 - 15 - /* 16 - @@ -1060,6 +1063,8 @@ 17 - XCloseIM(stuff->xim); 18 - DEBUGOUT(_LtDebug(__FILE__, w, "XCloseIM(%p)\n", stuff->xim)); 19 - stuff->orig_xim->xim = NULL; 20 - + /* stuff->orig_xim is now useless */ 21 - + XtFree(stuff->orig_xim); 22 - } else { 23 - DEBUGOUT(_LtDebug(__FILE__, w, "XmImCloseXIM(%p), count -> %d\n", 24 - stuff->xim, stuff->orig_xim->count));
+2 -6
pkgs/development/libraries/lesstif/default.nix
··· 3 3 stdenv.mkDerivation { 4 4 name = "lesstif-0.95.0-p2"; 5 5 src = fetchurl { 6 - url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2; 7 - md5 = "ab895165c149d7f95843c7584b1c7ad4"; 6 + url = mirror://sourceforge/lesstif/lesstif-0.95.2.tar.bz2; 7 + sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; 8 8 }; 9 9 buildInputs = [xlibsWrapper]; 10 10 propagatedBuildInputs = [libXp libXau]; ··· 15 15 # in Debian, so we assume they have been sent upstream. 16 16 # 17 17 patches = [ 18 - ./c-bad_integer_cast.patch 19 - ./c-linkage.patch 20 - ./c-unsigned_int.patch 21 18 ./c-missing_xm_h.patch 22 - ./c-xim_chained_list_crash.patch 23 19 ./c-render_table_crash.patch 24 20 ./c-xpmpipethrough.patch 25 21 ];