diff options
author | Brian P. Hinz <bphinz@users.sf.net> | 2015-02-04 21:22:43 -0500 |
---|---|---|
committer | Brian P. Hinz <bphinz@users.sf.net> | 2015-02-04 21:22:43 -0500 |
commit | d0b30f2882560cea6d012cf8efe483af62dcd59f (patch) | |
tree | 723fc66130dc0f060c2212daf3993180e2e7887b /contrib | |
parent | 4e3e79dc7d06310cf056354dd789f5da1e17693a (diff) | |
download | tigervnc-d0b30f2882560cea6d012cf8efe483af62dcd59f.tar.gz tigervnc-d0b30f2882560cea6d012cf8efe483af62dcd59f.zip |
Fix fuzz in distro patches caused upstream changes
Diffstat (limited to 'contrib')
4 files changed, 4 insertions, 8 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..ac1a85f0 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 @@ -8,7 +8,7 @@ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) noinst_LTLIBRARIES = libvnccommon.la -@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I +@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now @@ -16,4 +16,3 @@ +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) EXTRA_DIST = Xvnc.man - 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..ac1a85f0 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 @@ -8,7 +8,7 @@ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) noinst_LTLIBRARIES = libvnccommon.la -@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I +@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now @@ -16,4 +16,3 @@ +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) EXTRA_DIST = Xvnc.man - diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch index fd07be3b..ea544387 100644 --- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch +++ b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch @@ -9,7 +9,7 @@ diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0 COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) noinst_LTLIBRARIES = libvnccommon.la -@@ -52,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I +@@ -52,6 +53,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now @@ -17,4 +17,3 @@ diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0 +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) EXTRA_DIST = Xvnc.man - diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch index 0a4252d9..53b4dc16 100644 --- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch +++ b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch @@ -9,7 +9,7 @@ diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2. COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) noinst_LTLIBRARIES = libvnccommon.la -@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I +@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now @@ -17,4 +17,3 @@ diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2. +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) EXTRA_DIST = Xvnc.man - |