Bug #2007

Minimal set for pkg-config dependencies in uppsrc/CtrlCore and uppsrc/Draw packages

Added by Sender Ghost 6 months ago. Updated 2 months ago.

Status:Patch readyStart date:01/21/2020
Priority:NormalDue date:
Assignee:Miroslav Fidler% Done:

0%

Category:-Spent time:-
Target version:-

Description

Possible to create minimal set of pkg-config dependencies for uppsrc/CtrlCore and uppsrc/Draw packages.
Also possible to extend checks for other platforms (e.g. DRAGONFLY, NETBSD, OPENBSD, OSX11, SOLARIS).

Tested build on FreeBSD 10.4 (for examples/AddressBook and reference/ConsoleDraw packages, but also for uppsrc/ide, etc.) for GUI and GUI X11 cases.

For possible reference:
DragonFlyBSD:
https://github.com/DragonFlyBSD/DPorts/tree/master/x11/libX11
https://github.com/DragonFlyBSD/DPorts/tree/master/x11/libXinerama
https://github.com/DragonFlyBSD/DPorts/tree/master/x11/libXrender

NetBSD:
https://www.pkgsrc.org/#index5h1
http://pkgsrc.se/x11/libX11
http://pkgsrc.se/x11/libXinerama
http://pkgsrc.se/x11/libXrender

OpenBSD:
https://github.com/openbsd/xenocara/blob/master/lib/libX11/x11.pc.in
https://github.com/openbsd/xenocara/blob/master/lib/libXinerama/xinerama.pc.in
https://github.com/openbsd/xenocara/blob/master/lib/libXrender/xrender.pc.in

Solaris:
https://www.opencsw.org/package/pkgconfig/
https://github.com/oracle/solaris-userland/tree/master/components/pkg-config
https://github.com/oracle/solaris-userland/tree/master/components/x11/xserver/xorg

Proposed patch attached. Also simplified check for uppsrc/CtrlLib package.

uppsrc_CtrlCore-CtrlLib-Draw_r14430.diff Magnifier - Proposed patch for uppsrc (since 14430 revision) (1.22 KB) Sender Ghost, 05/04/2020 12:31 AM

uppsrc_CtrlCore-CtrlLib-Draw_r14430_v2.diff Magnifier - Proposed patch for uppsrc (since 14430 revision; second variant) (1.39 KB) Sender Ghost, 05/04/2020 12:40 AM

History

#1 Updated by Sender Ghost 6 months ago

Maybe there is a need to add RAINBOW checks also, based on changes before 13917 revision.

#2 Updated by Sender Ghost 6 months ago

  • File deleted (uppsrc_CtrlCore-CtrlLib-Draw_r13924.diff)

#3 Updated by Sender Ghost 6 months ago

  • File uppsrc_CtrlCore-CtrlLib-Draw_r13929.diff added

Moved libnotify pkg-config dependency from uppsrc/CtrlCore to uppsrc/CtrlLib package, after build test for reference/TrayIcon package.
Updated patch.

#4 Updated by Sender Ghost 6 months ago

Probably, the libnotify pkg-config dependency was placed to uppsrc/CtrlCore, instead of uppsrc/CtrlLib, for more simple maintenance, because the same checks are available. But some its functions actually used in uppsrc/CtrlLib/TrayIconGtk.cpp file. I guess, this is on your discretion.

#5 Updated by Sender Ghost 3 months ago

  • File uppsrc_CtrlCore-CtrlLib-Draw_r14364.diff added

Updated after 14364 revision.

#6 Updated by Sender Ghost 3 months ago

  • File deleted (uppsrc_CtrlCore-CtrlLib-Draw_r13929.diff)

#7 Updated by Sender Ghost 2 months ago

  • File deleted (uppsrc_CtrlCore-CtrlLib-Draw_r14364.diff)

#8 Updated by Sender Ghost 2 months ago

Removed OSX11 flag for cases where !X11 used:
https://github.com/ultimatepp/ultimatepp/blob/22386da38f9f09c9fd8e717016978eb16355f079/uppsrc/Core/config.h#L44-L47

#9 Updated by Sender Ghost 2 months ago

Added second variant of the patch, where platforms (which flags are available in the uppsrc/Core/config.h and uppsrc/ide/Core/Host.cpp files) checks explicitly, e.g.
LINUX | FREEBSD | OPENBSD | NETBSD | DRAGONFLY | SOLARIS
instead of (as in first variant)
POSIX !OSX

Also available in: Atom PDF