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

Merge branch 'master' into epel7

parents a2112148 40abd910
/lightdm-1.10.4.tar.xz
/lightdm-1.10.5.tar.xz
diff -up lightdm-1.10.5/src/x-server-local.c.listen lightdm-1.10.5/src/x-server-local.c
--- lightdm-1.10.5/src/x-server-local.c.listen 2014-09-10 20:07:11.000000000 -0500
+++ lightdm-1.10.5/src/x-server-local.c 2015-08-28 09:31:23.198260337 -0500
@@ -498,6 +498,8 @@ x_server_local_start (DisplayServer *dis
}
else if (!server->priv->allow_tcp)
g_string_append (command, " -nolisten tcp");
+ else
+ g_string_append (command, " -listen tcp");
if (server->priv->vt >= 0)
g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);
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
@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" = "xye
[compile_liblightdm_qt4=yes
AC_CHECK_TOOLS(MOC4, [moc-qt4 moc])
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
AC_MSG_FAILURE(
@@ -134,9 +134,9 @@ if test x"$enable_liblightdm_qt5" != "xn
Qt5Gui
],
[compile_liblightdm_qt5=yes
- AC_CHECK_TOOLS(MOC5, [moc])
+ AC_CHECK_TOOLS(MOC5, [moc-qt5 moc])
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
- MOC5="$MOC5 --qt=qt5"
+ MOC5="$MOC5 --qt=5"
fi
],
[if test "x$enable_liblightdm_qt5" != xauto; then
......@@ -4,8 +4,8 @@
Name: lightdm
Summary: Lightweight Display Manager
Version: 1.10.4
Release: 6%{?dist}
Version: 1.10.5
Release: 2%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -27,7 +27,14 @@ Patch11: lightdm-1.10.2-nodaemon_option.patch
Patch12: lightdm-1.9.8-no_dmrc_save.patch
## upstreamable patches
# search for moc-qt5, use -qt=5|4 (instead of --qt=qt4|qt5)
Patch51: lightdm-1.10.5-qtchooser.patch
# Lightdm runs without -nolisten but X not listening
# https://bugzilla.redhat.com/show_bug.cgi?id=1255743
Patch52: lightdm-1.10.5-listen.patch
# patch51
BuildRequires: automake libtool
BuildRequires: gettext
BuildRequires: gnome-common
BuildRequires: gtk-doc itstool
......@@ -43,10 +50,8 @@ BuildRequires: pkgconfig(gobject-2.0)
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo "2.10")
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDBus)
BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(QtNetwork)
BuildRequires: pkgconfig(QtCore) pkgconfig(QtDBus) pkgconfig(QtGui) pkgconfig(QtNetwork)
BuildRequires: pkgconfig(Qt5Core) pkgconfig(Qt5DBus) pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xdmcp)
......@@ -99,11 +104,12 @@ Requires: %{name}-gobject%{?_isa} = %{version}-%{release}
%{summary}.
%package qt
Summary: LightDM QT client library
Summary: LightDM Qt4 client library
# see comment in -gobject above
#Requires: %{name} = %{version}-%{release}
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description qt
This package contains a QT based library for LightDM clients to use to interface
This package contains a Qt4-based library for LightDM clients to use to interface
with LightDM.
%package qt-devel
......@@ -112,6 +118,21 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
%description qt-devel
%{summary}.
%package qt5
Summary: LightDM Qt5 client library
# see comment in -gobject above
#Requires: %{name} = %{version}-%{release}
%{?_qt5:Requires: %{?_qt5}%{?_isa} >= %{_qt5_version}}
%description qt5
This package contains a Qt5-based library for LightDM clients to use to interface
with LightDM.
%package qt5-devel
Summary: Development files for %{name}-qt5
Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%description qt5-devel
%{summary}.
%prep
%setup -q
......@@ -120,15 +141,22 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
%patch11 -p1 -b .nodaemon_option
%patch12 -p1 -b .no_dmrc_save
%patch51 -p1 -b .qtchooser
%patch52 -p1 -b .listen
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
# patch51
autoreconf -f -i
%build
%configure \
--disable-static \
--enable-gtk-doc \
--enable-liblightdm-qt --disable-liblightdm-qt5 \
--enable-liblightdm-qt \
--enable-liblightdm-qt5 \
--enable-introspection \
--enable-tests \
--with-greeter-user=lightdm \
......@@ -249,8 +277,32 @@ exit 0
%{_libdir}/liblightdm-qt-3.so
%{_libdir}/pkgconfig/liblightdm-qt-3.pc
%post qt5 -p /sbin/ldconfig
%postun qt5 -p /sbin/ldconfig
%files qt5
%doc COPYING.LGPL2 COPYING.LGPL3
%{_libdir}/liblightdm-qt5-3.so.0*
%files qt5-devel
%{_includedir}/lightdm-qt5-3/
%{_libdir}/liblightdm-qt5-3.so
%{_libdir}/pkgconfig/liblightdm-qt5-3.pc
%changelog
* Fri Aug 28 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-2
- Lightdm runs without -nolisten but X not listening (#12255743)
* Mon Aug 17 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-1
- 1.10.5, add liblightdm-qt5 support
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.10.4-7
- Rebuilt for GCC 5 C++11 ABI change
* Wed Apr 15 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.4-6
- -gobject: add versioned Requires: glib2 dep
......
5d4c658a11375f83fec823f25f068785 lightdm-1.10.4.tar.xz
5feefe4737ef8c85ab52c13954e00ea6 lightdm-1.10.5.tar.xz
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