The branch, build-baikal has been updated via 713da22603c4abc7a97feddd931f29c507b7984b (commit) from 3d1c57d5ef429e51ab7a626540c30b81e74a8f17 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: nx-X11/CHANGELOG | 13 +++++++++++++ nx-X11/CHANGELOG.NX.original | 9 +++++++++ nx-X11/programs/Xserver/Imakefile | 6 +++--- nx-X11/programs/Xserver/Imakefile.NX.original | 6 +++--- nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 8 ++++++++ .../xkb/{ddxKillSrv.c => ddxKillSrv.c.NX.original} | 8 ++++++++ .../xkb/{ddxKillSrv.c => ddxKillSrv.c.X.original} | 0 7 files changed, 44 insertions(+), 6 deletions(-) copy nx-X11/programs/Xserver/xkb/{ddxKillSrv.c => ddxKillSrv.c.NX.original} (96%) copy nx-X11/programs/Xserver/xkb/{ddxKillSrv.c => ddxKillSrv.c.X.original} (100%) The diff of changes is: diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG index fe29e19..7c8afed 100644 --- a/nx-X11/CHANGELOG +++ b/nx-X11/CHANGELOG @@ -1,5 +1,18 @@ ChangeLog: +nx-X11-3.2.0-1 + +- Opened the 3.2.0 branch based on nx-X11-3.1.0-6. + +nx-X11-3.1.0-6 + +- Modified Xserver Imakefile to link the Xfixes library. + +nx-X11-3.1.0-5 + +- Disabled the terminate action, just in case the TerminateServer + symbol is binded to a non default key sequence. + nx-X11-3.1.0-4 - Imported patch fixing issues from X.Org security advisory, January diff --git a/nx-X11/CHANGELOG.NX.original b/nx-X11/CHANGELOG.NX.original index fe29e19..8225428 100644 --- a/nx-X11/CHANGELOG.NX.original +++ b/nx-X11/CHANGELOG.NX.original @@ -1,5 +1,14 @@ ChangeLog: +nx-X11-3.1.0-6 + +- Modified Xserver Imakefile to link the Xfixes library. + +nx-X11-3.1.0-5 + +- Disabled the terminate action, just in case the TerminateServer + symbol is binded to a non default key sequence. + nx-X11-3.1.0-4 - Imported patch fixing issues from X.Org security advisory, January diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 39b93eb..1192316 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -1012,15 +1012,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite \ + -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext \ + -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite #endif diff --git a/nx-X11/programs/Xserver/Imakefile.NX.original b/nx-X11/programs/Xserver/Imakefile.NX.original index 39b93eb..1192316 100644 --- a/nx-X11/programs/Xserver/Imakefile.NX.original +++ b/nx-X11/programs/Xserver/Imakefile.NX.original @@ -1012,15 +1012,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite \ + -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext \ + -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite #endif diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c index ee0acb0..b78dc42 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c +++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c @@ -52,10 +52,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. int XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) { +#ifdef NXAGENT_SERVER + + return 0; + +#else + #ifdef XF86DDXACTIONS xf86ProcessActionEvent(ACTION_TERMINATE, NULL); #else GiveUp(1); #endif return 0; + +#endif /* NXAGENT_SERVER */ } diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c.NX.original similarity index 96% copy from nx-X11/programs/Xserver/xkb/ddxKillSrv.c copy to nx-X11/programs/Xserver/xkb/ddxKillSrv.c.NX.original index ee0acb0..b78dc42 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c +++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c.NX.original @@ -52,10 +52,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. int XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) { +#ifdef NXAGENT_SERVER + + return 0; + +#else + #ifdef XF86DDXACTIONS xf86ProcessActionEvent(ACTION_TERMINATE, NULL); #else GiveUp(1); #endif return 0; + +#endif /* NXAGENT_SERVER */ } diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c.X.original similarity index 100% copy from nx-X11/programs/Xserver/xkb/ddxKillSrv.c copy to nx-X11/programs/Xserver/xkb/ddxKillSrv.c.X.original hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).