diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-04-30 09:32:31 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-04-30 09:32:31 +0200 |
| commit | bc845d92c1c9f4d14b235245cf86b83ed5f0f0fb (patch) | |
| tree | f364eef9daf620acd7b4ed374976da8bf7184aff /contrib/packages/deb/ubuntu-trusty | |
| parent | de2df7e60041ce5d19d19e558579775ae97c532e (diff) | |
| download | tigervnc-bc845d92c1c9f4d14b235245cf86b83ed5f0f0fb.tar.gz tigervnc-bc845d92c1c9f4d14b235245cf86b83ed5f0f0fb.zip | |
Remove no longer needed libos patches
This workaround is no longer needed as we've fixed the bad interaction
with libtool.
Diffstat (limited to 'contrib/packages/deb/ubuntu-trusty')
| -rw-r--r-- | contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch | 18 | ||||
| -rw-r--r-- | contrib/packages/deb/ubuntu-trusty/debian/patches/series | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch deleted file mode 100644 index ac1a85f0..00000000 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:01.876216608 +0200 -+++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:45.973143684 +0200 -@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la - RDR_LIB=$(LIB_DIR)/rdr/librdr.la - NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la - XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la -+OS_LIB=$(LIB_DIR)/os/libos.la - COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - - noinst_LTLIBRARIES = libvnccommon.la -@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I - - libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now - --libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) -+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) - - EXTRA_DIST = Xvnc.man diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/series b/contrib/packages/deb/ubuntu-trusty/debian/patches/series index 51c53e88..3a4ceba2 100644 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/series +++ b/contrib/packages/deb/ubuntu-trusty/debian/patches/series @@ -6,5 +6,4 @@ # Upstream patches 504_tigervnc-cookie.patch -511_tigervnc11-gethomedir.patch 516_tigervnc-xorg-manpages.patch |