From e5605485ddd16df2f932f8ed7024f2768eefd8ad Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 18 Jan 2019 15:42:46 +0100 Subject: Use Xorg source from distribution --- .../packages/deb/ubuntu-trusty/debian/changelog | 6 +++ contrib/packages/deb/ubuntu-trusty/debian/control | 2 +- .../deb/ubuntu-trusty/debian/get-orig-source.sh | 14 ------ .../debian/patches/100_rethrow_signals.patch | 26 ----------- .../patches/516_tigervnc-xorg-manpages.patch | 10 ----- .../debian/patches/debian_libtool.patch | 52 ---------------------- .../deb/ubuntu-trusty/debian/patches/series | 8 ---- contrib/packages/deb/ubuntu-trusty/debian/rules | 14 +++++- .../xorg-source-patches/100_rethrow_signals.patch | 26 +++++++++++ .../516_tigervnc-xorg-manpages.patch | 10 +++++ .../xorg-source-patches/debian_libtool.patch | 52 ++++++++++++++++++++++ 11 files changed, 107 insertions(+), 113 deletions(-) delete mode 100644 contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch delete mode 100644 contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch delete mode 100644 contrib/packages/deb/ubuntu-trusty/debian/patches/debian_libtool.patch delete mode 100644 contrib/packages/deb/ubuntu-trusty/debian/patches/series create mode 100644 contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/100_rethrow_signals.patch create mode 100644 contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch create mode 100644 contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch (limited to 'contrib/packages') diff --git a/contrib/packages/deb/ubuntu-trusty/debian/changelog b/contrib/packages/deb/ubuntu-trusty/debian/changelog index 28fc3c92..9d37a27a 100644 --- a/contrib/packages/deb/ubuntu-trusty/debian/changelog +++ b/contrib/packages/deb/ubuntu-trusty/debian/changelog @@ -1,3 +1,9 @@ +tigervnc (1.9.80-1) trusty; urgency=low + + * Build Xvnc against distro xorg sources. + + -- Pierre Ossman Fri, 18 Jan 2019 15:42:46 +0100 + tigervnc (1.3.0-3ubuntu1) precise; urgency=low * Build Xvnc against native upstream xorg sources, using native config diff --git a/contrib/packages/deb/ubuntu-trusty/debian/control b/contrib/packages/deb/ubuntu-trusty/debian/control index f1cf906a..480a3ca5 100644 --- a/contrib/packages/deb/ubuntu-trusty/debian/control +++ b/contrib/packages/deb/ubuntu-trusty/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Brian P. Hinz Standards-Version: 3.8.4 -Build-Depends: debhelper (>> 7.1), zlib1g-dev, libjpeg-turbo8-dev, libxaw7-dev (>> 4.1.0), perl-modules, xfonts-base, xutils-dev, libx11-dev, libxau-dev, libxext-dev, libxi-dev, libxkbfile-dev, libxmu-dev, libxt-dev, x11proto-core-dev, cmake (>> 2.8), libgnutls28-dev, libpam0g-dev, libpng-dev, automake, autoconf, libtool, pkg-config, libpixman-1-dev, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-damage-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fonts-dev, x11proto-gl-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-video-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, libosmesa6-dev, libgl1-mesa-dev, libgl1-mesa-dri, libgl1-mesa-glx, libxfont-dev, x11proto-record-dev, default-jdk, libxtst-dev, libxft-dev, libexpat1-dev, libfontconfig1-dev, libxrender-dev, libt1-dev, libpciaccess-dev, curl, bzip2, quilt, libglu1-mesa-dev, libxcursor-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, x11proto-dri3-dev, libgcrypt20-dev, x11proto-xcmisc-dev, x11proto-present-dev, libtasn1-dev +Build-Depends: debhelper (>> 7.1), zlib1g-dev, libjpeg-turbo8-dev, libxaw7-dev (>> 4.1.0), perl-modules, xfonts-base, xutils-dev, libx11-dev, libxau-dev, libxext-dev, libxi-dev, libxkbfile-dev, libxmu-dev, libxt-dev, x11proto-core-dev, cmake (>> 2.8), libgnutls28-dev, libpam0g-dev, libpng-dev, automake, autoconf, libtool, pkg-config, libpixman-1-dev, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-damage-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fonts-dev, x11proto-gl-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-video-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, libosmesa6-dev, libgl1-mesa-dev, libgl1-mesa-dri, libgl1-mesa-glx, libxfont-dev, x11proto-record-dev, default-jdk, libxtst-dev, libxft-dev, libexpat1-dev, libfontconfig1-dev, libxrender-dev, libt1-dev, libpciaccess-dev, curl, bzip2, quilt, libglu1-mesa-dev, libxcursor-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, x11proto-dri3-dev, libgcrypt20-dev, x11proto-xcmisc-dev, x11proto-present-dev, libtasn1-dev, xorg-server-source Homepage: http://www.tigervnc.com Package: tigervncserver diff --git a/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh b/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh index 64b26155..d79a7242 100755 --- a/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh +++ b/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh @@ -16,20 +16,6 @@ pushd fltk-* sh ../../debian/patch_fltk.sh find . -name "*.orig" -exec rm {} \; popd -curl -L -o xorg-server-1.11.4-0ubuntu10.3.tar.gz 'http://anonscm.debian.org/gitweb/?p=pkg-xorg/xserver/xorg-server.git;a=snapshot;h=cbf435a091906484112f5c4cf35b17738e779ce9;sf=tgz' -tar xzf xorg-server-*.tar.gz -rm xorg-server-*.tar.gz -pushd xorg-server-* -QUILT_PATCHES=debian/patches quilt push -a -popd -cp -r xorg-server-*/* unix/xserver -rm -rf xorg-server-* -pushd unix/xserver -for all in `find . -type f -perm -001`; do - chmod -x "$all" -done -patch -p1 -b --suffix .vnc < ../xserver111.patch -popd popd if [ -e tigervnc_1.3.80.orig.tar.gz ] ; then rm tigervnc_1.3.80.orig.tar.gz diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch deleted file mode 100644 index b40b1483..00000000 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:05:29.963390223 -0400 -+++ b/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:04:12.840357191 -0400 -@@ -250,7 +250,7 @@ - #if XORG < 111 - AbortDDX() - #else --AbortDDX(enum ExitCode error) -+SigAbortDDX(int signo, enum ExitCode error) - #endif - { - #if XORG < 111 -@@ -260,6 +260,14 @@ - #endif - } - -+#if XORG >= 111 -+void -+AbortDDX(enum ExitCode error) -+{ -+ SigAbortDDX(0, error); -+} -+#endif -+ - #ifdef __DARWIN__ - void - DarwinHandleGUI(int argc, char *argv[]) diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch deleted file mode 100644 index 4575f6a9..00000000 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/unix/xserver/man/Makefile.am 2013-03-30 17:51:01.707258746 -0400 -+++ b/unix/xserver/man/Makefile.am 2013-03-30 17:51:47.606569692 -0400 -@@ -2,5 +2,7 @@ - # (i.e. those handled in the os/utils.c options processing instead of in - # the DDX-level options processing) - -+if ENABLE_DOCS - include $(top_srcdir)/manpages.am - appman_PRE = Xserver.man -+endif ENABLE_DOCS diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/debian_libtool.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/debian_libtool.patch deleted file mode 100644 index 7be0ba2b..00000000 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/debian_libtool.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/ltmain.sh 2016-05-11 23:23:25.796742323 -0400 -+++ b/ltmain.sh 2016-05-11 23:24:47.173010324 -0400 -@@ -6447,6 +6447,9 @@ - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" -+ elif test "$linkmode" != prog && test "$linkmode" != lib; then -+ func_fatal_error "\`$lib' is not a convenience library" -+ fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -@@ -6457,9 +6460,6 @@ - fi - func_append tmp_libs " $deplib" - done -- elif test "$linkmode" != prog && test "$linkmode" != lib; then -- func_fatal_error "\`$lib' is not a convenience library" -- fi - continue - fi # $pass = conv - ---- a/m4/libtool.m4 2016-05-11 23:26:23.801328557 -0400 -+++ b/m4/libtool.m4 2016-05-11 23:27:12.701489603 -0400 -@@ -4589,9 +4589,6 @@ - ;; - esac - ;; -- linux* | k*bsd*-gnu | gnu*) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -4654,9 +4651,6 @@ - openbsd*) - with_gnu_ld=no - ;; -- linux* | k*bsd*-gnu | gnu*) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -5055,7 +5049,6 @@ - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -- _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/series b/contrib/packages/deb/ubuntu-trusty/debian/patches/series deleted file mode 100644 index b57b12ad..00000000 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/series +++ /dev/null @@ -1,8 +0,0 @@ -## Patches with a number < 100 are applied in debian. -## Ubuntu patches start with 100. - -# Ubuntu patches -100_rethrow_signals.patch - -# Upstream patches -516_tigervnc-xorg-manpages.patch diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules index ea9f1437..6c270a69 100755 --- a/contrib/packages/deb/ubuntu-trusty/debian/rules +++ b/contrib/packages/deb/ubuntu-trusty/debian/rules @@ -50,8 +50,18 @@ get-orig-source: $(SOURCE_NAME)_$(SOURCE_VERSION).orig.tar.gz $(SOURCE_NAME)_$(SOURCE_VERSION).orig.tar.gz: $(CURDIR)/get-orig-source.sh +# use xorg sources as shipped in xorg-server-source package +XORG_SOURCE_ARCHIVE = /usr/src/xorg-server.tar.xz + +xorg-source-stamp: $(XORG_SOURCE_ARCHIVE) + tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1 + cd unix/xserver && patch -p1 < ../xserver115.patch + patch -p1 < debian/xorg-source-patches/100_rethrow_signals.patch + patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch + touch xorg-source-stamp + configure: config-stamp -config-stamp: +config-stamp: xorg-source-stamp dh_testdir # Add here commands to configure the package. (cd fltk-*;DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \ @@ -65,7 +75,7 @@ config-stamp: (cd unix/xserver; \ export PIXMANINCDIR=/usr/include/pixman-1; \ autoreconf -fiv; \ - patch -p1 -i ../../debian/patches/debian_libtool.patch; \ + patch -p1 -i ../../debian/xorg-source-patches/debian_libtool.patch; \ ./configure --prefix=/usr \ --disable-silent-rules \ --disable-static \ diff --git a/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/100_rethrow_signals.patch b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/100_rethrow_signals.patch new file mode 100644 index 00000000..b40b1483 --- /dev/null +++ b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/100_rethrow_signals.patch @@ -0,0 +1,26 @@ +--- a/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:05:29.963390223 -0400 ++++ b/unix/xserver/hw/vnc/xvnc.c 2013-07-14 14:04:12.840357191 -0400 +@@ -250,7 +250,7 @@ + #if XORG < 111 + AbortDDX() + #else +-AbortDDX(enum ExitCode error) ++SigAbortDDX(int signo, enum ExitCode error) + #endif + { + #if XORG < 111 +@@ -260,6 +260,14 @@ + #endif + } + ++#if XORG >= 111 ++void ++AbortDDX(enum ExitCode error) ++{ ++ SigAbortDDX(0, error); ++} ++#endif ++ + #ifdef __DARWIN__ + void + DarwinHandleGUI(int argc, char *argv[]) diff --git a/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch new file mode 100644 index 00000000..4575f6a9 --- /dev/null +++ b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch @@ -0,0 +1,10 @@ +--- a/unix/xserver/man/Makefile.am 2013-03-30 17:51:01.707258746 -0400 ++++ b/unix/xserver/man/Makefile.am 2013-03-30 17:51:47.606569692 -0400 +@@ -2,5 +2,7 @@ + # (i.e. those handled in the os/utils.c options processing instead of in + # the DDX-level options processing) + ++if ENABLE_DOCS + include $(top_srcdir)/manpages.am + appman_PRE = Xserver.man ++endif ENABLE_DOCS diff --git a/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch new file mode 100644 index 00000000..7be0ba2b --- /dev/null +++ b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch @@ -0,0 +1,52 @@ +--- a/ltmain.sh 2016-05-11 23:23:25.796742323 -0400 ++++ b/ltmain.sh 2016-05-11 23:24:47.173010324 -0400 +@@ -6447,6 +6447,9 @@ + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" ++ elif test "$linkmode" != prog && test "$linkmode" != lib; then ++ func_fatal_error "\`$lib' is not a convenience library" ++ fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +@@ -6457,9 +6460,6 @@ + fi + func_append tmp_libs " $deplib" + done +- elif test "$linkmode" != prog && test "$linkmode" != lib; then +- func_fatal_error "\`$lib' is not a convenience library" +- fi + continue + fi # $pass = conv + +--- a/m4/libtool.m4 2016-05-11 23:26:23.801328557 -0400 ++++ b/m4/libtool.m4 2016-05-11 23:27:12.701489603 -0400 +@@ -4589,9 +4589,6 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu | gnu*) +- _LT_TAGVAR(link_all_deplibs, $1)=no +- ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -4654,9 +4651,6 @@ + openbsd*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu | gnu*) +- _LT_TAGVAR(link_all_deplibs, $1)=no +- ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -5055,7 +5049,6 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi +- _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then -- cgit v1.2.3