diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2014-12-26 01:05:00 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2014-12-26 01:05:00 -0500 |
| commit | 5df16563107b262363c537e34a881d4841985ce0 (patch) | |
| tree | 077c3b02982f7e9212365d0034e737113d2577a6 /contrib | |
| parent | f2079c0e421b9b951f4e6c72bcdeded8b804f1df (diff) | |
| download | tigervnc-5df16563107b262363c537e34a881d4841985ce0.tar.gz tigervnc-5df16563107b262363c537e34a881d4841985ce0.zip | |
Removing unwanted commits from pull request
Oops, didn't realize these changes wre on the branch from an
old pull request.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/packages/rpm/el6/SOURCES/tigervnc-xorg115-glx-tls.patch | 11 | ||||
| -rw-r--r-- | contrib/packages/rpm/el6/SPECS/tigervnc.spec | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc-xorg115-glx-tls.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc-xorg115-glx-tls.patch deleted file mode 100644 index e290ffbf..00000000 --- a/contrib/packages/rpm/el6/SOURCES/tigervnc-xorg115-glx-tls.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/unix/xserver/configure.ac 2014-12-06 18:06:03.477010977 -0500 -+++ b/unix/xserver/configure.ac 2014-12-06 18:06:49.768005867 -0500 -@@ -1309,7 +1309,7 @@ - - if test "x$GLX_USE_TLS" = xyes ; then - GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" -- GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread" -+ GLX_SYS_LIBS="$GLX_SYS_LIBS -lglapi -lpthread" - fi - AC_SUBST([GLX_DEFINES]) - AC_SUBST([GLX_SYS_LIBS]) diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec index b326001e..d16a416c 100644 --- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec @@ -49,7 +49,6 @@ Patch4: tigervnc-cookie.patch Patch10: tigervnc11-ldnow.patch Patch11: tigervnc11-gethomedir.patch Patch16: tigervnc-xorg-manpages.patch -Patch17: tigervnc-xorg115-glx-tls.patch %description Virtual Network Computing (VNC) is a remote display system which @@ -161,7 +160,6 @@ patch -p1 -b --suffix .vnc < ../xserver115.patch popd %patch16 -p0 -b .man -%patch17 -p1 -b .glx %build %define tigervnc_src_dir %{_builddir}/%{name}-%{version}%{?snap:-%{snap}} |