This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 0e3b414 Provide COPYING file in tarball. Update debian/copyright. new c9bc8ac Add 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch. Fix FTBFS when built against libjpeg9a. Thanks to Gabriel Marcano for sending this in. The 1 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 | 3 ++ ...nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch | 40 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 44 insertions(+) create mode 100644 debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch -- Alioth's /srv/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 c9bc8accc1b1a385b61c1a802da99c4de3d4577c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Aug 20 13:02:53 2014 +0200 Add 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch. Fix FTBFS when built against libjpeg9a. Thanks to Gabriel Marcano for sending this in. --- debian/changelog | 3 ++ ...nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch | 40 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 44 insertions(+) diff --git a/debian/changelog b/debian/changelog index 59028ad..2c41937 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium * Provide COPYING file in tarball. Update debian/copyright. + * Add 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch. Fix FTBFS when + built against libjpeg9a. Thanks to Gabriel Marcano for sending this in. + (Fixes: #578). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 30 Jun 2014 15:05:54 +0200 diff --git a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch new file mode 100644 index 0000000..66ca8c3 --- /dev/null +++ b/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch @@ -0,0 +1,40 @@ +Description: Fix FTBFS when built against libjpeg9a +Author: Gabriel Marcano <gabemarcano@yahoo.com> +--- a/nxcomp/Jpeg.cpp 2014-08-19 22:23:36.139072400 -0400 ++++ b/nxcomp/Jpeg.cpp 2014-08-19 22:25:24.323182800 -0400 +@@ -440,7 +440,7 @@ + + JpegSetSrcManager(&cinfo, compressedData, compressedLen); + +- jpeg_read_header(&cinfo, 1); ++ jpeg_read_header(&cinfo, TRUE); + + if (jpegError) goto AbortDecompressJpeg16; + +@@ -581,7 +581,7 @@ + + JpegSetSrcManager(&cinfo, compressedData, compressedLen); + +- jpeg_read_header(&cinfo, 1); ++ jpeg_read_header(&cinfo, TRUE); + + if (jpegError) goto AbortDecompressJpeg24; + +@@ -718,7 +718,7 @@ + + JpegSetSrcManager(&cinfo, compressedData, compressedLen); + +- jpeg_read_header(&cinfo, 1); ++ jpeg_read_header(&cinfo, TRUE); + + if (jpegError) goto AbortDecompressJpeg32; + +@@ -833,7 +833,7 @@ + jpegSrcManager.bytes_in_buffer = jpegBufferLen; + jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr; + +- return 1; ++ return TRUE; + } + + static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes) diff --git a/debian/patches/series b/debian/patches/series index cf3e9a0..e23de8d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,6 +19,7 @@ 019_nx-X11_expat-build-against-system-libxmltok.full.patch 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch +025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch 026_nxcompext_honour-optflags.full.patch 026_nxcomp_honour-optflags.full+lite.patch 026_nxcompshad_honour-optflags.full.patch -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org