From 3744795d3c3b526cd2438b6e9423f8f09b372db1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 11 Jan 2012 15:31:11 +0100 Subject: Rename nxagent-unbrand patch, so that is the last patch to be applied (999_). --- debian/changelog | 7 +++ debian/patches/200_nxagent_unbrand-agent.patch | 61 -------------------------- debian/patches/999_nxagent_unbrand-agent.patch | 61 ++++++++++++++++++++++++++ debian/patches/series | 2 +- 4 files changed, 69 insertions(+), 62 deletions(-) delete mode 100644 debian/patches/200_nxagent_unbrand-agent.patch create mode 100644 debian/patches/999_nxagent_unbrand-agent.patch diff --git a/debian/changelog b/debian/changelog index e0e37b73f..08d152600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.0.2-1) UNRELEASED; urgency=low + + * Rename nxagent-unbrand patch, so that is the last patch to be applied + (999_). + + -- Mike Gabriel Wed, 11 Jan 2012 15:30:36 +0100 + nx-libs (2:3.5.0.2-0) unstable; urgency=low * Re-add binary wrapper scripts to the patch system as we diff --git a/debian/patches/200_nxagent_unbrand-agent.patch b/debian/patches/200_nxagent_unbrand-agent.patch deleted file mode 100644 index c9aea0496..000000000 --- a/debian/patches/200_nxagent_unbrand-agent.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: Unbrand NX Agent Startup Screen - By design this patch is probably not interesting to - NX upstream. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1754,7 +1754,20 @@ - #ifdef TEST - fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", - nxagentDefaultWindows[pScreen->myNum]); -+ -+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", -+ nxagentDefaultWindows[pScreen->myNum]); - #endif -+ -+ XClassHint hint; -+ hint.res_name=malloc(strlen(HINT)+1); -+ hint.res_class=malloc(strlen(HINT)+1); -+ strcpy(hint.res_name,HINT); -+ strcpy(hint.res_class,HINT); -+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); -+ free(hint.res_name); -+ free(hint.res_class); -+ - - if (nxagentOption(Fullscreen)) - { ---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h -@@ -36,6 +36,8 @@ - #define MIN_NXAGENT_HEIGHT 60 - #define NXAGENT_FRAME_WIDTH 2000 - -+#define HINT "NXAgent" -+ - #define nxagentSetPrintGeometry(screen) \ - nxagentPrintGeometryFlags = (1 << (screen)); - ---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c -@@ -204,6 +204,7 @@ - - nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth); - -+ return; - if (!nxagentPixmapLogo) - { - return; ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -1919,7 +1919,7 @@ - XlibPixmap IconPixmap; - XlibPixmap IconShape; - -- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); -+ snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME); - - if ((icon_fp = fopen(default_path, "r")) == NULL) - { diff --git a/debian/patches/999_nxagent_unbrand-agent.patch b/debian/patches/999_nxagent_unbrand-agent.patch new file mode 100644 index 000000000..c9aea0496 --- /dev/null +++ b/debian/patches/999_nxagent_unbrand-agent.patch @@ -0,0 +1,61 @@ +Description: Unbrand NX Agent Startup Screen + By design this patch is probably not interesting to + NX upstream. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2012-12-31 +--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c +@@ -1754,7 +1754,20 @@ + #ifdef TEST + fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", + nxagentDefaultWindows[pScreen->myNum]); ++ ++ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", ++ nxagentDefaultWindows[pScreen->myNum]); + #endif ++ ++ XClassHint hint; ++ hint.res_name=malloc(strlen(HINT)+1); ++ hint.res_class=malloc(strlen(HINT)+1); ++ strcpy(hint.res_name,HINT); ++ strcpy(hint.res_class,HINT); ++ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); ++ free(hint.res_name); ++ free(hint.res_class); ++ + + if (nxagentOption(Fullscreen)) + { +--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h +@@ -36,6 +36,8 @@ + #define MIN_NXAGENT_HEIGHT 60 + #define NXAGENT_FRAME_WIDTH 2000 + ++#define HINT "NXAgent" ++ + #define nxagentSetPrintGeometry(screen) \ + nxagentPrintGeometryFlags = (1 << (screen)); + +--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c +@@ -204,6 +204,7 @@ + + nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth); + ++ return; + if (!nxagentPixmapLogo) + { + return; +--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c +@@ -1919,7 +1919,7 @@ + XlibPixmap IconPixmap; + XlibPixmap IconShape; + +- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); ++ snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME); + + if ((icon_fp = fopen(default_path, "r")) == NULL) + { diff --git a/debian/patches/series b/debian/patches/series index a02a19b21..817580538 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -29,4 +29,4 @@ 108_nxagent_wine-close-delay.patch 109_nxagent_locale-utf8-compound-text.patch 110_nxagent_createpixmap-bounds-check.patch -200_nxagent_unbrand-agent.patch +999_nxagent_unbrand-agent.patch -- cgit v1.2.3