Failed to build MC from current master branch sources

[IceMan]

Here logs from build system:

HEAD is now at 176183a Merge branch '3287_poedit'
BUILDBOT: Checking if current source builds from scratch

[skipped]

Configuration:

  Source code location:       .
  Compiler:                   gcc -std=gnu99
  Compiler flags:              -fdiagnostics-show-option -Wcomment -Wdeclaration-after-statement -Wfloat-equal -Wformat -Wformat-security -Wimplicit -Wignored-qualifiers -Wmissing-braces -Wmissing-declarations -Wmissing-parameter-type -Wmi
ssing-prototypes -Wnested-externs -Wno-long-long -Wno-unreachable-code -Wparentheses -Wpointer-sign -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtype-limits -Wuninitialized -Wunused-function -Wunused-label -Wunused-par
ameter -Wunused-result -Wunused-value -Wunused-variable -Wwrite-strings  -g -O2
  File system:                Midnight Commander Virtual Filesystem
                              cpio, tar, sfs, extfs, ftp, sftp, fish
  Screen library:             
  Mouse support:              gpm and xterm
  X11 events support:         yes
  With subshell support:      yes
  With background operations: yes
  Internal editor:            yes
  Diff viewer:                yes
  Support for charset:        yes
  Search type:                glib-regexp

[skipped]

Making all in viewer
make[3]: Entering directory `/home/buildbot/mc-tmp/src/viewer'
  CC     actions_cmd.lo
  CC     ascii.lo
ascii.c: In function 'mcview_next_combining_char_sequence':
ascii.c:533: error: 'G_UNICODE_SPACING_MARK' undeclared (first use in this function)
ascii.c:533: error: (Each undeclared identifier is reported only once
ascii.c:533: error: for each function it appears in.)
make[3]: *** [ascii.lo] Error 1
make[3]: Leaving directory `/home/buildbot/mc-tmp/src/viewer'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/buildbot/mc-tmp/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/buildbot/mc-tmp'
make: *** [all] Error 2

[andrew_b]

​https://bugzilla.gnome.org/show_bug.cgi?id=655025

G_UNICODE_SPACING_MARK was added in glib-2.29.14.

[IceMan]

So we need to add glib version check to configure?

[IceMan]

Or maybe better to add something similar to:

#ifndef G_UNICODE_SPACING_MARK
#define G_UNICODE_SPACING_MARK G_UNICODE_COMBINING_MARK
#endif

[egmont]

Or simply
sed -i s/G_UNICODE_SPACING_MARK/G_UNICODE_COMBINING_MARK/g ascii.c

[andrew_b]

Replying to egmont:

Or simply
sed -i s/G_UNICODE_SPACING_MARK/G_UNICODE_COMBINING_MARK/g ascii.c

G_UNICODE_COMBINING_MARK is deprecated
​https://mail.gnome.org/archives/commits-list/2011-July/msg08363.html
​http://osdir.com/ml/commits.gnome/2011-07/msg08136.html

[andrew_b]

Something like following:

#if GLIB_CHECK_VERSION (2, 30, 0)
#define MARK G_UNICODE_SPACING_MARK
#else
#define MARK G_UNICODE_COMBINING_MARK
#endif

[andrew_b]

Branch: 3389_spacing_mark
changeset:42395d1f84c70a55597bd5807d5723aef13274ad

[egmont]

Replying to andrew_b:

G_UNICODE_COMBINING_MARK is deprecated

Indeed, I missed this.

I like IceMan's fix much more than yours. It makes the code more readable and work cleanly (without any indirection) against glibs from the last 3 years, and only includes a hack for older ones.

Anyway, either of the fixes is fine.

[andrew_b]

Merged to master: [34a25459d2b04c856cf4cda92c4595a8be0d216a].