This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x-rpm-debug in repository nx-libs. from 966ebc5 Debug makefile execution by making some commands visible. new f7079da Revert "Debug makefile execution by making some commands visible." new 8db65fb nx-libs.spec: sync removed files with debian/rules. new 7986f00 nx-X11/programs/Xserver/Imakefile: drop system libraries out of target list for nxagent regeneration. new 8603e4e nx-X11/programs/Xserver/Imakefile: use printf with no trailing newline instead of echo for variable value. new 6c75a79 nx-X11/config/cf/Imake.tmpl: implement new UseTIRPC macro, defaulting to NO. new 04e7f81 nx-X11/programs/Xserver/{,os/}Imakefile: implement libtirpc forcing via UseTIRPC. new a05cdab nx-X11/config/cf/README: document new UseTIRPC macro. new 559b61b nx-libs.spec: force usage of libtirpc on Fedora > 27 and OpenSuSE Tumbleweed+ (soon to be Leap 15). new d81f325 Merge branch 'feature/use-libtirpc' into 3.6.x-rpm-debug The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/programs/Xserver/Imakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 8db65fbb88ddea7a43891272ba4e03a5dfeccdca Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:04:32 2018 +0100 nx-libs.spec: sync removed files with debian/rules. --- nx-libs.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index e918c60..107daad 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -440,6 +440,9 @@ chmod 755 %{buildroot}%{_libdir}/lib*.so* rm -r %{buildroot}%{_includedir}/GL rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XK*.h rm -r %{buildroot}%{_includedir}/nx-X11/extensions/*Xv*.h +rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XRes*.h +rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XIproto.h +rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XI.h rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans #Remove our shared libraries' .la files before wrapping up the packages @@ -553,9 +556,6 @@ rm %{buildroot}%{_libdir}/*.la %{_includedir}/nx-X11/keysym.h %{_includedir}/nx-X11/keysymdef.h %{_includedir}/nx-X11/extensions/Xdbeproto.h -%{_includedir}/nx-X11/extensions/XI.h -%{_includedir}/nx-X11/extensions/XIproto.h -%{_includedir}/nx-X11/extensions/XResproto.h %{_includedir}/nx-X11/extensions/bigreqstr.h %{_includedir}/nx-X11/extensions/composite.h %{_includedir}/nx-X11/extensions/compositeproto.h -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 7986f001c2d1ef821fefbb67bd0b180b95f7cfed Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 10 02:04:25 2018 +0100 nx-X11/programs/Xserver/Imakefile: drop system libraries out of target list for nxagent regeneration. Updating timestamps on object files and libraries used to compose nxagent is only meaningful for actual files within the buildroot. External dependencies would be ignored anyway, and worse, cause older GNU Make versions to fail if they contain special characters like a percent sign, which is typically interpreted as a wild card character. --- nx-X11/programs/Xserver/Imakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 5d86a53..285b361 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -305,7 +305,7 @@ NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB) MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS)) #endif #if ForceServerRemake -$(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) +$(NXAGENTOBJS) $(NXAGENTLIBS):: $(NXAGENTDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif #if NXLibraries @@ -485,7 +485,7 @@ MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(N #endif #if ForceServerRemake -$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDIRS) +$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif @@ -542,7 +542,7 @@ MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(N #endif #if ForceServerRemake -$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDIRS) +$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit f7079da1c2cf5e6fe53d2df2325a4e6a1328b537 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 10 01:51:40 2018 +0100 Revert "Debug makefile execution by making some commands visible." This reverts commit 966ebc55baac8b4ecdf542f62ac6a42fc2e9bb7d. --- nx-X11/programs/Xserver/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 698accc..57ec4b2 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -314,7 +314,7 @@ MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTS #endif #if ForceServerRemake $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) - if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi + @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif #if NXLibraries /* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit a05cdab5de2b3b515aae3e8b8c251791aacf98f6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:09:05 2018 +0100 nx-X11/config/cf/README: document new UseTIRPC macro. --- nx-X11/config/cf/README | 1 + 1 file changed, 1 insertion(+) diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 59a08f4..24ac7f5 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -148,6 +148,7 @@ Imake.tmpl provides defaults for the following variables: UnalignedReferencesAllowed boolean for unaligned copies ok UsrLibDir directory in which to install libraries YaccCmd command to run yacc + UseTIRPC force usage of libtirpc X11.tmpl provides defaults for the following variables: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 8603e4e2565830778d02d53e035c3f37d6d47a5e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:07:15 2018 +0100 nx-X11/programs/Xserver/Imakefile: use printf with no trailing newline instead of echo for variable value. --- nx-X11/programs/Xserver/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 285b361..f4f8d3f 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -292,7 +292,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ XPMLIB = -lXpm XMLLIB = `pkg-config --libs libxml-2.0` PIXMANLIB = `pkg-config --libs pixman-1` -ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") +ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || printf '%s' '-lz') PNGLIB = `pkg-config --libs libpng` JPEGLIB = -ljpeg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 6c75a79ea7ed123ae4400d9b36f5da2c7317c2b2 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:06:11 2018 +0100 nx-X11/config/cf/Imake.tmpl: implement new UseTIRPC macro, defaulting to NO. --- nx-X11/config/cf/Imake.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 86222d1..d6ef779 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -563,6 +563,9 @@ X_BYTE_ORDER = ByteOrder #ifndef HasLegacyXfont1 #define HasLegacyXfont1 NO #endif +#ifndef UseTIRPC +#define UseTIRPC NO +#endif #ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */ #define GzipLibrary -lz #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 04e7f813d259681507544e5ab1928f5dc4c61471 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:08:35 2018 +0100 nx-X11/programs/Xserver/{,os/}Imakefile: implement libtirpc forcing via UseTIRPC. --- nx-X11/programs/Xserver/Imakefile | 10 +++++++++- nx-X11/programs/Xserver/os/Imakefile | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index f4f8d3f..c26116f 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -296,11 +296,19 @@ ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs PNGLIB = `pkg-config --libs libpng` JPEGLIB = -ljpeg +TIRPC_LIB = + +#if HasSecureRPC +#if UseTIRPC +TIRPC_LIB = $$(pkg-config --libs 'libtirpc') +#endif +#endif + NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) -NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB) +NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB) $(TIRPC_LIB) #if HasParallelMake MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS)) #endif diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 7932e32..da39c57 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -75,10 +75,17 @@ XDMAUTHOBJS = XDMAUTHSCRS = #endif +TIRPC_INCLUDES = + #if HasSecureRPC RPCDEFS = -DSECURE_RPC RPCOBJS = rpcauth.o RPCSRCS = rpcauth.c + +#if UseTIRPC +TIRPC_INCLUDES = $$(pkg-config --cflags-only-I 'libtirpc') +#endif + #else RPCDEFS = RPCOBJS = @@ -209,6 +216,7 @@ BOOTSTRAPCFLAGS = -I$(TOP)/lib/Xau \ $(NX_INCLUDES) \ `pkg-config --cflags-only-I pixman-1` \ + $(TIRPC_INCLUDES) \ $(NULL) DEPEND_DEFINES = $(XDMCP_DEFINES) \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 559b61b82ffce2cf5704ef41dba3311d4d9adbaf Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:11:06 2018 +0100 nx-libs.spec: force usage of libtirpc on Fedora > 27 and OpenSuSE Tumbleweed+ (soon to be Leap 15). This utilizes IMAKE_DEFINES to pass down the value to UseTIRPC directly. Fixes: ArcticaProject/nx-libs#665 --- nx-libs.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 107daad..f24756e 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -120,8 +120,8 @@ BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel -# RPC headers. Fedora 28+ phased them out of glibc, like upstream did. -%if 0%{?fedora} > 27 +# RPC headers. Fedora 28+ and OpenSuSE Tumbleweed phased them out of glibc, like upstream did. +%if 0%{?fedora} > 27 || 0%{?suse_version} > 1500 BuildRequires: libtirpc-devel %endif @@ -410,7 +410,14 @@ chmod a+x my_configure; export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export LOCAL_LDFLAGS="%{__global_ldflags}" export CDEBUGFLAGS="%{?__global_cppflags} %{?__global_cflags} %{?optflags}" -make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}" +IMAKE_DEFINES='' +FORCE_TIRPC='NO' +%if 0%{?fedora} > 27 || 0%{?suse_version} > 1500 +FORCE_TIRPC='YES' +%endif +IMAKE_DEFINES="-DUseTIRPC=${FORCE_TIRPC}" +export IMAKE_DEFINES +make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}" IMAKE_DEFINES="${IMAKE_DEFINES}" %install make install \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit d81f325e438d7b7ec71e5d214b905d71b08769cf Merge: f7079da 559b61b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 10 02:06:24 2018 +0100 Merge branch 'feature/use-libtirpc' into 3.6.x-rpm-debug nx-X11/programs/Xserver/Imakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org