--- xserver-xorg-input-libinput-0.26.0.orig/ChangeLog +++ xserver-xorg-input-libinput-0.26.0/ChangeLog @@ -60,9 +60,6 @@ Signed-off-by: Peter Hutterer -Notes (test-jelly): - SUCCESS: jelly: make check Mon May 15 11:42:39 AEST 2017 - commit 8772a593b45740f4429218648c9e3a305b3fe896 Author: Martin Kepplinger Date: Thu May 4 08:49:34 2017 +0200 @@ -127,7 +124,7 @@ Compiled with -O0: Breakpoint 1, test_nonzero_x_linear () at test-bezier.c:157 - 157 assert(bezier[x] > bezier[x-1]); + 157 assert(bezier[x] > bezier[x-1]); (gdb) p bezier $6 = {0 , 1, 2, 4, 5, 7, 9, 10, 12, 14, 15, 17, 19, 21, 22, --- xserver-xorg-input-libinput-0.26.0.orig/Makefile.in +++ xserver-xorg-input-libinput-0.26.0/Makefile.in @@ -388,6 +388,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -685,7 +686,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 @@ -710,7 +711,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -728,7 +729,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -738,7 +739,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac --- xserver-xorg-input-libinput-0.26.0.orig/aclocal.m4 +++ xserver-xorg-input-libinput-0.26.0/aclocal.m4 @@ -744,7 +744,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2881,9 +2880,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2892,7 +2888,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2904,6 +2900,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3563,7 +3571,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4441,7 +4449,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4953,6 +4961,9 @@ ;; 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' ;; @@ -5015,6 +5026,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5269,7 +5283,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5790,6 +5804,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5811,7 +5826,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9052,9 +9067,9 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) - +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -9095,7 +9110,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -9328,74 +9343,6 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES - dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. @@ -9820,13 +9767,24 @@ fi]) # Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" EOF AS_IF([test "$have_xmlto" = yes], [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], [have_xmlto_text=yes], - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) + [# Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" + +EOF + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) rm -f conftest.xml AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) --- xserver-xorg-input-libinput-0.26.0.orig/autogen.sh +++ xserver-xorg-input-libinput-0.26.0/autogen.sh @@ -0,0 +1,17 @@ +#! /bin/sh + +srcdir=`dirname "$0"` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd "$srcdir" + +autoreconf -v --install || exit 1 +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xf86-input-libinput" + +if test -z "$NOCONFIGURE"; then + exec "$srcdir"/configure "$@" +fi --- xserver-xorg-input-libinput-0.26.0.orig/config.sub +++ xserver-xorg-input-libinput-0.26.0/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-09-05' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -301,6 +301,7 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -428,6 +429,7 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -1038,7 +1040,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown @@ -1407,7 +1409,7 @@ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- xserver-xorg-input-libinput-0.26.0.orig/configure +++ xserver-xorg-input-libinput-0.26.0/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-input-libinput 0.26.0. +# Generated by GNU Autoconf 2.69 for xf86-input-libinput 0.24.0. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-libinput' PACKAGE_TARNAME='xf86-input-libinput' -PACKAGE_VERSION='0.26.0' -PACKAGE_STRING='xf86-input-libinput 0.26.0' +PACKAGE_VERSION='0.24.0' +PACKAGE_STRING='xf86-input-libinput 0.24.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -761,6 +761,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -854,6 +855,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1106,6 +1108,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1243,7 +1254,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1356,7 +1367,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-input-libinput 0.26.0 to adapt to many kinds of systems. +\`configure' configures xf86-input-libinput 0.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,6 +1407,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1427,7 +1439,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-libinput 0.26.0:";; + short | recursive ) echo "Configuration of xf86-input-libinput 0.24.0:";; esac cat <<\_ACEOF @@ -1561,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-libinput configure 0.26.0 +xf86-input-libinput configure 0.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1885,7 +1897,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-libinput $as_me 0.26.0, which was +It was created by xf86-input-libinput $as_me 0.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2753,7 +2765,7 @@ # Define the identity of the package. PACKAGE='xf86-input-libinput' - VERSION='0.26.0' + VERSION='0.24.0' cat >>confdefs.h <<_ACEOF @@ -5227,7 +5239,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8886,6 +8898,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9140,7 +9155,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9810,6 +9825,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -9831,7 +9847,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10926,9 +10942,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -10937,7 +10950,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10949,6 +10962,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -19030,7 +19055,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-libinput $as_me 0.26.0, which was +This file was extended by xf86-input-libinput $as_me 0.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19096,7 +19121,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-input-libinput config.status 0.26.0 +xf86-input-libinput config.status 0.24.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20220,7 +20245,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. --- xserver-xorg-input-libinput-0.26.0.orig/debian/README.source +++ xserver-xorg-input-libinput-0.26.0/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-input-libinput-0.26.0.orig/debian/autoreconf.after +++ xserver-xorg-input-libinput-0.26.0/debian/autoreconf.after @@ -0,0 +1,45 @@ +f32edfea91a86edcbb7da9fb63e9149b ./config.sub +f655f28fb487a50b28f460a43c0323ae ./Makefile.am +386223c42821864f26fd0782d357d513 ./depcomp +edbcaf917b678b3f00e4fff2608f71c3 ./ltmain.sh +5f2a276ee7b8decec541391229d03591 ./missing +a7a09fa01f58c14b79145dc2a455a3b5 ./man/libinput.man +01343ea1fdcd661486ae562d3ac2a98b ./man/Makefile.am +747063295b9cbe2b496c2de5575031f0 ./man/Makefile.in +e6658e52c79b2c368296c883d90979b9 ./config.guess +7ce923f582b49637d13847c49fff9490 ./test-driver +ccf363e090d77ecc440c2e721ea24743 ./test/Makefile.am +4ee213782e11bfc5d95015350b70e70e ./test/test-bezier.c +8476e6df964e126001edbfd4cc0cb05b ./test/Makefile.in +4e77afb803209d160a41ce9e6b9d5e02 ./test/.gitignore +a287e6dabed04249bb43b254024ea9c4 ./test/test-draglock.c +8cfe18324f70d919727b8425f5b067d4 ./autogen.sh +6bf4d0a84334b32f189e79a163158851 ./fix-ppc.patch +500b9244caa7a7ab23ece1db37efa76d ./compile +7a06954e0d27fbf55d0ea3fa13704e05 ./Makefile.in +be89952b8599f5a8cf77b09ad7b16763 ./conf/40-libinput.conf +5e6b20ea2ef94a998145f0ea3f788ee0 ./COPYING +0e7eed40fc262ed88244abe9adb018e4 ./include/Makefile.am +551dc6220be7f738ed0f119843d1856e ./include/Makefile.in +e886c433724688398878644541124bff ./include/libinput-properties.h +08facb94e845a71a9442c46f67946638 ./ChangeLog +b1a58aee16e770c7953f4c4579b34547 ./autom4te.cache/traces.0 +23aca74d0b530de94d5a9dc7c476c3bb ./autom4te.cache/output.1 +f6c7b31bcd4b694dddba06aa7ff3e88d ./autom4te.cache/requests +9677e5952253ae43b1f9d374d4871338 ./autom4te.cache/traces.1 +bcd811aebe2a4028227d84ff2c232d1d ./autom4te.cache/output.0 +e5b8cb287ea4c2279fa41cd519952a54 ./aclocal.m4 +bf34e8b0358f70b230c7c564f7ebc1eb ./README.md +b965f98f97ba53fa9e2ed5528caa4efc ./install-sh +5084e93a32ba491954fae6257ecdfaee ./configure +7283e9abc15f2c686f5bd63af84f3605 ./configure.ac +abce5989a36570209864acccaaf8b3b7 ./config.h.in +cb240418bd4700f42dfa89d541553afa ./src/bezier.c +eda88592831ccf47715b43bd0f385e9b ./src/Makefile.in +75f94c9c23159e649aaaabfb4ed5b22e ./src/draglock.h +bc7690519227babaa80f5b3ac3cc0053 ./src/Makefile.am +8f0f52b6d4e1c909574c217e20e39956 ./src/draglock.c +a27c2be60880c9663aad354e0aea575f ./src/bezier.h +3df41873e15d993086f3fb8dcec4840a ./src/xf86libinput.c +7545c70205f520904aa37b8c7d0ce90a ./xorg-libinput.pc.in +14a42c453ac8cd5005c1454ea8c834f0 ./.gitignore --- xserver-xorg-input-libinput-0.26.0.orig/debian/autoreconf.before +++ xserver-xorg-input-libinput-0.26.0/debian/autoreconf.before @@ -0,0 +1,24 @@ +f655f28fb487a50b28f460a43c0323ae ./Makefile.am +a7a09fa01f58c14b79145dc2a455a3b5 ./man/libinput.man +01343ea1fdcd661486ae562d3ac2a98b ./man/Makefile.am +ccf363e090d77ecc440c2e721ea24743 ./test/Makefile.am +4ee213782e11bfc5d95015350b70e70e ./test/test-bezier.c +4e77afb803209d160a41ce9e6b9d5e02 ./test/.gitignore +a287e6dabed04249bb43b254024ea9c4 ./test/test-draglock.c +8cfe18324f70d919727b8425f5b067d4 ./autogen.sh +6bf4d0a84334b32f189e79a163158851 ./fix-ppc.patch +be89952b8599f5a8cf77b09ad7b16763 ./conf/40-libinput.conf +5e6b20ea2ef94a998145f0ea3f788ee0 ./COPYING +0e7eed40fc262ed88244abe9adb018e4 ./include/Makefile.am +e886c433724688398878644541124bff ./include/libinput-properties.h +08facb94e845a71a9442c46f67946638 ./ChangeLog +bf34e8b0358f70b230c7c564f7ebc1eb ./README.md +7283e9abc15f2c686f5bd63af84f3605 ./configure.ac +cb240418bd4700f42dfa89d541553afa ./src/bezier.c +75f94c9c23159e649aaaabfb4ed5b22e ./src/draglock.h +bc7690519227babaa80f5b3ac3cc0053 ./src/Makefile.am +8f0f52b6d4e1c909574c217e20e39956 ./src/draglock.c +a27c2be60880c9663aad354e0aea575f ./src/bezier.h +3df41873e15d993086f3fb8dcec4840a ./src/xf86libinput.c +7545c70205f520904aa37b8c7d0ce90a ./xorg-libinput.pc.in +14a42c453ac8cd5005c1454ea8c834f0 ./.gitignore --- xserver-xorg-input-libinput-0.26.0.orig/debian/changelog +++ xserver-xorg-input-libinput-0.26.0/debian/changelog @@ -0,0 +1,109 @@ +xserver-xorg-input-libinput (0.26.0-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Sat, 23 Sep 2017 14:47:01 +0300 + +xserver-xorg-input-libinput (0.23.0-2) unstable; urgency=medium + + [ Andreas Boll ] + * Cherry-pick commit f47f78e (Ignore LED updates for disabled devices) + from upstream master branch (Closes: #829386). + * Switch URLs to https. + * Move URL from description to Homepage field. + * Bump Standards-Version to 3.9.8. + + -- Timo Aaltonen Thu, 12 Jan 2017 13:48:06 +0200 + +xserver-xorg-input-libinput (0.23.0-1) unstable; urgency=medium + + * New upstream release. + * Bump debhelper compat to 10. + + Let debhelper run autoreconf for us. + * No need to pass --disable-silent-rules to configure, debhelper does + that these days. + * No need for --destdir=debian/tmp as we have multiple binary packages. + + -- Emilio Pozuelo Monfort Mon, 12 Dec 2016 19:15:41 +0100 + +xserver-xorg-input-libinput (0.22.0-1) unstable; urgency=medium + + * New upstream release. + * control: Bump build-dep on libinput-dev. + + -- Timo Aaltonen Fri, 18 Nov 2016 16:03:02 +0200 + +xserver-xorg-input-libinput (0.20.0-1) unstable; urgency=medium + + * New upstream release. + * control, rules: Drop -dbg package. + + -- Timo Aaltonen Fri, 30 Sep 2016 15:05:19 +0300 + +xserver-xorg-input-libinput (0.19.1-1) unstable; urgency=medium + + * Team upload. + * Use https URL in debian/watch. + * New upstream release. + + -- Julien Cristau Sat, 24 Sep 2016 15:58:15 +0200 + +xserver-xorg-input-libinput (0.19.0-1) unstable; urgency=medium + + [ Andreas Boll ] + * control: Fix Vcs-Git field. + + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen Tue, 10 May 2016 11:37:55 +0300 + +xserver-xorg-input-libinput (0.18.0-1) unstable; urgency=medium + + * New upstream release. + * control: Update the description to mention that this driver can + replace -evdev and -synaptics. + * control: Bump libinput-dev build-dependency. + * control: Bump Standards-Version to 3.9.7 (no changes). + + -- Timo Aaltonen Thu, 07 Apr 2016 10:20:31 +0300 + +xserver-xorg-input-libinput (0.17.0-1) unstable; urgency=medium + + * New upstream release. + * control: Update Vcs fields to use https. + + -- Timo Aaltonen Sat, 27 Feb 2016 10:03:43 +0200 + +xserver-xorg-input-libinput (0.16.0-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 14 Jan 2016 14:59:15 +0200 + +xserver-xorg-input-libinput (0.15.0-1) unstable; urgency=medium + + * New upstream release. + * control: Bump libinput-dev build-dep. + * install: Fix conf snippet source path. + + -- Timo Aaltonen Wed, 28 Oct 2015 18:30:03 +0200 + +xserver-xorg-input-libinput (0.14.0-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Wed, 23 Sep 2015 13:12:50 +0300 + +xserver-xorg-input-libinput (0.13.0-1) unstable; urgency=medium + + * New upstream release. + * control: Bump libinput build-dep (Closes: #794032). + + -- Timo Aaltonen Fri, 07 Aug 2015 09:12:38 +0300 + +xserver-xorg-input-libinput (0.11.0-1) unstable; urgency=medium + + * Initial release. (Closes: #784114) + + -- Timo Aaltonen Mon, 06 Jul 2015 16:27:42 +0300 --- xserver-xorg-input-libinput-0.26.0.orig/debian/compat +++ xserver-xorg-input-libinput-0.26.0/debian/compat @@ -0,0 +1 @@ +10 --- xserver-xorg-input-libinput-0.26.0.orig/debian/control +++ xserver-xorg-input-libinput-0.26.0/debian/control @@ -0,0 +1,62 @@ +Source: xserver-xorg-input-libinput +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Timo Aaltonen , +Build-Depends: + debhelper (>= 10), + libinput-dev (>= 1.4.901), + libudev-dev, + pkg-config, + quilt, + x11proto-core-dev, + x11proto-input-dev (>= 2.2), + xserver-xorg-dev (>= 2:1.15.99), + xutils-dev, +Standards-Version: 3.9.8 +Homepage: https://www.x.org +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-libinput.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-input-libinput.git + +Package: xserver-xorg-input-libinput +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xinpdriver:Depends}, +Provides: + ${xinpdriver:Provides} +Description: X.Org X server -- libinput input driver + This package provides the driver for input devices using libinput library. + It can handle keyboards, mice and touchpads, and essentially replaces the + separate -evdev and -synaptics drivers. + . + This package is built from the X.org xf86-input-libinput driver module. + +Package: xserver-xorg-input-libinput-dev +Section: libdevel +Architecture: all +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: X.Org X server -- libinput input driver (development headers) + This package provides the development headers for the libinput input driver + found in xserver-xorg-input-libinput. Non-developers likely have little use + for this package. + . + This package is built from the X.org xf86-input-libinput driver module. + + +Package: xserver-xorg-input-libinput-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xinpdriver:Depends}, + udev-udeb, +Provides: + ${xinpdriver:Provides} +Description: X.Org X server -- libinput input driver + This is a udeb, or a microdeb, for the debian-installer. --- xserver-xorg-input-libinput-0.26.0.orig/debian/copyright +++ xserver-xorg-input-libinput-0.26.0/debian/copyright @@ -0,0 +1,52 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-name: xf86-input-libinput +Source: https://xorg.freedesktop.org/releases/individual/driver/ + +Files: * +Copyright: 2013-2014 Red Hat, Inc. +License: MIT + +Files: configure.ac +Copyright: 2005 Adam Jackson +License: xorg + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + on the rights to use, copy, modify, merge, publish, distribute, sub + license, and/or sell copies of the Software, and to permit persons to whom + the Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice (including the next + paragraph) shall be included in all copies or substantial portions of the + Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: debian/* +Copyright: 2014 Timo Aaltonen +License: MIT + +License: MIT + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without + fee, provided that the above copyright notice appear in all copies + and that both that copyright notice and this permission notice + appear in supporting documentation, and that the name of the authors + not be used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. The authors make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + . + THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- xserver-xorg-input-libinput-0.26.0.orig/debian/files-o +++ xserver-xorg-input-libinput-0.26.0/debian/files-o @@ -0,0 +1,3 @@ +xserver-xorg-input-libinput-dev_0.24.0-0.7_all.deb libdevel optional +xserver-xorg-input-libinput-udeb_0.24.0-0.7_amd64.udeb debian-installer optional +xserver-xorg-input-libinput_0.24.0-0.7_amd64.deb x11 optional --- xserver-xorg-input-libinput-0.26.0.orig/debian/patches/series +++ xserver-xorg-input-libinput-0.26.0/debian/patches/series @@ -0,0 +1 @@ +# placeholder --- xserver-xorg-input-libinput-0.26.0.orig/debian/rules +++ xserver-xorg-input-libinput-0.26.0/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- \ + --libdir=\$${exec_prefix}/lib + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,xsf --builddirectory=build/ --- xserver-xorg-input-libinput-0.26.0.orig/debian/upstream/signing-key.asc +++ xserver-xorg-input-libinput-0.26.0/debian/upstream/signing-key.asc @@ -0,0 +1,24 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQGiBD8b0wYRBACph9kRJmP+4+JGsCgFlFoy4vFO0DCG+jmkQN0n1wdInt/N/UtA +sZToO72AUmfmYizA+IEbzBrx0UnUo3w3BDmHxUWf/akZiPUz9AA/YFY4xC3MY2OK +VN2Jz6YSce4zJ5jd2ZRobHm4HuIf/8yqSCcsv7FNfrLaTNIFRs5gYYsqZwCgwmkp +RSLRc8WAnHrTWNQDaEFM2rUEAKTjrTjMN8+KGd0BxNX7HiTSqQP++nXNwAYs1oWB +Yt82YHj9SvRCqCzD1pzJQivYnlNoWDza1VeMnfdAvkdia8z4lYbO/RunXZJvra3Z +VDm+izq+uwUAyvFuEYnNz09VSqwXKT6+XW0Xtz2vHq52r6DS6mK8cGJHZ5OhrRjq +UEYxA/9STh+QfA98xtNoRcf52E/46r7IpCj440oRVc9lMfxQZrLGQNqp7sPdIhGQ +CCo2NUII5hkhdAG71kpbfSXU4Sh32p1cU1KYCAkDFfb49bKuAs+Pff8v6FGZxTdd +AinPZr4BbsYJatk818aTCnu0+s7L8jL5GPfeyuyEMKwzVBx2mLQpUGV0ZXIgSHV0 +dGVyZXIgKFdoby1UKSA8b2ZmaWNlQHdoby10Lm5ldD6IWQQTEQIAGQUCPxvTBgQL +BwMCAxUCAwMWAgECHgECF4AACgkQ4jt+cLRn8L/0RACfWo3KTMUg+uPRqA6RXxk0 +4CWjXaMAoJeIxOpZLB3RBltPnSi7PyVQIkHFuQENBD8b0wgQBACTnqOYOWYVR8O1 +D73J6nbdAeZCbXrUkyXIuyqBOdKmX/0QJmSs7Wfsa+hPfDhj6ai0Gs2C8Qg/0Pzk +86b4p9DLkf0M6RaYjUtCJBpS59xrsV6nz6xZzQa4RRdf1YJmw2tia1MMXzxbwQU2 +bKpYEm8NsGaBURMGd02EvsMN2wI2uwADBQP/e9MjVr/85XDzAlUBN8HwYW5szTyP +8ZVcQOqOmNebkTWGLvkPrBdXmxpzrWjxPolO1WcWQjUL0bN/rbdqefT65iVHJHJZ +/cpTtgGlCPhL5JTA50ltd0I13CABYWLFmswonXES/6tcglf4rr3Nri2sOrY5HggP +ipEzOo5vdKOow/qIRgQYEQIABgUCPxvTCAAKCRDiO35wtGfwv68jAKCDvL2gkrg1 +4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM= +=7uBX +-----END PGP PUBLIC KEY BLOCK----- --- xserver-xorg-input-libinput-0.26.0.orig/debian/watch +++ xserver-xorg-input-libinput-0.26.0/debian/watch @@ -0,0 +1,4 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-input-libinput +version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ +https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-libinput-(.*)\.tar\.gz --- xserver-xorg-input-libinput-0.26.0.orig/debian/xserver-xorg-input-libinput-dev.install +++ xserver-xorg-input-libinput-0.26.0/debian/xserver-xorg-input-libinput-dev.install @@ -0,0 +1,2 @@ +usr/include/xorg/libinput-properties.h +usr/lib/pkgconfig/* --- xserver-xorg-input-libinput-0.26.0.orig/debian/xserver-xorg-input-libinput-udeb.install +++ xserver-xorg-input-libinput-0.26.0/debian/xserver-xorg-input-libinput-udeb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/input/*.so --- xserver-xorg-input-libinput-0.26.0.orig/debian/xserver-xorg-input-libinput.install +++ xserver-xorg-input-libinput-0.26.0/debian/xserver-xorg-input-libinput.install @@ -0,0 +1,3 @@ +usr/lib/xorg/modules/input/*.so +usr/share/man +usr/share/X11/xorg.conf.d --- xserver-xorg-input-libinput-0.26.0.orig/debian/xserver-xorg-input-libinput.links +++ xserver-xorg-input-libinput-0.26.0/debian/xserver-xorg-input-libinput.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-input-libinput/script --- xserver-xorg-input-libinput-0.26.0.orig/fix-ppc.patch +++ xserver-xorg-input-libinput-0.26.0/fix-ppc.patch @@ -0,0 +1,18 @@ +diff --git a/test/test-bezier.c b/test/test-bezier.c +index 1b290a4..9a6e59e 100644 +--- a/test/test-bezier.c ++++ b/test/test-bezier.c +@@ -153,6 +153,13 @@ test_nonzero_x_linear(void) + assert(bezier[x] == 0); + } while (++x < size * 0.2 - 1); + ++ /* ppc64le, ppc64, aarch64 have different math results at -O2, ++ resulting in one extra zero at the beginning of the array. ++ some other numbers are different too but within the error ++ margin (#99992) */ ++ if (bezier[x] == 0) ++ x++; ++ + do { + assert(bezier[x] > bezier[x-1]); + } while (++x < size * 0.8 - 1); --- xserver-xorg-input-libinput-0.26.0.orig/include/Makefile.in +++ xserver-xorg-input-libinput-0.26.0/include/Makefile.in @@ -302,6 +302,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ --- xserver-xorg-input-libinput-0.26.0.orig/install-sh +++ xserver-xorg-input-libinput-0.26.0/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -324,34 +324,41 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; --- xserver-xorg-input-libinput-0.26.0.orig/ltmain.sh +++ xserver-xorg-input-libinput-0.26.0/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,12 +2068,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -7272,10 +7272,13 @@ # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -7568,7 +7571,10 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7887,19 +7893,19 @@ # 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" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -8823,6 +8829,9 @@ revision=$number_minor lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; esac ;; no) --- xserver-xorg-input-libinput-0.26.0.orig/man/Makefile.in +++ xserver-xorg-input-libinput-0.26.0/man/Makefile.in @@ -306,6 +306,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ --- xserver-xorg-input-libinput-0.26.0.orig/src/Makefile.in +++ xserver-xorg-input-libinput-0.26.0/src/Makefile.in @@ -168,8 +168,11 @@ $(AM_CFLAGS) $(CFLAGS) $(@DRIVER_NAME@_drv_la_LDFLAGS) \ $(LDFLAGS) -o $@ libbezier_la_LIBADD = -am_libbezier_la_OBJECTS = bezier.lo +am_libbezier_la_OBJECTS = libbezier_la-bezier.lo libbezier_la_OBJECTS = $(am_libbezier_la_OBJECTS) +libbezier_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libbezier_la_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ libdraglock_la_LIBADD = am_libdraglock_la_OBJECTS = draglock.lo libdraglock_la_OBJECTS = $(am_libdraglock_la_OBJECTS) @@ -372,6 +375,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -392,6 +396,7 @@ noinst_LTLIBRARIES = libdraglock.la libbezier.la libdraglock_la_SOURCES = draglock.c draglock.h libbezier_la_SOURCES = bezier.c bezier.h +libbezier_la_CFLAGS = -ffp-contract=off all: all-am .SUFFIXES: @@ -476,7 +481,7 @@ $(AM_V_CCLD)$(@DRIVER_NAME@_drv_la_LINK) -rpath $(@DRIVER_NAME@_drv_ladir) $(@DRIVER_NAME@_drv_la_OBJECTS) $(@DRIVER_NAME@_drv_la_LIBADD) $(LIBS) libbezier.la: $(libbezier_la_OBJECTS) $(libbezier_la_DEPENDENCIES) $(EXTRA_libbezier_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libbezier_la_OBJECTS) $(libbezier_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libbezier_la_LINK) $(libbezier_la_OBJECTS) $(libbezier_la_LIBADD) $(LIBS) libdraglock.la: $(libdraglock_la_OBJECTS) $(libdraglock_la_DEPENDENCIES) $(EXTRA_libdraglock_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libdraglock_la_OBJECTS) $(libdraglock_la_LIBADD) $(LIBS) @@ -487,8 +492,8 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bezier.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draglock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbezier_la-bezier.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86libinput.Plo@am__quote@ .c.o: @@ -512,6 +517,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libbezier_la-bezier.lo: bezier.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbezier_la_CFLAGS) $(CFLAGS) -MT libbezier_la-bezier.lo -MD -MP -MF $(DEPDIR)/libbezier_la-bezier.Tpo -c -o libbezier_la-bezier.lo `test -f 'bezier.c' || echo '$(srcdir)/'`bezier.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libbezier_la-bezier.Tpo $(DEPDIR)/libbezier_la-bezier.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bezier.c' object='libbezier_la-bezier.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbezier_la_CFLAGS) $(CFLAGS) -c -o libbezier_la-bezier.lo `test -f 'bezier.c' || echo '$(srcdir)/'`bezier.c + mostlyclean-libtool: -rm -f *.lo --- xserver-xorg-input-libinput-0.26.0.orig/test/Makefile.in +++ xserver-xorg-input-libinput-0.26.0/test/Makefile.in @@ -514,6 +514,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@