Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xcoral for openSUSE:Factory checked in at 2021-05-06 22:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcoral (Old) and /work/SRC/openSUSE:Factory/.xcoral.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcoral" Thu May 6 22:53:04 2021 rev:23 rq:891055 version:3.50.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xcoral/xcoral.changes 2020-09-01 20:09:43.168658389 +0200 +++ /work/SRC/openSUSE:Factory/.xcoral.new.2988/xcoral.changes 2021-05-06 22:53:37.346503249 +0200 @@ -1,0 +2,8 @@ +Thu May 6 13:41:11 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to 3.50.2 + * Corrects a permission issue on the configure file + * Update of the doc + * Fix update of the chained list of color elements after a delete + +------------------------------------------------------------------- Old: ---- xcoral-3.49.8.tar.gz New: ---- xcoral-3.50.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcoral.spec ++++++ --- /var/tmp/diff_new_pack.VLm3Ny/_old 2021-05-06 22:53:37.794501402 +0200 +++ /var/tmp/diff_new_pack.VLm3Ny/_new 2021-05-06 22:53:37.798501386 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcoral # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xcoral -Version: 3.49.8 +Version: 3.50.2 Release: 0 Summary: X11 Editor with C/C++/Java Browser License: GPL-2.0-or-later ++++++ xcoral-3.49.8.tar.gz -> xcoral-3.50.2.tar.gz ++++++ Binary files old/xcoral-3.49.8/.DS_Store and new/xcoral-3.50.2/.DS_Store differ Binary files old/xcoral-3.49.8/Doc/xcoral-3.49.8.pdf and new/xcoral-3.50.2/Doc/xcoral-3.49.8.pdf differ Binary files old/xcoral-3.49.8/Doc/xcoral-3.50.2.pdf and new/xcoral-3.50.2/Doc/xcoral-3.50.2.pdf differ Binary files old/xcoral-3.49.8/Doc/xcoral-card.pdf and new/xcoral-3.50.2/Doc/xcoral-card.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/Rpm/README.rpm new/xcoral-3.50.2/Rpm/README.rpm --- old/xcoral-3.49.8/Rpm/README.rpm 2020-03-19 14:18:55.000000000 +0100 +++ new/xcoral-3.50.2/Rpm/README.rpm 2020-11-01 15:35:01.000000000 +0100 @@ -1,7 +1,7 @@ # # Pour generer les fichiers rmp et s rpm # -cp xcoral-3.XX.tar.gz /usr/src/packages/SOURCES +cp xcoral-3.XX.X.tar.gz /usr/src/packages/SOURCES rpmbuild -ba ./xc_spec # voir dans /usr/src/packages/RPMS/i386 et /usr/src/packages/SRPMS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/Rpm/xc_spec new/xcoral-3.50.2/Rpm/xc_spec --- old/xcoral-3.49.8/Rpm/xc_spec 2020-03-19 14:18:55.000000000 +0100 +++ new/xcoral-3.50.2/Rpm/xc_spec 2020-12-10 18:07:57.000000000 +0100 @@ -1,10 +1,10 @@ Summary: Yet another programmable text editor for Unix users. Name: xcoral -Version: 3.47 +Version: 3.50.2 Release: 0 License: GPL Group: Applications/Editors -Source: /home/lion/xcoral_web/xcoral-3.47/xcoral-3.47.tar.gz +Source: /home/lion/xcoral-3.50.1.tar.gz Packager: <Lionel Fournigault> [email protected] %description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/SmacLib/xcoralrc.lf new/xcoral-3.50.2/SmacLib/xcoralrc.lf --- old/xcoral-3.49.8/SmacLib/xcoralrc.lf 2020-06-15 11:19:09.000000000 +0200 +++ new/xcoral-3.50.2/SmacLib/xcoralrc.lf 2020-12-10 18:06:12.000000000 +0100 @@ -1,4 +1,4 @@ -/* 3.49.8 ############################################################### +/* 3.50.2 ############################################################### SMAC FILE USED BY XCORAL EDITOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/color_area.c new/xcoral-3.50.2/color_area.c --- old/xcoral-3.49.8/color_area.c 2020-04-01 12:51:50.000000000 +0200 +++ new/xcoral-3.50.2/color_area.c 2020-09-30 18:08:56.000000000 +0200 @@ -92,7 +92,17 @@ void InitPcmap () { int i=0; - for (i=0;i<32;i++){pcmap[i].colorname[0]='\0';pcmap[i].pixelvalue=0;} + for (i=0;i<32;i++){ + pcmap[i].colorname[0]='\0'; + pcmap[i].pixelvalue=0; +#ifdef HAVE_XFT + pcmap[i].xftcolor.color.red = 0; + pcmap[i].xftcolor.color.green = 0; + pcmap[i].xftcolor.color.blue = 0; + pcmap[i].xftcolor.color.alpha = 0; + pcmap[i].xftcolor.pixel = 0; +#endif + } } /* @@ -503,7 +513,6 @@ tmp = tmp -> next; } while (tmp != 0); (void) fprintf ( stderr, "\n"); - } #endif @@ -620,7 +629,7 @@ } else if (tmp -> pos >= pos_before){ /* La position de l'element est avant la position courante d'origine, - avant d'inserer les nbytes ou elgale a celle_ci. + avant d'inserer les nbytes ou egale a celle_ci. On incremente simplement la position de cet element */ tmp -> pos += nbytes; #ifdef DEBUG @@ -662,124 +671,115 @@ pos_before = ie_current_position (text) + nbytes; pos_after = pos_before - nbytes; - - /* On parcout la liste de elements colories en partant + + /* On parcourt la liste de ?lements colori?s en partant du dernier. On s'arrete lorsque l'element courant est stritement avant la position courante. En effet, - a partir de la, les positions des elements restent - inchanges */ + a partir de la, les positions et longueurs des elements + restent inchanges */ + + /* Les 6 cas possibles (#endif est l'element de couleur): + + pouet #endif allo 6 + xxxxxxxxx + a b + + pouet #endif allo 5 + xxxxx + a b + + pouet #endif allo 4 + xxxxx + a b + + pouet #endif allo 3 + xxxxxxxxx + a b + + pouet #endif allo 2 + xxxxxxxx + a b + + pouet #endif allo 1 + xxxxxxx + a b + */ do { - if ((tmp -> pos + tmp -> len -1) < pos_after) { -#ifdef DEBUG - (void) fprintf (stderr,"Bye [el] < pos\n"); -#endif /* DEBUG */ + if ((tmp -> pos + tmp -> len -1) < pos_after) { // 1 ok + //(void) fprintf (stderr,"Cas 1\n"); /* On se casse, la fin de l'element courant est strictement avant la position courante. */ break; } - else if ((tmp -> pos >= pos_after) + else if ((tmp -> pos < pos_after) // 2 + && ((tmp -> pos + tmp -> len -1) < pos_before)){ + + //(void) fprintf (stderr,"Cas 2\n"); + + tmp -> len = pos_after - tmp -> pos; + } + + else if ((tmp -> pos >= pos_after) // 3 ok && ((tmp -> pos + tmp -> len -1) < pos_before)) { /* On doit enlever cet element. La position courante est avant ou au debut de l'element mais la fin de l'element est strictement - avant la position d'origine (avant d'enlever les nbytes) */ -#ifdef DEBUG - (void) fprintf (stderr,"Remove [el] pos <= [el] < pos_before rm\n"); -#endif /* DEBUG */ - if (tmp -> previous) { - (tmp -> previous) -> next = (ColorElement *) tmp -> next; -#ifdef DEBUG - (void) fprintf (stderr," previous != 0\n"); -#endif /* DEBUG */ - } - else { - /* First element */ -#ifdef DEBUG - (void) fprintf (stderr," first [el]\n"); -#endif /* DEBUG */ - } - if (tmp -> next) { - (tmp -> next) -> previous = (ColorElement *) tmp -> previous; -#ifdef DEBUG - (void) fprintf (stderr," next != 0\n"); -#endif /* DEBUG */ - } - else { - /* Last element */ -#ifdef DEBUG - (void) fprintf (stderr," last [el]\n"); -#endif /* DEBUG */ - text -> last_ce = tmp -> previous; - } + avant la position d'origine (avant d'enlever les nbytes) */ + + //(void) fprintf (stderr,"Cas 3\n"); + + if (tmp -> previous) { + (tmp -> previous) -> next = (ColorElement *) tmp -> next; + } + else { + /* First element */ + } + if (tmp -> next) { + (tmp -> next) -> previous = (ColorElement *) tmp -> previous; + } + else { + /* Last element */ + text -> last_ce = tmp -> previous; + } - /* On enleve l'element et on met les liens a jour. */ -/* if (! (ce = tmp->previous)) - ce = tmp->next; - text -> current_ce = ce; */ - - ce = tmp -> previous; - if ((text -> current_ce = tmp) != 0) - text -> current_ce = tmp -> previous; - (void) free (tmp); + /* On enleve l'element et on met les liens a jour. */ + + ce = tmp -> previous; + if ((text -> current_ce = tmp) != 0) + text -> current_ce = tmp -> previous; + (void) free (tmp); - tmp = ce; - if (tmp == 0) { - break; - } - else { - continue; - } + tmp = ce; + if (tmp == 0) { + break; + } + else { + continue; + } } - else if (tmp -> pos >= pos_before) { + else if (tmp -> pos >= pos_before) { //4 ok tmp -> pos -= nbytes; - /* 3 On update seulement la position - l'element - --*******+++++++------ - p pb - */ -#ifdef DEBUG - (void) fprintf (stderr," 3 pos < [el], update pos[%d] - %d\n", - tmp->pos, nbytes); -#endif /* DEBUG */ + //(void) fprintf (stderr,"Cas 4\n"); } - else if ((tmp -> pos <= pos_after) + else if ((tmp -> pos <= pos_after) // 5 && ((tmp -> pos + tmp -> len -1) >= pos_before)){ - tmp -> len -= nbytes; - /* 4 On est dans le cas suivant - ---++++++++++---- - pppp pbpbpb - */ - if(tmp -> len == 0) { -#ifdef DEBUG - (void) fprintf (stderr, "1 brrr,,, len = 0\n" ); -#endif /* DEBUG */ - } -#ifdef DEBUG - (void) fprintf (stderr, - " 4 pos >= [el] >= pos_before update len : -nbytes\n"); -#endif /* DEBUG */ + tmp -> len -= nbytes; + //(void) fprintf (stderr,"Cas 5\n"); + + if(tmp -> len == 0) { + fprintf (stderr, "1-Warning... color element len = 0\n"); + } } - else if ((tmp -> pos > pos_after) + else if ((tmp -> pos > pos_after) // 6 ok && ((tmp -> pos + tmp -> len -1) >= pos_before)){ - /* 5 On est dans le cas suivant - -----+++++++----- - p el pb - */ -#ifdef DEBUG - (void) fprintf (stderr," 5 pos < [el] >= pos_before\n"); -#endif /* DEBUG */ - tmp -> len -= (pos_before - tmp -> pos - 1); - tmp -> pos -= (nbytes - (pos_before - tmp -> pos)); + //(void) fprintf (stderr,"Cas 6\n"); + + tmp -> len -= (pos_before - tmp -> pos /* - 1*/); + tmp -> pos -= (nbytes - (pos_before - tmp -> pos)); -#ifdef DEBUG - (void) fprintf (stderr, "pos_before = %d tmp -> pos = %d\n", - pos_before,tmp -> pos ); -#endif /* DEBUG */ - if(tmp ->len == 0) { -#ifdef DEBUG - (void) fprintf (stderr, "2 brrr,,, len = 0\n" ); -#endif /* DEBUG */ - } + if(tmp ->len == 0) { + fprintf (stderr, "2-Warning... color element len = 0\n"); + } } else { #ifdef DEBUG @@ -789,6 +789,8 @@ } tmp = tmp -> previous; } while (tmp != 0); + + //DisplayColorList(text); #ifdef DEBUG (void) fprintf (stderr,"___________\n"); DisplayColorList (text); @@ -818,14 +820,15 @@ int nce, fnext, fprevious; char *p; + if ( text -> current_ce == 0 ) return; #ifdef DEBUG - (void) fprintf (stderr,"LIGNE %d n1 = %d\n", line, text -> n1); + (void) fprintf (stderr,"LIGNE %d n=%d n1=%d\n", line, n, text -> n1 ); (void) write (1,s,n); (void) write (1,"\n",1); -#endif /* DEBUG */ +#endif if ( line == text -> n1 + 1 ) { /* @@ -1060,7 +1063,7 @@ write (1,s,nce); write(1,"\n",1); #endif /* DEBUG */ - + x += lenTextWidth ( text -> font, s, nce ); n -= nce; s += nce; @@ -1280,7 +1283,8 @@ nce = CreateColorElement ( end + 1, tmp -> pos + tmp -> len - 1, tmp -> xftcolor ); #else - nce = CreateColorElement ( end + 1, tmp -> pos + tmp -> len - 1, (unsigned long) tmp -> color ); + nce = CreateColorElement ( end + 1, tmp -> pos + tmp -> len - 1, + (unsigned long) tmp -> color ); #endif tmp -> len = start - tmp -> pos; nce -> previous = tmp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/color_area.h new/xcoral-3.50.2/color_area.h --- old/xcoral-3.49.8/color_area.h 2020-03-19 14:18:54.000000000 +0100 +++ new/xcoral-3.50.2/color_area.h 2020-09-23 12:27:16.000000000 +0200 @@ -49,7 +49,7 @@ typedef struct _ColorElement { int pos; /* La position (Smac) de l'element */ int len; /* La longueur de l'element a colorie */ - unsigned long color; /* La couleur de l'element */ + unsigned long color; /* La couleur de l'element */ #ifdef HAVE_XFT XftColor xftcolor; #endif @@ -59,7 +59,7 @@ typedef struct _pcmap { char colorname[32]; - unsigned long pixelvalue; + unsigned long pixelvalue; #ifdef HAVE_XFT XftColor xftcolor; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/init_menus.h new/xcoral-3.50.2/init_menus.h --- old/xcoral-3.49.8/init_menus.h 2020-03-30 12:20:49.000000000 +0200 +++ new/xcoral-3.50.2/init_menus.h 2020-09-23 11:57:34.000000000 +0200 @@ -184,9 +184,13 @@ FCT (void, SetHiddenWindow, (XYMenu *menu, Window w, GC gc) ); //FCT (void, SetMenuPixmap, (Display *display, XYMenu *menu, int width) ); FCT (int, isGrabPointer, () ); +#ifdef HAVE_XFT FCT (XftColor, xftMenuBG, () ); FCT (XftColor, xftMenuFG, () ); FCT (int, lenTextWidth, (XftFont *font, char *s, int len) ); +#else +FCT (int, lenTextWidth, (XFontStruct *font, char *s, int len) ); +#endif #define SetMenuBarWidth(m, x) (m -> bar_width = x) #define GetMenuWindowBar(m) ( m -> w_bar ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/justify.c new/xcoral-3.50.2/justify.c --- old/xcoral-3.49.8/justify.c 2020-04-03 17:43:44.000000000 +0200 +++ new/xcoral-3.50.2/justify.c 2020-09-29 18:12:01.000000000 +0200 @@ -158,8 +158,14 @@ int nb; { extern Display *dpy; + #ifdef HAVE_XFT XGlyphInfo extents; + + if ( nb < 0 ) { + fprintf (stderr, "Warning textwidth, string length < 0 \n"); + return 0; + } XftTextExtents8 (dpy, font, (FcChar8 *) s, nb, &extents); return extents.xOff; #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/lastmodifs new/xcoral-3.50.2/lastmodifs --- old/xcoral-3.49.8/lastmodifs 2020-06-15 16:16:14.000000000 +0200 +++ new/xcoral-3.50.2/lastmodifs 2020-12-10 18:16:19.000000000 +0100 @@ -1,11 +1,26 @@ ============================================================================= + Fichiers ? modifier pour le num?ro de release: - xcoral.h, SmacLib/xcoralrc + xcoral.h, SmacLib/xcoralrc.lf + Danc Dev/doc_xcoral mettre ? jour xcoral.tex puis make xcoral.pdf + Dans Rpm mettre ? jour xc_spec ============================================================================= +Version 3.50.2 + + Corrige un probl?me de droit sur le fichier configure. + +Version 3.50.1 + + Mise ? jour de la doc. + +Version 3.49.9 Date Vendredi 2 Octobre 2020 + + Correction dans la mise ? jour de la liste chain?e des ?l?ments colori?s + apr?s un delete. Version 3.49.8 Date Vendredi 15 Juin 2020: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/parse.c new/xcoral-3.50.2/parse.c --- old/xcoral-3.49.8/parse.c 2020-04-21 10:27:51.000000000 +0200 +++ new/xcoral-3.50.2/parse.c 2020-11-07 11:35:01.000000000 +0100 @@ -1067,7 +1067,7 @@ static void Usage () { (void) fprintf ( stderr,"Usage : xcoral [-options] [files]\n"); - (void) fprintf ( stderr,"Option :\n"); + (void) fprintf ( stderr,"Options :\n"); (void) fprintf ( stderr, "\t[-h/-help]\t\t -Command line options\n" ); (void) fprintf ( stderr, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcoral-3.49.8/xcoral.h new/xcoral-3.50.2/xcoral.h --- old/xcoral-3.49.8/xcoral.h 2020-06-15 11:19:11.000000000 +0200 +++ new/xcoral-3.50.2/xcoral.h 2020-12-10 18:05:42.000000000 +0100 @@ -74,6 +74,6 @@ extern void (**func_names []) (); /* Callback */ #define MAXWIN 32 /* Nb max de fenetres d'editions. 32 ou 64 si on veut */ -#define CURRENT_VERSION "3.49.8" +#define CURRENT_VERSION "3.50.2" #endif /* _XCORAL_H_ */
