Hello community, here is the log from the commit of package NX checked in at Wed May 2 10:40:17 CEST 2007. -------- --- NX/NX.changes 2007-04-11 18:31:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/NX/NX.changes 2007-05-02 10:17:08.829559000 +0200 @@ -1,0 +2,5 @@ +Wed May 2 10:15:51 CEST 2007 - sndirsch@suse.de + +- updated NX to 2.1.0 (Bug #203197) + +------------------------------------------------------------------- Old: ---- nxagent-1.5.0-112.tar.gz nxcomp-1.5.0-80.tar.gz nxcompext-1.5.0-20.tar.gz nxdesktop-1.5.0-78.tar.gz nxproxy-1.5.0-9.tar.gz nxscripts-1.5.0-11.tar.gz nxviewer-1.5.0-15.tar.gz nx-X11-1.5.0-21.tar.gz New: ---- nxagent-2.1.0-20.tar.gz nxcomp-2.1.0-8.tar.gz nxcompext-2.1.0-5.tar.gz nxdesktop-2.1.0-10.tar.gz nxproxy-2.1.0-3.tar.gz nxscripts-2.1.0-5.tar.gz nxviewer-2.1.0-12.tar.gz nx-X11-2.1.0-3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.g20286/_old 2007-05-02 10:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.g20286/_new 2007-05-02 10:39:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package NX (Version 1.5.0) +# spec file for package NX (Version 2.1.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -24,22 +24,22 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other uncritical OpenSource License URL: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 -Version: 1.5.0 -Release: 90 +Version: 2.1.0 +Release: 1 Summary: Proxy System for X11 #Compression Libraries and Proxy Sources -Source: nxproxy-%{version}-9.tar.gz -Source1: nxcomp-%{version}-80.tar.gz -Source2: nxcompext-%{version}-20.tar.gz +Source: nxproxy-%{version}-3.tar.gz +Source1: nxcomp-%{version}-8.tar.gz +Source2: nxcompext-%{version}-5.tar.gz #X11 Support Libraries and Agent Sources -Source5: nx-X11-%{version}-21.tar.gz -Source6: nxagent-%{version}-112.tar.gz +Source5: nx-X11-%{version}-3.tar.gz +Source6: nxagent-%{version}-20.tar.gz #RFB Agent Sources -Source10: nxviewer-%{version}-15.tar.gz +Source10: nxviewer-%{version}-12.tar.gz #RDP Agent Sources -Source11: nxdesktop-%{version}-78.tar.gz +Source11: nxdesktop-%{version}-10.tar.gz #NX Example Scripts -Source14: nxscripts-%{version}-11.tar.gz +Source14: nxscripts-%{version}-5.tar.gz Source15: nxagent Source16: docs.tar.bz2 Patch: NX.diff @@ -139,7 +139,7 @@ if ls /usr/X11R6/%_lib/libXp.so*; then cp -a /usr/X11R6/%_lib/libXp.so* nx-X11/exports/lib/ fi -for dir in nxviewer/nxviewer nxviewer/nxpasswd; do +for dir in nxviewer/libvncauth nxviewer/nxviewer nxviewer/nxpasswd; do pushd $dir; xmkmf -a; make 2> /dev/null; popd done # build RDP Agent @@ -249,6 +249,8 @@ /usr/share/NX/keymaps-windows/ %changelog +* Wed May 02 2007 - sndirsch@suse.de +- updated NX to 2.1.0 (Bug #203197) * Wed Apr 11 2007 - sndirsch@suse.de - no longer mark nx-X11 tarball as NoSource (Bug #263352) * Thu Jan 25 2007 - sndirsch@suse.de ++++++ NX-1.5.diff ++++++ --- /var/tmp/diff_new_pack.g20286/_old 2007-05-02 10:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.g20286/_new 2007-05-02 10:39:50.000000000 +0200 @@ -1,21 +1,3 @@ ---- nxdesktop/xwin.c.orig 2005-04-28 23:20:14.000000000 +0200 -+++ nxdesktop/xwin.c 2005-04-28 23:34:13.000000000 +0200 -@@ -5514,6 +5514,7 @@ - error("update_rdp_windows: RDP Window ID not found.\n"); - } - -+#if 0 - NXCLIPPER_WINDOWS - get_rdp_windows(unsigned int id) - { -@@ -5528,6 +5529,7 @@ - } - error("get_rdp_windows: RDP window id not found.\n"); - } -+#endif - - static void - fwindow_process(STREAM s) --- nxcomp.orig/Loop.cpp 2005-04-29 10:52:44.443831623 +0200 +++ nxcomp/Loop.cpp 2005-04-29 10:54:59.762105128 +0200 @@ -4919,7 +4919,7 @@ ++++++ nxagent-1.5.0-112.tar.gz -> nxagent-2.1.0-20.tar.gz ++++++ ++++ 66668 lines of diff (skipped) ++++++ nxcomp-1.5.0-80.tar.gz -> nxcomp-2.1.0-8.tar.gz ++++++ ++++ 84544 lines of diff (skipped) ++++++ nxcompext-1.5.0-20.tar.gz -> nxcompext-2.1.0-5.tar.gz ++++++ ++++ 15502 lines of diff (skipped) ++++++ nxdesktop-1.5.0-78.tar.gz -> nxdesktop-2.1.0-10.tar.gz ++++++ ++++ 77860 lines of diff (skipped) ++++++ NX.diff ++++++ --- /var/tmp/diff_new_pack.g20286/_old 2007-05-02 10:39:54.000000000 +0200 +++ /var/tmp/diff_new_pack.g20286/_new 2007-05-02 10:39:54.000000000 +0200 @@ -62,14 +62,3 @@ dnl Reset default linking directives. ---- nxcompext/Png.c.orig 2005-12-11 12:24:03.998148507 +0100 -+++ nxcompext/Png.c 2005-12-11 12:24:19.486432925 +0100 -@@ -487,7 +487,7 @@ - - static void PngWriteData(png_structp png_ptr, png_bytep data, png_size_t length) - { -- memcpy(((char*)png_get_io_ptr(png_ptr) + pngDataLen), data,length); //insecure? -+ memcpy(((char*)png_get_io_ptr(png_ptr) + pngDataLen), data,length); /* insecure? */ - pngDataLen += length; - } - ++++++ nxproxy-1.5.0-9.tar.gz -> nxproxy-2.1.0-3.tar.gz ++++++ ++++ 5017 lines of diff (skipped) ++++++ nxscripts-1.5.0-11.tar.gz -> nxscripts-2.1.0-5.tar.gz ++++++ ++++ 2339 lines of diff (skipped) ++++++ nxviewer-1.5.0-15.tar.gz -> nxviewer-2.1.0-12.tar.gz ++++++ ++++ 27997 lines of diff (skipped) ++++++ nx-X11-1.5.0-21.tar.gz -> nx-X11-2.1.0-3.tar.gz ++++++ NX/nx-X11-1.5.0-21.tar.gz /mounts/work_src_done/STABLE/NX/nx-X11-2.1.0-3.tar.gz differ: byte 5, line 1 ++++++ xorg7.diff ++++++ --- /var/tmp/diff_new_pack.g20286/_old 2007-05-02 10:39:55.000000000 +0200 +++ /var/tmp/diff_new_pack.g20286/_new 2007-05-02 10:39:55.000000000 +0200 @@ -1,49 +1,3 @@ -diff -u -r nx-X11/programs/Xserver/hw/nxagent.orig/Font.c nx-X11/programs/Xserver/hw/nxagent/Font.c ---- nx-X11/programs/Xserver/hw/nxagent.orig/Font.c 2005-12-12 17:51:51.000000000 +0100 -+++ nx-X11/programs/Xserver/hw/nxagent/Font.c 2006-08-11 22:57:24.000000000 +0200 -@@ -61,7 +61,7 @@ - #undef DEBUG - - #define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts" --#define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts" -+#define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/fonts" - - #define NXAGENT_DEFAULT_FONT_PATH \ - "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ -@@ -69,9 +69,9 @@ - /usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/" - - #define NXAGENT_ALTERNATE_FONT_PATH \ --"/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\ --/usr/share/X11/fonts/Type1/,/usr/share/X11/fonts/75dpi/,\ --/usr/share/X11/fonts/100dpi/,/usr/share/X11/fonts/TTF/" -+"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ -+/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\ -+/usr/share/fonts/100dpi/" - - #undef NXAGENT_FONTCACHE_DEBUG - #undef NXAGENT_RECONNECT_FONT_DEBUG -@@ -1021,7 +1021,7 @@ - else if (stat(NXAGENT_ALTERNATE_FONT_DIR, &dirStat) == 0) - { - /* -- * Let's use the new "/usr/share/X11/fonts" path. -+ * Let's use the new "/usr/share/fonts" path. - */ - - #ifdef TEST -diff -u -r nx-X11/programs/Xserver/hw/nxagent.orig/Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c ---- nx-X11/programs/Xserver/hw/nxagent.orig/Keyboard.c 2005-11-21 13:12:39.000000000 +0100 -+++ nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 2006-08-11 22:57:24.000000000 +0200 -@@ -110,7 +110,7 @@ - ); - - #ifndef XKB_BASE_DIRECTORY --#define XKB_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb/" -+#define XKB_BASE_DIRECTORY "/usr/share/X11/xkb/" - #endif - #ifndef XKB_CONFIG_FILE - #define XKB_CONFIG_FILE "X0-config.keyboard" diff -u -r nx-X11/lib/X11.orig/Imakefile nx-X11/lib/X11/Imakefile --- nx-X11/lib/X11.orig/Imakefile 2006-08-11 23:02:44.000000000 +0200 +++ nx-X11/lib/X11/Imakefile 2006-08-11 23:06:22.000000000 +0200 @@ -58,27 +12,6 @@ CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\" #if HasSnprintf MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11 -diff -u -r nx-X11.old/programs/Xserver/hw/nxagent/Font.c nx-X11/programs/Xserver/hw/nxagent/Font.c ---- nx-X11.old/programs/Xserver/hw/nxagent/Font.c 2006-09-04 14:33:40.000000000 +0200 -+++ nx-X11/programs/Xserver/hw/nxagent/Font.c 2006-09-04 14:35:35.000000000 +0200 -@@ -60,13 +60,13 @@ - #undef TEST - #undef DEBUG - --#define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts" -+#define NXAGENT_DEFAULT_FONT_DIR "/usr/share/fonts" - #define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/fonts" - - #define NXAGENT_DEFAULT_FONT_PATH \ --"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ --/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ --/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/" -+"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ -+/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\ -+/usr/share/fonts/100dpi/" - - #define NXAGENT_ALTERNATE_FONT_PATH \ - "/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ diff -u -r nx-X11/programs/Xserver.old/hw/xnest/Keyboard.c nx-X11/programs/Xserver/hw/xnest/Keyboard.c --- nx-X11/programs/Xserver.old/hw/xnest/Keyboard.c 2006-12-18 16:09:03.000000000 +0100 +++ nx-X11/programs/Xserver/hw/xnest/Keyboard.c 2006-12-18 16:12:03.000000000 +0100 @@ -97,7 +30,7 @@ @@ -51,7 +51,7 @@ LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) + DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) $(NX_DEFINES) -XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE) +XKB_DEFINES = $(XKB_DISABLE) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org