[neon/3rdparty/libaccounts-qt/Neon/unstable] debian: Revert "try just qt6"
Scarlett Moore
null at kde.org
Wed Sep 20 13:34:39 BST 2023
Git commit e6d6e6aa6456d131f056e439a713e37f943ac980 by Scarlett Moore.
Committed on 20/09/2023 at 14:34.
Pushed by scarlettmoore into branch 'Neon/unstable'.
Revert "try just qt6"
This reverts commit 1973c218050f4e9767f5666dd6bc804ef47438ff.
M +27 -2 debian/control
M +134 -2 debian/patches/commit-ca0447d
M +15 -16 debian/rules
https://invent.kde.org/neon/3rdparty/libaccounts-qt/-/commit/e6d6e6aa6456d131f056e439a713e37f943ac980
diff --git a/debian/control b/debian/control
index c8c9088..4ae7a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,15 +7,40 @@ Build-Depends: debhelper-compat (= 13),
libaccounts-glib-dev (>= 1.23),
libglib2.0-dev,
pkg-config,
+ qt5-qmake,
+ qtbase5-dev,
+ qtchooser,
qt6-base-dev,
- qtchooser
-Build-Depends-Indep: doxygen, graphviz, qt6-base-dev
+Build-Depends-Indep: doxygen, graphviz, qttools5-dev-tools, qt6-base-dev
Standards-Version: 4.5.1
Rules-Requires-Root: no
Homepage: https://gitlab.com/accounts-sso/libaccounts-qt
Vcs-Browser: https://salsa.debian.org/qt-kde-team/3rdparty/libaccounts-qt
Vcs-Git: https://salsa.debian.org/qt-kde-team/3rdparty/libaccounts-qt.git
+Package: libaccounts-qt5-dev
+Section: libdevel
+Architecture: any
+Depends: libaccounts-qt5-1 (= ${binary:Version}),
+ ${misc:Depends},
+Description: Accounts database access Qt version - Qt5 development files
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains files the development files of the accounts database
+ access Qt5 API.
+
+Package: libaccounts-qt5-1
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Accounts database access Qt version - Qt5 shared library
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains shared libraries to be used by Qt5 applications.
+
Package: libaccounts-qt6-dev
Section: libdevel
Architecture: any
diff --git a/debian/patches/commit-ca0447d b/debian/patches/commit-ca0447d
index d1cd3c5..3415579 100644
--- a/debian/patches/commit-ca0447d
+++ b/debian/patches/commit-ca0447d
@@ -1,4 +1,4 @@
-From d0fa3ac4d3cfe80314033e89a8c18e20a39c296f Mon Sep 17 00:00:00 2001
+From a4844062ade8e67c8cf60db9b670099244130efd Mon Sep 17 00:00:00 2001
From: Scarlett Moore <sgmoore at kde.org>
Date: Tue, 19 Sep 2023 10:29:27 -0700
Subject: Fix tests as class QList<QString>’ {aka ‘class QList<QString>’} has
@@ -9,8 +9,111 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
+index 5ade19c..13804ee 100644
+--- a/Accounts/Accounts.pro
++++ b/Accounts/Accounts.pro
+@@ -3,7 +3,7 @@ include( ../common-project-config.pri )
+ include( ../common-vars.pri )
+
+ TEMPLATE = lib
+-TARGET = accounts-qt6
++TARGET = accounts-qt5
+
+ # Input
+ public_headers = \
+@@ -45,7 +45,7 @@ QT -= gui
+
+ INCLUDEPATH += $${TOP_SRC_DIR}
+
+-CMAKE_BASENAME = AccountsQt6
++CMAKE_BASENAME = AccountsQt5
+
+ PKGCONFIG += \
+ glib-2.0 \
+diff --git a/Accounts/Accounts6.pro b/Accounts/Accounts6.pro
+new file mode 100644
+index 0000000..5ade19c
+--- /dev/null
++++ b/Accounts/Accounts6.pro
+@@ -0,0 +1,75 @@
++
++include( ../common-project-config.pri )
++include( ../common-vars.pri )
++
++TEMPLATE = lib
++TARGET = accounts-qt6
++
++# Input
++public_headers = \
++ accountscommon.h \
++ Manager manager.h \
++ Account account.h \
++ AccountService account-service.h \
++ Application application.h \
++ AuthData auth-data.h \
++ Error error.h \
++ Provider provider.h \
++ Service service.h \
++ ServiceType service-type.h
++
++private_headers = \
++ manager_p.h \
++ utils.h
++
++HEADERS += \
++ $$public_headers \
++ $$private_headers
++
++SOURCES += manager.cpp \
++ account.cpp \
++ account-service.cpp \
++ application.cpp \
++ auth-data.cpp \
++ error.cpp \
++ provider.cpp \
++ service.cpp \
++ service-type.cpp \
++ utils.cpp
++
++CONFIG += link_pkgconfig
++
++DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QT_NO_KEYWORDS
++QT += core xml
++QT -= gui
++
++INCLUDEPATH += $${TOP_SRC_DIR}
++
++CMAKE_BASENAME = AccountsQt6
++
++PKGCONFIG += \
++ glib-2.0 \
++ gobject-2.0 \
++ libaccounts-glib
++
++QMAKE_CXXFLAGS += \
++ -fno-exceptions \
++ -fvisibility=hidden
++
++headers.files = $$HEADERS
++
++include( ../common-installs-config.pri )
++
++pkgconfig.files = $${TARGET}.pc
++include($${TOP_SRC_DIR}/common-pkgconfig.pri)
++INSTALLS += pkgconfig
++
++QMAKE_SUBSTITUTES += \
++ $${CMAKE_BASENAME}Config.cmake.in \
++ $${CMAKE_BASENAME}ConfigVersion.cmake.in
++cmake_modules.files = \
++ $${CMAKE_BASENAME}Config.cmake \
++ $${CMAKE_BASENAME}ConfigVersion.cmake
++cmake_modules.path = $${CMAKE_CONFIG_PATH}/$${CMAKE_BASENAME}
++
++INSTALLS += cmake_modules
diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
-index 471e3d5..b75ccf7 100644
+index 471e3d5..54b5509 100644
--- a/tests/tst_libaccounts.cpp
+++ b/tests/tst_libaccounts.cpp
@@ -326,11 +326,11 @@ void AccountsTest::testService()
@@ -41,3 +144,32 @@ index 471e3d5..b75ccf7 100644
QCOMPARE(accountService->value("server").toString(),
UTF8("www.example.com"));
+@@ -727,23 +727,23 @@ void AccountsTest::testAccountService()
+
+
+ /* test some more APIs */
+- QStringList expectedList;
++ QSet<QString> expectedList;
+ expectedList << "server" << "fallback-conference-server" <<
+ "port" << "old-ssl";
+- QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
+- QCOMPARE(accountService->childGroups().toSet(), QSet<QString>());
++ QCOMPARE(accountService->childKeys(), expectedList);
++ QCOMPARE(accountService->childGroups(), QSet<QString>());
+ QCOMPARE(accountService->contains("port"), true);
+ accountService->endGroup();
+
+ expectedList.clear();
+ expectedList << "parameters";
+- QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
++ QCOMPARE(accountService->childGroups(), expectedList);
+
+ /* Remove one key */
+ accountService->remove("parameters/port");
+ account->sync();
+ QCOMPARE(spyChanged.count(), 1);
+- QCOMPARE(m_accountServiceChangedFields, QStringList("parameters/port"));
++ QCOMPARE(m_accountServiceChangedFields, QSet<QString>("parameters/port"));
+ spyChanged.clear();
+
+ /* remove all keys */
diff --git a/debian/rules b/debian/rules
index 8c6d3e3..522b4cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-export QT_SELECT=6
%:
dh $@
@@ -12,21 +11,21 @@ export QT_SELECT=6
override_dh_auto_clean:
-dh_auto_clean -- cleandocs
dh_auto_clean
-#
-#
-# override_dh_auto_configure:
-# # mkdir -p build && cd build && qmake "QMAKE_CFLAGS_RELEASE=${CFLAGS} ${CPPFLAGS}" "QMAKE_CFLAGS_DEBUG=${CFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_DEBUG=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_LFLAGS_RELEASE=${LDFLAGS}" "QMAKE_LFLAGS_DEBUG=${LDFLAGS}" QMAKE_STRIP=: PREFIX=/usr .. && cd ..
-# mkdir -p build6 && cd build6 && QT_SELECT=6 qmake6 .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-# #mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-# mkdir -p build && cd build && QT_SELECT=5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-#
-# override_dh_auto_build:
-# cd build6 && make
-# cd build && make
-#
-# override_dh_auto_install:
-# cd build6 && dh_auto_install
-# cd build && dh_auto_install
+
+
+override_dh_auto_configure:
+# mkdir -p build && cd build && qmake "QMAKE_CFLAGS_RELEASE=${CFLAGS} ${CPPFLAGS}" "QMAKE_CFLAGS_DEBUG=${CFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_DEBUG=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_LFLAGS_RELEASE=${LDFLAGS}" "QMAKE_LFLAGS_DEBUG=${LDFLAGS}" QMAKE_STRIP=: PREFIX=/usr .. && cd ..
+ mkdir -p build6 && cd build6 && QT_SELECT=6 qmake6 ../Accounts6.pro -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) && cd ..
+ #mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ mkdir -p build && cd build && QT_SELECT=5 qmake ../Accounts.pro -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) && cd ..
+
+override_dh_auto_build:
+ cd build6 && make && cd ..
+ cd build && make && cd ..
+
+override_dh_auto_install:
+ cd build6 && dh_auto_install && cd ..
+ cd build && dh_auto_install && cd ..
override_dh_auto_test:
# Disable unittests
More information about the Neon-commits
mailing list