The branch, build-main has been updated via 419d505c907972b7823263a843e0de0a57b25b18 (commit) via 28acb2ea138f974452c7001e750f15e28aff2d37 (commit) via 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (commit) via 6ae5c16b8865d14ba034c836a76c7a059d8865c0 (commit) via e326dd760e115dcb48f6823462a737039453a63c (commit) via dbbbbc5ffaed61f5e04ad68045195df9a7e1f7ed (commit) from 220c985d366883f4021cc9d84550cc630022f016 (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: debian/changelog | 9 ++++ debian/patches/006_nxcomp_libpng15.full+lite.patch | 43 ++++++++++++++++++ .../patches/008_nxcomp_sa_restorer.full+lite.patch | 46 ++++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 100 insertions(+), 0 deletions(-) create mode 100644 debian/patches/006_nxcomp_libpng15.full+lite.patch create mode 100644 debian/patches/008_nxcomp_sa_restorer.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cf1715c..9b1a540 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nx-libs (2:3.5.0.10-0) unstable; urgency=low + + * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against + libpng 1.5.x. + * Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a + version found on etersoft.ru, fixes build on ia64 architecture. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:43:50 +0100 + nx-libs (2:3.5.0.9-0) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch new file mode 100644 index 0000000..a75c59b --- /dev/null +++ b/debian/patches/006_nxcomp_libpng15.full+lite.patch @@ -0,0 +1,43 @@ +Description: Fix building against libpng 1.5. + From the libpng homepage... + + The libpng 1.5.x series continues the evolution of the libpng API, + finally hiding the contents of the venerable and hoary png_struct and + png_info data structures inside private (i.e., non-installed) header + files. Instead of direct struct-access, applications should be using + the various png_get_xxx() and png_set_xxx() accessor functions, which + have existed for almost as long as libpng itself. (Apps that compiled + against libpng 1.4 without warnings about deprecated features should + happily compile against 1.5, too. +Forwarded: pending... +Author: Fedora packagers of NX +Last-Update: 2012-02-06 +--- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/debian/patches/008_nxcomp_sa_restorer.full+lite.patch b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch new file mode 100644 index 0000000..f1447cc --- /dev/null +++ b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch @@ -0,0 +1,46 @@ +Description: sa_restorer vs. memset + Use memset instead of setting sa_restorer to NULL. +Forwarded: pending +Author: Alexander Morozov +Last-Update: 2012-02-07 +--- a/nxcomp/Loop.cpp ++++ b/nxcomp/Loop.cpp +@@ -5884,20 +5884,9 @@ + + struct sigaction newAction; + +- newAction.sa_handler = HandleSignal; +- +- // +- // This field doesn't exist on most OSes except +- // Linux. We keep setting the field to NULL to +- // avoid side-effects in the case the field is +- // a value return. +- // ++ memset(&newAction, 0, sizeof(newAction)); + +- #if defined(__linux__) +- +- newAction.sa_restorer = NULL; +- +- #endif ++ newAction.sa_handler = HandleSignal; + + sigemptyset(&(newAction.sa_mask)); + +@@ -6509,13 +6498,9 @@ + + struct sigaction action; + +- action.sa_handler = HandleTimer; +- +- #if defined(__linux__) ++ memset(&action, 0, sizeof(action)); + +- action.sa_restorer = NULL; +- +- #endif ++ action.sa_handler = HandleTimer; + + sigemptyset(&action.sa_mask); + diff --git a/debian/patches/series b/debian/patches/series index d22f4b4..9133bf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,9 @@ 003_nxcompshad_gcc43.full.patch 004_nx-x11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch +006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch +008_nxcomp_sa_restorer.full+lite.patch 009_nxproxy-add-man-page.full+lite.patch 009_nxagent-add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.full.patch 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)).