Hello community, here is the log from the commit of package mgdiff for openSUSE:Factory checked in at 2014-10-22 16:23:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mgdiff (Old) and /work/SRC/openSUSE:Factory/.mgdiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mgdiff" Changes: -------- --- /work/SRC/openSUSE:Factory/mgdiff/mgdiff.changes 2013-07-21 11:59:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mgdiff.new/mgdiff.changes 2014-10-22 16:23:30.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 20 07:55:41 UTC 2014 - [email protected] + +- Add sed paser for resulting Makefile to let it build with latest + glibc as _BSD_SOURCE and _SVID_SOURCE are deprecated with +- Add patch mgdiff-1.0-getline.diff to avoid name space conflict + with getline(3) from stdio.h + +------------------------------------------------------------------- New: ---- mgdiff-1.0-getline.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgdiff.spec ++++++ --- /var/tmp/diff_new_pack.K51WXy/_old 2014-10-22 16:23:32.000000000 +0200 +++ /var/tmp/diff_new_pack.K51WXy/_new 2014-10-22 16:23:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mgdiff # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,8 @@ Patch: mgdiff-1.0.dif Patch1: mgdiff-1.0.1.diff Patch2: mgdiff-1.0-locale.diff +# PATCH-FIX-SUSE Avoid getline in local name space +Patch3: mgdiff-1.0-getline.diff %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" %global _mandir %{_exec_prefix}/man @@ -70,7 +72,11 @@ %patch1 %patch %patch2 -p1 +%patch3 xmkmf -a +%if 0%{?suse_version} >= 1320 +sed -ri 's/-D_BSD_SOURCE[[:space:]]+-D_SVID_SOURCE/-D_DEFAULT_SOURCE/' Makefile +%endif %build make CCOPTIONS="$RPM_OPT_FLAGS" ++++++ mgdiff-1.0-getline.diff ++++++ --- rundiff.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) --- rundiff.c +++ rundiff.c 2014-10-20 07:49:42.699838147 +0000 @@ -73,7 +73,7 @@ typedef enum { ADD = 1, CHANGE, DELETE, static char *duplicate (char *s, int *flag); static DiffType parse_diff_line (char *buf, int *f1n1, int *f1n2, int *f2n1, int *f2n2); static int eatline (FILE *f); -static void getline (FILE *f, char **cooked, char **raw); +static void diffgetline (FILE *f, char **cooked, char **raw); static void reset_blist (void); static Block *get_blist (void); static void add_blist (Block *b); @@ -281,7 +281,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[LEFT].wtext = (char **) xcalloc (b->arr[LEFT].fsize, sizeof (char *)); b->arr[LEFT].tlen = (short *) xcalloc (b->arr[LEFT].fsize, sizeof (short)); for (i = 0; i < b->arr[LEFT].fsize; i++) { - getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); + diffgetline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]); if (di->maxcols < b->arr[LEFT].tlen[i]) { di->maxcols = b->arr[LEFT].tlen[i]; @@ -310,7 +310,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[RIGHT].wtext = (char **) xcalloc (b->arr[RIGHT].fsize, sizeof (char *)); b->arr[RIGHT].tlen = (short *) xcalloc (b->arr[RIGHT].fsize, sizeof (short)); for (i = 0; i < b->arr[RIGHT].fsize; i++) { - getline (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]); + diffgetline (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]); b->arr[RIGHT].tlen[i] = strlen (b->arr[RIGHT].text[i]); if (di->maxcols < b->arr[RIGHT].tlen[i]) { di->maxcols = b->arr[RIGHT].tlen[i]; @@ -341,7 +341,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[LEFT].wtext = (char **) xcalloc (b->arr[LEFT].fsize, sizeof (char *)); b->arr[LEFT].tlen = (short *) xcalloc (b->arr[LEFT].fsize, sizeof (short)); for (i = 0; i < b->arr[LEFT].fsize; i++) { - getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); + diffgetline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]); if (di->maxcols < b->arr[LEFT].tlen[i]) { di->maxcols = b->arr[LEFT].tlen[i]; @@ -368,7 +368,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[LEFT].wtext = (char **) xcalloc (b->arr[LEFT].fsize, sizeof (char *)); b->arr[LEFT].tlen = (short *) xcalloc (b->arr[LEFT].fsize, sizeof (short)); for (i = 0; i < b->arr[LEFT].fsize; i++) { - getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); + diffgetline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]); if (di->maxcols < b->arr[LEFT].tlen[i]) { di->maxcols = b->arr[LEFT].tlen[i]; @@ -381,7 +381,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[RIGHT].wtext = (char **) xcalloc (b->arr[RIGHT].fsize, sizeof (char *)); b->arr[RIGHT].tlen = (short *) xcalloc (b->arr[RIGHT].fsize, sizeof (short)); for (i = 0; i < b->arr[RIGHT].fsize; i++) { - getline (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]); + diffgetline (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]); b->arr[RIGHT].tlen[i] = strlen (b->arr[RIGHT].text[i]); if (di->maxcols < b->arr[RIGHT].tlen[i]) { di->maxcols = b->arr[RIGHT].tlen[i]; @@ -409,7 +409,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[LEFT].wtext = (char **) xcalloc (b->arr[LEFT].fsize, sizeof (char *)); b->arr[LEFT].tlen = (short *) xcalloc (b->arr[LEFT].fsize, sizeof (short)); for (i = 0; i < b->arr[LEFT].fsize; i++) { - getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); + diffgetline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]); if (di->maxcols < b->arr[LEFT].tlen[i]) { di->maxcols = b->arr[LEFT].tlen[i]; @@ -438,7 +438,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[LEFT].wtext = (char **) xcalloc (b->arr[LEFT].fsize, sizeof (char *)); b->arr[LEFT].tlen = (short *) xcalloc (b->arr[LEFT].fsize, sizeof (short)); for (i = 0; i < b->arr[LEFT].fsize; i++) { - getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); + diffgetline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]); if (di->maxcols < b->arr[LEFT].tlen[i]) { di->maxcols = b->arr[LEFT].tlen[i]; @@ -501,7 +501,7 @@ DiffInfo *build_diff_info (char *prog, c b->arr[LEFT].wtext = (char **) xcalloc (b->arr[LEFT].fsize, sizeof (char *)); b->arr[LEFT].tlen = (short *) xcalloc (b->arr[LEFT].fsize, sizeof (short)); for (i = 0; i < b->arr[LEFT].fsize; i++) { - getline (file2, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); + diffgetline (file2, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]); b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]); if (di->maxcols < b->arr[LEFT].tlen[i]) { di->maxcols = b->arr[LEFT].tlen[i]; @@ -677,7 +677,7 @@ static int eatline (FILE *f) * printable) if necessary. Silently truncate input lines at BUFSIZ * characters. */ -static void getline (FILE *f, char **cooked, char **raw) +static void diffgetline (FILE *f, char **cooked, char **raw) { char buffer[BUFSIZ+1]; char *s; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
