-
Notifications
You must be signed in to change notification settings - Fork 175
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
630 additions
and
230 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| From 9281c763b3617e5a126012ae15f77ab2102448e4 Mon Sep 17 00:00:00 2001 | ||
| From: Alan Coopersmith <alan.coopersmith@sun.com> | ||
| Date: Fri, 30 Oct 2009 16:49:10 -0700 | ||
| Subject: [PATCH 1/2] Don't run configure for unused subdirs | ||
|
|
||
| Prevents configure from failing if nasm can't be found when it's | ||
| not needed because --with-system-jpeg was passed | ||
| --- | ||
| configure.ac | 10 ++++++---- | ||
| 1 files changed, 6 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git configure.ac configure.ac | ||
| index 50ebdb6..1f9786e 100644 | ||
| --- configure.ac | ||
| +++ configure.ac | ||
| @@ -10,8 +10,6 @@ BUILD=`date +%Y%m%d` | ||
| AC_CONFIG_AUX_DIR([.]) | ||
| AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) | ||
|
|
||
| -AC_CONFIG_SUBDIRS([common/jpeg common/zlib]) | ||
| - | ||
| AC_CONFIG_HEADERS([config.h]) | ||
|
|
||
| dnl Checks for programs. | ||
| @@ -192,7 +190,9 @@ AC_ARG_WITH([included-zlib], | ||
| [AC_SEARCH_LIBS([inflateEnd], [z], [], [INCLUDED_ZLIB=yes])]) | ||
|
|
||
| AM_CONDITIONAL([INCLUDED_ZLIB], [ test "x$INCLUDED_ZLIB" = xyes ]) | ||
| -AC_CONFIG_SUBDIRS([zlib]) | ||
| +if test "x$INCLUDED_ZLIB" = xyes ; then | ||
| + AC_CONFIG_SUBDIRS([common/zlib]) | ||
| +fi | ||
|
|
||
| dnl Check for libjpeg library | ||
| INCLUDED_JPEG=yes | ||
| @@ -204,7 +204,9 @@ AC_ARG_WITH([system-jpeg], | ||
| []) | ||
|
|
||
| AM_CONDITIONAL([INCLUDED_JPEG], [ test "x$INCLUDED_JPEG" = xyes ]) | ||
| -AC_CONFIG_SUBDIRS([jpeg]) | ||
| +if test "x$INCLUDED_JPEG" = xyes ; then | ||
| + AC_CONFIG_SUBDIRS([common/jpeg]) | ||
| +fi | ||
|
|
||
| AC_CHECK_FUNCS([vsnprintf snprintf strcasecmp strncasecmp]) | ||
|
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
36 changes: 36 additions & 0 deletions
36
components/x11/tigervnc/patches/16.signed-unsigned-mismatches.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| [Subset of upstream patch that applies to TigerVNC 1.1 and is needed to | ||
| silence Solaris Studio C++ compiler errors of: "TXWindow.cxx", line 93: | ||
| Error: Narrowing conversion of 'int' value to 'char' is not allowed here.] | ||
|
|
||
| From a9af1f12466e201fed5a72bbba2607fb55f7e042 Mon Sep 17 00:00:00 2001 | ||
| From: Pierre Ossman <ossman@cendio.se> | ||
| Date: Wed, 17 Jun 2015 10:47:28 +0200 | ||
| Subject: [PATCH] Fix some bad signed/unsigned mismatches | ||
|
|
||
| --- | ||
| common/rfb/VNCSConnectionST.h | 2 +- | ||
| unix/tx/TXWindow.cxx | 8 ++++---- | ||
| vncviewer/parameters.cxx | 4 ++-- | ||
| win/rfb_win32/SInput.cxx | 2 +- | ||
| 4 files changed, 8 insertions(+), 8 deletions(-) | ||
|
|
||
| diff --git unix/tx/TXWindow.cxx unix/tx/TXWindow.cxx | ||
| index 1f69702..a681917 100644 | ||
| --- unix/tx/TXWindow.cxx | ||
| +++ unix/tx/TXWindow.cxx | ||
| @@ -89,11 +89,11 @@ void TXWindow::init(Display* dpy, const char* defaultWindowClass_) | ||
| XSetFont(dpy, defaultGC, defaultFont); | ||
| XSelectInput(dpy, DefaultRootWindow(dpy), PropertyChangeMask); | ||
|
|
||
| - static char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06}; | ||
| - dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), dotBits, | ||
| + static unsigned char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06}; | ||
| + dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)dotBits, | ||
| dotSize, dotSize); | ||
| - static char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00}; | ||
| - tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), tickBits, | ||
| + static unsigned char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00}; | ||
| + tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)tickBits, | ||
| tickSize, tickSize); | ||
| defaultWindowClass = rfb::strDup(defaultWindowClass_); | ||
| } |
141 changes: 0 additions & 141 deletions
141
components/x11/tigervnc/patches/tigervnc11-xorg114.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.