diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2014-12-26 01:47:47 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2014-12-26 02:00:52 -0500 |
| commit | e957b6a10bf7f4974317356638dda4ede8cdb7ff (patch) | |
| tree | aebac00d17b170ffd6a78d6966eeece058145fc6 | |
| parent | f882232f81c270eee49c673b69b1797bdd6fb2f7 (diff) | |
| download | tigervnc-e957b6a10bf7f4974317356638dda4ede8cdb7ff.tar.gz tigervnc-e957b6a10bf7f4974317356638dda4ede8cdb7ff.zip | |
Update distro patches after 2b76d02
Cleanup distribution patches in 1.4 branch to account for 2b76d02
without fuzz.
(cherry picked from commit 6e00f1149073dd30a31142e9a23bf16f9feb9d3c)
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch b/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch index 208608c6..3aa803b3 100644 --- a/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch +++ b/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch @@ -7,7 +7,7 @@ +OS_LIB=$(LIB_DIR)/os/libos.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - noinst_LTLIBRARIES = libvnccommon.la + # Hack to get the C headers to work when included from C++ code @@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now 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 index 208608c6..3aa803b3 100644 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch +++ b/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch @@ -7,7 +7,7 @@ +OS_LIB=$(LIB_DIR)/os/libos.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - noinst_LTLIBRARIES = libvnccommon.la + # Hack to get the C headers to work when included from C++ code @@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch index fd07be3b..05a35877 100644 --- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch +++ b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch @@ -8,7 +8,7 @@ diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0 +OS_LIB=$(LIB_DIR)/os/libos.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - noinst_LTLIBRARIES = libvnccommon.la + # Hack to get the C headers to work when included from C++ code @@ -52,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch index 0a4252d9..1ac9f44b 100644 --- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch +++ b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch @@ -8,7 +8,7 @@ diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2. +OS_LIB=$(LIB_DIR)/os/libos.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - noinst_LTLIBRARIES = libvnccommon.la + # Hack to get the C headers to work when included from C++ code @@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now |