Commit c7c16783 authored by Rex Dieter's avatar Rex Dieter
Browse files

rework -qtchooser.patch to avoid autoreconf'ing (fixes epel7 build)

parent 40abd910
diff -up lightdm-1.10.5/configure.ac.qtchooser lightdm-1.10.5/configure.ac
--- lightdm-1.10.5/configure.ac.qtchooser 2015-03-09 22:52:50.000000000 -0500
+++ lightdm-1.10.5/configure.ac 2015-08-17 09:33:19.230496429 -0500
+++ lightdm-1.10.5/configure.ac 2015-09-08 22:05:51.908392265 -0500
@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" = "xye
[compile_liblightdm_qt4=yes
AC_CHECK_TOOLS(MOC4, [moc-qt4 moc])
......@@ -22,3 +22,33 @@ diff -up lightdm-1.10.5/configure.ac.qtchooser lightdm-1.10.5/configure.ac
fi
],
[if test "x$enable_liblightdm_qt5" != xauto; then
diff -up lightdm-1.10.5/configure.qtchooser lightdm-1.10.5/configure
--- lightdm-1.10.5/configure.qtchooser 2015-09-08 22:05:51.946392497 -0500
+++ lightdm-1.10.5/configure 2015-09-08 22:07:22.799948066 -0500
@@ -16924,7 +16924,7 @@ esac
fi
if test x"$(readlink $(which $MOC4))" = xqtchooser; then
- MOC4="$MOC4 --qt=qt4"
+ MOC4="$MOC4 --qt=4"
fi
if test "x$compile_liblightdm_gobject" != xyes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -17112,7 +17112,7 @@ fi
fi
if test -z "$MOC5"; then
ac_ct_MOC5=$MOC5
- for ac_prog in moc
+ for ac_prog in moc-qt5 moc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -17168,7 +17168,7 @@ esac
fi
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
- MOC5="$MOC5 --qt=qt5"
+ MOC5="$MOC5 --qt=5"
fi
fi
......@@ -5,7 +5,7 @@
Name: lightdm
Summary: Lightweight Display Manager
Version: 1.10.5
Release: 2%{?dist}
Release: 3%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -34,7 +34,6 @@ Patch51: lightdm-1.10.5-qtchooser.patch
Patch52: lightdm-1.10.5-listen.patch
# patch51
BuildRequires: automake libtool
BuildRequires: gettext
BuildRequires: gnome-common
BuildRequires: gtk-doc itstool
......@@ -147,9 +146,6 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
# patch51
autoreconf -f -i
%build
%configure \
......@@ -291,6 +287,9 @@ exit 0
%changelog
* Tue Sep 08 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-3
- rework -qtchooser.patch to avoid autoreconf'ing (fixes epel7 build)
* Fri Aug 28 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-2
- Lightdm runs without -nolisten but X not listening (#12255743)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment