Ticket #3389 (closed defect: fixed)

Opened 10 years ago

Last modified 10 years ago

Failed to build MC from current master branch sources

Reported by: IceMan Owned by: andrew_b
Priority: major Milestone: 4.8.14
Component: mcview Version: master
Keywords: Cc:
Blocked By: Blocking:
Branch state: merged Votes for changeset: committed-master

Description

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

Change History

comment:1 Changed 10 years ago by andrew_b

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

G_UNICODE_SPACING_MARK was added in glib-2.29.14.

comment:2 Changed 10 years ago by IceMan

So we need to add glib version check to configure?

comment:3 Changed 10 years ago by IceMan

Or maybe better to add something similar to:

#ifndef G_UNICODE_SPACING_MARK
#define G_UNICODE_SPACING_MARK G_UNICODE_COMBINING_MARK
#endif

comment:4 follow-up: ↓ 5 Changed 10 years ago by egmont

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

comment:5 in reply to: ↑ 4 ; follow-up: ↓ 8 Changed 10 years ago by 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

comment:6 Changed 10 years ago by 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

comment:7 Changed 10 years ago by andrew_b

  • Status changed from new to accepted
  • Owner set to andrew_b
  • Branch state changed from no branch to on review
  • Milestone changed from Future Releases to 4.8.14

comment:8 in reply to: ↑ 5 Changed 10 years ago by 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.

comment:9 Changed 10 years ago by slavazanko

  • Votes for changeset set to slavazanko
  • Branch state changed from on review to approved

comment:10 Changed 10 years ago by andrew_b

  • Status changed from accepted to testing
  • Votes for changeset changed from slavazanko to committed-master
  • Resolution set to fixed
  • Branch state changed from approved to merged

comment:11 Changed 10 years ago by andrew_b

  • Status changed from testing to closed
Note: See TracTickets for help on using tickets.