This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 7dacd79 release 3.5.0.33 new 09bb93e Mid-release fixup: rename debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch to debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch. new 4154463 Mid-release fixup: split up debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch. The 2 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: debian/changelog | 11 +++ ...x-X11_Render.c-Improve-situation-fo.full.patch} | 0 ...ll_propagate-optflags-to-subcompone.full.patch} | 57 ----------- ...ropagate-optflags-to-subcompone.full+lite.patch | 105 +++++++++++++++++++++ debian/patches/series | 5 +- 5 files changed, 119 insertions(+), 59 deletions(-) rename debian/patches/{1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch => 1400_nx-X11_Render.c-Improve-situation-fo.full.patch} (100%) rename debian/patches/{1500_all_propagate-optflags-to-subcompone.full+lite.patch => 1500_all_propagate-optflags-to-subcompone.full.patch} (82%) create mode 100644 debian/patches/1510_all_propagate-optflags-to-subcompone.full+lite.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.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 master in repository nx-libs. commit 09bb93e00259c484d48baaeb3d97484d6d535553 Author: X2Go Release Manager <git-admin@x2go.org> Date: Wed Nov 8 08:47:03 2017 +0100 Mid-release fixup: rename debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch to debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch. --- debian/changelog | 5 +++++ ...te.patch => 1400_nx-X11_Render.c-Improve-situation-fo.full.patch} | 0 debian/patches/series | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f435db4..910f538 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,11 @@ nx-libs (2:3.5.0.33-0x2go1) unstable; urgency=low v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) Adds: - debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch + * Mid-release fixup: + - Rename + debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch + to + debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch. [ Mike Gabriel ] * debian/libxinerama1.postinst.in: diff --git a/debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch b/debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch similarity index 100% rename from debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch rename to debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch diff --git a/debian/patches/series b/debian/patches/series index ac1450a..30745a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -150,7 +150,7 @@ 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch 1300_nxcomp_Set-TokenSize-to-1536-for-lin.full+lite.patch 1301_nxcomp_Reduce-TokenSize-slightly-for.full+lite.patch -1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch +1400_nx-X11_Render.c-Improve-situation-fo.full.patch 1500_all_propagate-optflags-to-subcompone.full+lite.patch 1600_nxcomp-handle-launchd-socket-in-Auth.full+lite.patch 1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.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 master in repository nx-libs. commit 415446307c97fae1dd78ea8b61af732907cbfa22 Author: X2Go Release Manager <git-admin@x2go.org> Date: Wed Nov 8 08:56:29 2017 +0100 Mid-release fixup: split up debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch. Put server changes into debian/patches/1500_all_propagate-optflags-to-subcompone.full.patch and keep client changes local to debian/patches/1510_all_propagate-optflags-to-subcompone.full+lite.patch. --- debian/changelog | 6 ++ ...ll_propagate-optflags-to-subcompone.full.patch} | 57 ----------- ...ropagate-optflags-to-subcompone.full+lite.patch | 105 +++++++++++++++++++++ debian/patches/series | 3 +- 4 files changed, 113 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 910f538..bf4aa9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,12 @@ nx-libs (2:3.5.0.33-0x2go1) unstable; urgency=low debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch to debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch. + - Split up + debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch. + Put server changes into + debian/patches/1500_all_propagate-optflags-to-subcompone.full.patch + and keep client changes local to + debian/patches/1510_all_propagate-optflags-to-subcompone.full+lite.patch. [ Mike Gabriel ] * debian/libxinerama1.postinst.in: diff --git a/debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch b/debian/patches/1500_all_propagate-optflags-to-subcompone.full.patch similarity index 82% rename from debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch rename to debian/patches/1500_all_propagate-optflags-to-subcompone.full.patch index abc89d3..ae23a98 100644 --- a/debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch +++ b/debian/patches/1500_all_propagate-optflags-to-subcompone.full.patch @@ -161,46 +161,6 @@ OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx- $(LIBCWRAPPER) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTSYSLIBS) $(NXAGENTNXLIBS)) /* ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -41,6 +41,8 @@ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEF - CXXINCLUDES = - CXXDEFINES = - -+CPPFLAGS = @CPPFLAGS@ -+ - # - # C programs have their own CFLAGS. - # -@@ -84,9 +86,9 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/u - .SUFFIXES: .cpp.c - - .cpp.o: -- $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $< -+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $< - .c.o: -- $(CC) -c $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $< -+ $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $< - - LIBRARY = Xcomp - ---- a/nxcomp/configure.in -+++ b/nxcomp/configure.in -@@ -7,8 +7,12 @@ AC_PREREQ(2.13) - - dnl Set our default compilation flags. - --CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" --CFLAGS="$CFLAGS -O3" -+if test "x$CXXFLAGS" = "x"; then -+ CXXFLAGS="-O3 -fno-rtti -fno-exceptions" -+fi -+if test "x$CFLAGS" = "x"; then -+ CFLAGS="$CFLAGS -O3" -+fi - - dnl Reset default linking directives. - --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -34,6 +34,8 @@ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEF @@ -292,20 +252,3 @@ OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx- ;; esac ---- a/nxproxy/configure.in -+++ b/nxproxy/configure.in -@@ -7,8 +7,12 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="$CXXFLAGS -O3" --CPPFLAGS="$CPPFLAGS -O3" -+if test "x$CXXFLAGS" == "x"; then -+ CXXFLAGS="-O3" -+fi -+if test "x$CPPFLAGS" == "x"; then -+ CPPFLAGS="-O3" -+fi - - dnl Prefer headers and libraries from nx-X11 if present. - diff --git a/debian/patches/1510_all_propagate-optflags-to-subcompone.full+lite.patch b/debian/patches/1510_all_propagate-optflags-to-subcompone.full+lite.patch new file mode 100644 index 0000000..6acd980 --- /dev/null +++ b/debian/patches/1510_all_propagate-optflags-to-subcompone.full+lite.patch @@ -0,0 +1,105 @@ +commit d650a0b47eadeb675e2d2cf03ad10a4dbc564971 +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Date: Thu Jun 23 14:27:15 2016 +0200 + +OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx-X11 build scripts. + + Note: + + - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those + options over into the variable CDEBUGFLAGS. + - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. + + This change also includes a slight change in the nx-X11 build order. + + Old build order: + + Main Makefile: + + - [...] + - libNX_X11 + + implicitly building nxcomp + + implicitly building nxcompext + - [...] + - nxagent + + implicitly building nxcompshad + - [...] + + New build ordner: + + Main Makefile: + + - [...] + - nxcomp + - setup nx-X11 build env + + cd nx-X11 && make BuildEnv + - nx-X11/lib/* + - nxcompext + - nxcompshad + - [...] + - nxagent + - [...] + + Fixes ArcticaProject/nx-libs#141 + Fixes X2GoBTS#84 + + Backported from Arctica GH 3.6.x branch. + + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) +--- a/nxcomp/Makefile.in ++++ b/nxcomp/Makefile.in +@@ -41,6 +41,8 @@ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEF + CXXINCLUDES = + CXXDEFINES = + ++CPPFLAGS = @CPPFLAGS@ ++ + # + # C programs have their own CFLAGS. + # +@@ -84,9 +86,9 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/u + .SUFFIXES: .cpp.c + + .cpp.o: +- $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $< ++ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $< + .c.o: +- $(CC) -c $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $< ++ $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $< + + LIBRARY = Xcomp + +--- a/nxcomp/configure.in ++++ b/nxcomp/configure.in +@@ -7,8 +7,12 @@ AC_PREREQ(2.13) + + dnl Set our default compilation flags. + +-CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" +-CFLAGS="$CFLAGS -O3" ++if test "x$CXXFLAGS" = "x"; then ++ CXXFLAGS="-O3 -fno-rtti -fno-exceptions" ++fi ++if test "x$CFLAGS" = "x"; then ++ CFLAGS="$CFLAGS -O3" ++fi + + dnl Reset default linking directives. + +--- a/nxproxy/configure.in ++++ b/nxproxy/configure.in +@@ -7,8 +7,12 @@ AC_PREREQ(2.13) + + dnl Reset default compilation flags. + +-CXXFLAGS="$CXXFLAGS -O3" +-CPPFLAGS="$CPPFLAGS -O3" ++if test "x$CXXFLAGS" == "x"; then ++ CXXFLAGS="-O3" ++fi ++if test "x$CPPFLAGS" == "x"; then ++ CPPFLAGS="-O3" ++fi + + dnl Prefer headers and libraries from nx-X11 if present. + diff --git a/debian/patches/series b/debian/patches/series index 30745a6..2b2800f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -151,7 +151,8 @@ 1300_nxcomp_Set-TokenSize-to-1536-for-lin.full+lite.patch 1301_nxcomp_Reduce-TokenSize-slightly-for.full+lite.patch 1400_nx-X11_Render.c-Improve-situation-fo.full.patch -1500_all_propagate-optflags-to-subcompone.full+lite.patch +1500_all_propagate-optflags-to-subcompone.full.patch +1510_all_propagate-optflags-to-subcompone.full+lite.patch 1600_nxcomp-handle-launchd-socket-in-Auth.full+lite.patch 1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch 9900-dxpc-license-history.full+lite.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org