]> source.dussan.org Git - tigervnc.git/commitdiff
projects / tigervnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de2df7e)
Remove no longer needed libos patches
authorPierre Ossman <ossman@cendio.se>
Thu, 30 Apr 2015 07:32:31 +0000 (09:32 +0200)
committerPierre Ossman <ossman@cendio.se>
Thu, 30 Apr 2015 07:32:31 +0000 (09:32 +0200)
This workaround is no longer needed as we've fixed the bad interaction
with libtool.

contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch [deleted file] patch | blob | history
contrib/packages/deb/ubuntu-precise/debian/patches/series patch | blob | history
contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch [deleted file] patch | blob | history
contrib/packages/deb/ubuntu-trusty/debian/patches/series patch | blob | history
contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch [deleted file] patch | blob | history
contrib/packages/rpm/el5/SPECS/tigervnc.spec patch | blob | history
contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch [deleted file] patch | blob | history
contrib/packages/rpm/el6/SPECS/tigervnc.spec patch | blob | history

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
deleted file mode 100644 (file)
index ac1a85f..0000000
--- a/contrib/packages/deb/ubuntu-precise/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-precise/debian/patches/series b/contrib/packages/deb/ubuntu-precise/debian/patches/series
index 51c53e88d752e1d9e7768d5eb5a666b20ef7db70..3a4ceba2ad8475a3b599eb79d6a371490a226218 100644 (file)
--- a/contrib/packages/deb/ubuntu-precise/debian/patches/series
+++ b/contrib/packages/deb/ubuntu-precise/debian/patches/series
@@ -6,5 +6,4 @@
 
 # Upstream patches
 504_tigervnc-cookie.patch
-511_tigervnc11-gethomedir.patch
 516_tigervnc-xorg-manpages.patch
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 (file)
index ac1a85f..0000000
--- 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 51c53e88d752e1d9e7768d5eb5a666b20ef7db70..3a4ceba2ad8475a3b599eb79d6a371490a226218 100644 (file)
--- 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
diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch
deleted file mode 100644 (file)
index ea54438..0000000
--- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir 2011-03-22 10:53:05.206429397 +0100
-+++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am    2011-03-22 10:53:30.550388457 +0100
-@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS)
- 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
-@@ -52,6 +53,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/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index f7cc0dbcfefb53db28be697195252c0453c6c7db..5b42386e2778fd4d81629ecb61f2ab66db6f00c7 100644 (file)
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -132,7 +132,6 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586
 
 # tigervnc patches
 Patch4: tigervnc-cookie.patch
-Patch11: tigervnc11-gethomedir.patch
 Patch12: tigervnc14-static-build-fixes.patch
 
 # fltk patches
diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch
deleted file mode 100644 (file)
index 53b4dc1..0000000
--- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir  2012-08-22 15:52:01.876216608 +0200
-+++ tigervnc-1.2.0/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/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 9754c085f63d6f23504cae9dab3943dbeebf26e9..41ed716fef023fa6fa05696b716813c2bf71f5a1 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -50,7 +50,6 @@ Provides: tightvnc = 1.5.0-0.15.20090204svn3586
 Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586
 
 Patch4: tigervnc-cookie.patch
-Patch11: tigervnc11-gethomedir.patch
 Patch16: tigervnc-xorg-manpages.patch
 
 %description
High performance, multi-platform VNC client and server: https://github.com/TigerVNC/tigervnc