On Thu, Sep 21, 2017 at 03:36:38PM +0200, Yves-Alexis Perez wrote:
> On Thu, 2017-09-21 at 00:09 +0800, Boyuan Yang wrote:
> > I noticed that you are planning to remove Qt components of lightdm from
> > Debian's lightdm. In fact, pkg-deepin team has a planned package that needs
> > Qt5-based liblightdm-qt as (build-)dependency. See bug #871840 [1]. In case
> > you might be curious, we have a dependency graph too. [3]
>
> Hi,
>
> I'm a not at all interested in Qt (4 or 5) components, so honestly I'm all
> inclined to just disable Qt4 and stay like this.
Attached is a patch which drops Qt4 support. It's only used by src:razorqt,
which is already RC-buggy anyway and which will be removed soon along with
Qt4.
Cheers,
Moritz
diff -Naur lightdm-1.26.0.orig/debian/control lightdm-1.26.0/debian/control
--- lightdm-1.26.0.orig/debian/control 2019-07-10 22:34:59.000000000 +0200
+++ lightdm-1.26.0/debian/control 2019-08-29 20:25:12.718749257 +0200
@@ -16,7 +16,6 @@
libglib2.0-dev,
libgtk-3-dev,
libpam-dev,
- libqt4-dev,
libxcb1-dev,
libxdmcp-dev,
libxklavier-dev,
@@ -72,15 +71,6 @@
This package contains the GObject library for lightdm, used by the GTK+
greeter.
-Package: liblightdm-qt-3-0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: simple display manager (Qt library)
- This package contains the Qt library for lightdm.
-
Package: liblightdm-qt5-3-0
Section: libs
Architecture: any
@@ -107,17 +97,6 @@
This package contains the development files for lightdm.
They can be used to build new greeters applications GTK+ based.
-Package: liblightdm-qt-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: liblightdm-qt-3-0 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Description: simple display manager (Qt development files)
- This package contains the development files for lightdm.
- They can be used to build new greeters applications Qt based.
-
Package: liblightdm-qt5-3-dev
Section: libdevel
Architecture: any
diff -Naur lightdm-1.26.0.orig/debian/liblightdm-qt-3-0.install lightdm-1.26.0/debian/liblightdm-qt-3-0.install
--- lightdm-1.26.0.orig/debian/liblightdm-qt-3-0.install 2019-07-10 22:34:59.000000000 +0200
+++ lightdm-1.26.0/debian/liblightdm-qt-3-0.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/liblightdm-qt-*.so.*
diff -Naur lightdm-1.26.0.orig/debian/liblightdm-qt-3-0.lintian-overrides lightdm-1.26.0/debian/liblightdm-qt-3-0.lintian-overrides
--- lightdm-1.26.0.orig/debian/liblightdm-qt-3-0.lintian-overrides 2019-07-10 22:34:59.000000000 +0200
+++ lightdm-1.26.0/debian/liblightdm-qt-3-0.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# we do use -fstack-protector
-liblightdm-qt-3-0: hardening-no-stackprotector usr/lib/x86_64-linux-gnu/liblightdm-qt-3.so.0.0.0
diff -Naur lightdm-1.26.0.orig/debian/liblightdm-qt-3-0.symbols lightdm-1.26.0/debian/liblightdm-qt-3-0.symbols
--- lightdm-1.26.0.orig/debian/liblightdm-qt-3-0.symbols 2019-07-10 22:34:59.000000000 +0200
+++ lightdm-1.26.0/debian/liblightdm-qt-3-0.symbols 1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-liblightdm-qt-3.so.0 liblightdm-qt-3-0 #MINVER#
- (c++|regex)"^.*::qt_metacall\(QMetaObject::Call, int, void[*][*]\)@Base$" 1.8.7
- (c++|regex)"^.*::qt_metacast\(char const[*]\)@Base$" 1.8.7
- (c++|regex)"^.*::staticMetaObject@Base$" 1.8.7
- (c++|regex)"^.*::metaObject\(\) const@Base$" 1.8.7
- (c++|regex)"^typeinfo for .*@Base$" 1.8.7
- (c++|regex)"^typeinfo name for .*@Base$" 1.8.7
- (c++|regex)"^vtable for .*@Base$" 1.8.7
- (c++)"QLightDM::UsersModel::UsersModel(QObject*)@Base" 1.8.7
- (c++)"QLightDM::UsersModel::~UsersModel()@Base" 1.8.7
- (c++)"QLightDM::SessionsModel::SessionsModel(QLightDM::SessionsModel::SessionType, QObject*)@Base" 1.8.7
- (c++)"QLightDM::SessionsModel::SessionsModel(QObject*)@Base" 1.8.7
- (c++)"QLightDM::SessionsModel::~SessionsModel()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::canRestart()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::canSuspend()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::canShutdown()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::canHibernate()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::restart()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::suspend()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::shutdown()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::hibernate()@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::PowerInterface(QObject*)@Base" 1.8.7
- (c++)"QLightDM::PowerInterface::~PowerInterface()@Base" 1.8.7
- (c++)"QLightDM::Greeter::showPrompt(QString, QLightDM::Greeter::PromptType)@Base" 1.8.7
- (c++)"QLightDM::Greeter::connectSync()@Base" 1.8.7
- (c++)"QLightDM::Greeter::setLanguage(QString const&)@Base" 1.8.7
- (c++)"QLightDM::Greeter::showMessage(QString, QLightDM::Greeter::MessageType)@Base" 1.8.7
- (c++)"QLightDM::Greeter::authenticate(QString const&)@Base" 1.8.7
- (c++)"QLightDM::Greeter::setResettable(bool)@Base" 1.12.2
- (c++)"QLightDM::Greeter::cancelAutologin()@Base" 1.14.0
- (c++)"QLightDM::Greeter::startSessionSync(QString const&)@Base" 1.8.7
- (c++)"QLightDM::Greeter::authenticateRemote(QString const&, QString const&)@Base" 1.8.7
- (c++)"QLightDM::Greeter::authenticateAsGuest()@Base" 1.8.7
- (c++)"QLightDM::Greeter::connectToDaemonSync()@Base" 1.12.2
- (c++)"QLightDM::Greeter::cancelAuthentication()@Base" 1.8.7
- (c++)"QLightDM::Greeter::authenticateAutologin()@Base" 1.8.7
- (c++)"QLightDM::Greeter::autologinTimerExpired()@Base" 1.8.7
- (c++)"QLightDM::Greeter::authenticationComplete()@Base" 1.8.7
- (c++)"QLightDM::Greeter::ensureSharedDataDirSync(QString const&)@Base" 1.9.8
- (c++)"QLightDM::Greeter::idle()@Base" 1.12.2
- (c++)"QLightDM::Greeter::reset()@Base" 1.12.2
- (c++)"QLightDM::Greeter::respond(QString const&)@Base" 1.8.7
- (c++)"QLightDM::Greeter::Greeter(QObject*)@Base" 1.8.7
- (c++)"QLightDM::Greeter::~Greeter()@Base" 1.8.7
- (c++)"QLightDM::UsersModel::data(QModelIndex const&, int) const@Base" 1.8.7
- (c++)"QLightDM::UsersModel::rowCount(QModelIndex const&) const@Base" 1.8.7
- (c++)"QLightDM::SessionsModel::data(QModelIndex const&, int) const@Base" 1.8.7
- (c++)"QLightDM::SessionsModel::rowCount(QModelIndex const&) const@Base" 1.8.7
- (c++)"QLightDM::Greeter::hideUsersHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::selectUserHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::isAuthenticated() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::selectGuestHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::inAuthentication() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::autologinUserHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::authenticationUser() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::autologinGuestHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::defaultSessionHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::hasGuestAccountHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::showManualLoginHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::showRemoteLoginHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::autologinTimeoutHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::getHint(QString const&) const@Base" 1.8.7
- (c++)"QLightDM::Greeter::hostname() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::lockHint() const@Base" 1.8.7
- (c++)"QLightDM::Greeter::osVersionId() const@Base" 1.26.0
- (c++)"QLightDM::Greeter::osPrettyName() const@Base" 1.26.0
- (c++)"QLightDM::Greeter::autologinSessionHint() const@Base" 1.26.0
- (c++)"QLightDM::Greeter::motd() const@Base" 1.26.0
- (c++)"QLightDM::Greeter::osId() const@Base" 1.26.0
- (c++)"QLightDM::Greeter::osName() const@Base" 1.26.0
- (c++)"QLightDM::Greeter::osVersion() const@Base" 1.26.0
diff -Naur lightdm-1.26.0.orig/debian/liblightdm-qt-dev.install lightdm-1.26.0/debian/liblightdm-qt-dev.install
--- lightdm-1.26.0.orig/debian/liblightdm-qt-dev.install 2019-07-10 22:34:59.000000000 +0200
+++ lightdm-1.26.0/debian/liblightdm-qt-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/include/lightdm-qt-*
-usr/lib/*/pkgconfig/liblightdm-qt-*.pc
-usr/lib/*/liblightdm-qt-*.a
-usr/lib/*/liblightdm-qt-*.so
diff -Naur lightdm-1.26.0.orig/debian/rules lightdm-1.26.0/debian/rules
--- lightdm-1.26.0.orig/debian/rules 2019-07-10 22:34:59.000000000 +0200
+++ lightdm-1.26.0/debian/rules 2019-08-29 20:26:10.245335456 +0200
@@ -14,7 +14,8 @@
--enable-introspection=yes \
--disable-silent-rules \
--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(DEB_SOURCE)/ \
- --enable-liblightdm-qt5
+ --enable-liblightdm-qt5 \
+ --disable-liblightdm-qt
override_dh_installchangelogs:
dh_installchangelogs -- NEWS
