components/x11/tigervnc/patches/04.vnc-nobuildtime.patch

   1 Remove buildtime from binaries to avoid unnecessary change in ELF data.
   2
   3 diff --git unix/vncconfig/buildtime.c unix/vncconfig/buildtime.c
   4 index 3f4c369..2e34d4c 100644
   5 --- unix/vncconfig/buildtime.c
   6 +++ unix/vncconfig/buildtime.c
   7 @@ -15,4 +15,3 @@
   8   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   9   * USA.
  10   */
  11 -char buildtime[] = __DATE__ " " __TIME__;
  12 diff --git a/unix/vncviewer/AboutDialog.h b/unix/vncviewer/AboutDialog.h
  13 index ff7290a..ca6eef1 100644
  14 --- unix/vncviewer/AboutDialog.h
  15 +++ unix/vncviewer/AboutDialog.h
  16 @@ -30,7 +30,6 @@
  17  #define gettext_noop(String) String
  18  #define N_(String) gettext_noop (String)
  19
  20 -extern char buildtime[];
  21
  22  class AboutDialog : public TXMsgBox {
  23  public:
  24 diff --git a/unix/vncviewer/InfoDialog.h b/unix/vncviewer/InfoDialog.h
  25 index a95f57b..ffa9531 100644
  26 --- unix/vncviewer/InfoDialog.h
  27 +++ unix/vncviewer/InfoDialog.h
  28 @@ -26,7 +26,6 @@
  29  #include "TXLabel.h"
  30  #include "TXButton.h"
  31
  32 -extern char buildtime[];
  33
  34  class InfoDialog : public TXDialog, public TXButtonCallback {
  35  public:
  36 diff --git a/unix/vncviewer/buildtime.c b/unix/vncviewer/buildtime.c
  37 index 3f4c369..2e34d4c 100644
  38 --- unix/vncviewer/buildtime.c
  39 +++ unix/vncviewer/buildtime.c
  40 @@ -15,4 +15,3 @@
  41   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  42   * USA.
  43   */
  44 -char buildtime[] = __DATE__ " " __TIME__;
  45 diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
  46 index e418267..a4326bc 100644
  47 --- unix/vncviewer/vncviewer.cxx
  48 +++ unix/vncviewer/vncviewer.cxx
  49 @@ -131,7 +131,6 @@ IntParameter qualityLevel("QualityLevel",
  50
  51  char aboutText[1024];
  52  char* programName;
  53 -extern char buildtime[];
  54
  55  static void CleanupSignalHandler(int sig)
  56  {
  57 @@ -273,7 +272,7 @@ int main(int argc, char** argv)
  58    bindtextdomain(PACKAGE_NAME, LOCALEDIR);
  59    textdomain(PACKAGE_NAME);
  60
  61 -  const char englishAbout[] = N_("TigerVNC Viewer for X version %s - built %s\n"
  62 +  const char englishAbout[] = N_("TigerVNC Viewer for X version %s\n"
  63                                  "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
  64                                  "See http://www.tigervnc.org for information on TigerVNC.");
  65
  66 @@ -281,7 +280,7 @@ int main(int argc, char** argv)
  67
  68    // Write about text to console, still using normal locale codeset
  69    snprintf(aboutText, sizeof(aboutText),
  70 -          gettext(englishAbout), PACKAGE_VERSION, buildtime);
  71 +          gettext(englishAbout), PACKAGE_VERSION);
  72    fprintf(stderr,"\n%s\n", aboutText);
  73
  74    // Set gettext codeset to what our GUI toolkit uses. Since we are
  75 @@ -292,7 +291,7 @@ int main(int argc, char** argv)
  76
  77    // Re-create the aboutText for the GUI, now using GUI codeset
  78    snprintf(aboutText, sizeof(aboutText),
  79 -          gettext(englishAbout), PACKAGE_VERSION, buildtime);
  80 +          gettext(englishAbout), PACKAGE_VERSION);
  81
  82    rfb::initStdIOLoggers();
  83    rfb::LogWriter::setLogParams("*:stderr:30");
  84 diff --git a/unix/x0vncserver/buildtime.c b/unix/x0vncserver/buildtime.c
  85 index a96031c..60f511c 100644
  86 --- unix/x0vncserver/buildtime.c
  87 +++ unix/x0vncserver/buildtime.c
  88 @@ -15,4 +15,3 @@
  89   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  90   * USA.
  91   */
  92 -char buildtime[] = __DATE__ " " __TIME__;
  93 diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
  94 index 64fbe68..be55fa7 100644
  95 --- unix/x0vncserver/x0vncserver.cxx
  96 +++ unix/x0vncserver/x0vncserver.cxx
  97 @@ -53,8 +53,6 @@
  98  #include <sys/proto.h>
  99  #endif
 100
 101 -extern char buildtime[];
 102 -
 103  using namespace rfb;
 104  using namespace network;
 105
 106 @@ -369,8 +367,7 @@ char* programName;
 107
 108  static void printVersion(FILE *fp)
 109  {
 110 -  fprintf(fp, "TigerVNC Server version %s, built %s\n",
 111 -          PACKAGE_VERSION, buildtime);
 112 +  fprintf(fp, "TigerVNC Server version %s\n", PACKAGE_VERSION);
 113  }
 114
 115  static void usage()
 116 diff --git a/unix/xserver/hw/vnc/buildtime.c b/unix/xserver/hw/vnc/buildtime.c
 117 index 3f4c369..2e34d4c 100644
 118 --- unix/xserver/hw/vnc/buildtime.c
 119 +++ unix/xserver/hw/vnc/buildtime.c
 120 @@ -15,4 +15,3 @@
 121   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
 122   * USA.
 123   */
 124 -char buildtime[] = __DATE__ " " __TIME__;
 125 diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
 126 index 5d34f01..f6d6ba7 100644
 127 --- unix/xserver/hw/vnc/xvnc.cc
 128 +++ unix/xserver/hw/vnc/xvnc.cc
 129 @@ -80,7 +80,6 @@ extern "C" {
 130  #include "randrstr.h"
 131  #endif /* RANDR */
 132  #include <X11/keysym.h>
 133 -  extern char buildtime[];
 134  #if XORG >= 17
 135  #undef VENDOR_RELEASE
 136  #undef VENDOR_STRING
 137 @@ -267,7 +266,7 @@ void ddxBeforeReset(void)
 138  void
 139  ddxUseMsg()
 140  {
 141 -    ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
 142 +    ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT);
 143      ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
 144             VENDOR_STRING);
 145      ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
 146 @@ -1290,7 +1289,7 @@ static void vfbClientStateChange(CallbackListPtr*, pointer, pointer) {
 147  void
 148  InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 149  {
 150 -  ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
 151 +  ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT);
 152    ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
 153           VENDOR_STRING);
 154      int i;