Bug#1070254: ktp-text-ui FTBFS: undefined reference to `snappy::RawCompress(char const*, unsigned long, char*, unsigned long*)'

2024-05-02 Thread Helmut Grohne
Source: ktp-text-ui
Version: 22.12.3-1
Severity: serious
Tags: ftbfs
Justification: fails to build from source (but built successfully in the past)

ktp-text-ui fails to build from source in unstable on amd64. The
relevant log probably is:

| [ 76%] Linking CXX executable ktp-text-ui
| cd /<>/obj-x86_64-linux-gnu/app && /usr/bin/cmake -E 
cmake_link_script CMakeFiles/ktp-text-ui.dir/link.txt --verbose=1
| /usr/bin/c++ -g -O2 -ffile-prefix-map=/<>=. 
-fstack-protector-strong -fstack-clash-protection -Wformat 
-Werror=format-security -fcf-protection -Wdate-time -D_FORTIFY_SOURCE=2 
-fno-operator-names -fno-exceptions -Wall -Wextra -Wcast-align 
-Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef 
-Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -Werror=init-self 
-Wvla -Wdate-time -Wsuggest-override -Wlogical-op -Wl,--enable-new-dtags 
-Wl,-z,relro 
"CMakeFiles/ktp-text-ui.dir/ktp-text-ui_autogen/mocs_compilation.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/main.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/telepathy-chat-ui.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/chat-window.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/chat-tab.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/emoticon-text-edit-action.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/emoticon-text-edit-selector.cpp.o" 
"CMakeFiles/ktp-text-ui.dir/invite-contact-dialog.cpp.o" -o ktp-text-ui  
-Wl,-rpath,/<>/obj-x86_64-linux-gnu/lib:/<>/obj-x86_64-linux-gnu/image-sharer:
 /usr/lib/x86_64-linux-gnu/libQt5WebEngine.so.5.15.15 ../lib/libktpchat.so 
/usr/lib/x86_64-linux-gnu/libKF5PeopleWidgets.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Emoticons.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKTpWidgets.so.22.12.3 
/usr/lib/x86_64-linux-gnu/libKTpModels.so.22.12.3.abi1 
/usr/lib/x86_64-linux-gnu/libKF5NotifyConfig.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5KCMUtils.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5TextWidgets.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5SonnetUi.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5SonnetCore.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5XmlGui.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKTpLogger.so.22.12.3.abi1 
/usr/lib/x86_64-linux-gnu/libKTpCommonInternals.so.22.12.3.abi1 
/usr/lib/x86_64-linux-gnu/libKF5Wallet.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Notifications.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libtelepathy-logger-qt.so.0.9.80.0 
/usr/lib/x86_64-linux-gnu/libtelepathy-qt5.so.0.0.9.8 
/usr/lib/x86_64-linux-gnu/libQt5WebEngineWidgets.so.5.15.15 
/usr/lib/x86_64-linux-gnu/libQt5WebEngineCore.so.5.15.15 
/usr/lib/x86_64-linux-gnu/libQt5WebChannel.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Positioning.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Quick.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5QmlModels.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Qml.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5PrintSupport.so.5.15.10 
../image-sharer/libktpimagesharer.so 
/usr/lib/x86_64-linux-gnu/libKF5KIOWidgets.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5KIOGui.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5KIOCore.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5JobWidgets.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Service.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Solid.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Completion.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5IconThemes.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5ConfigWidgets.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5ConfigGui.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5ConfigCore.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Codecs.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Auth.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5AuthCore.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5Archive.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5WindowSystem.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libX11.so 
/usr/lib/x86_64-linux-gnu/libQt5Concurrent.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libKTpOTR.so.22.12.3 
/usr/lib/x86_64-linux-gnu/libtelepathy-qt5.so.0.0.9.8 
/usr/lib/x86_64-linux-gnu/libQt5Network.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Xml.so.5.15.10 -fPIC 
/usr/lib/x86_64-linux-gnu/libKF5WidgetsAddons.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5People.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5CoreAddons.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libKF5I18n.so.5.107.0 
/usr/lib/x86_64-linux-gnu/libQt5DBus.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Gui.so.5.15.10 
/usr/lib/x86_64-linux-gnu/libQt5Core.so.5.15.10
| /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libQt5WebEngineCore.so.5.15.15: 
undefined reference to `snappy::RawCompress(char const*, unsigned long, char*, 
unsigned long*)'
| collect2: error: ld returned 1 exit status
| make[3]: *** [app/CMakeFiles/ktp-text-ui.dir/build.make:220: app/ktp-text-ui] 
Error 1
| make[3]: Leaving directory '/<>/obj-x86_64-linux-gnu'
| make[2]: *** [CMakeFiles/Makefile2:1633: app/CMakeFiles/ktp-text-ui.dir/all] 
Error 2
| make[2]: Leaving directory '/<>/obj-x86_64-linux-gnu'
| make[1]: *** [Makefile:149: all] Error 2
| 

Bug#1060267: -qmake: emits wrong QT_HOST_LIBEXECS - fix

2024-04-12 Thread Helmut Grohne
Control: tags -1 + patch
Control: affects -1 + qpdfview

On Thu, Feb 15, 2024 at 01:55:53AM +, Maarten van der Schrieck wrote:
> Cross building with qmake6 fails due to QT_HOST_LIBEXECS having a wrong
> value. For completeness: QT_HOST_LIBEXECS refers to the config file
> variable HostLibraryExecutables, and is internally referred to as
> QMakeLibraryInfo::HostLibraryExecutablesPath and
> QMakeLibraryInfo::LibraryPathQMakeExtras::HostLibraryExecutablesPath in
> the qmake source code.
> 
> The issue is that HostLibraryExecutables defaults to the *default* value
> of LibraryExecutables. LibraryExecutables is set to the right value (a
> concatenation of Prefix + LibraryExecutables with the value
> "/usr/lib/qt6/libexec"), but its default value is Prefix + "libexec".
> 
> As the cross build config /usr/lib//qt6/qt6.conf specifies
> Prefix as "/usr", the default of LibraryExecutables, and hence the
> default of HostLibraryExecutables, is now "/usr/libexec", which is the
> wrong value.
> 
> The simple fix is to supply the value of HostLibraryExecutables in
> /usr/lib//qt6/qt6.conf explicitly:
> 
> ...
> HostLibraryExecutables=lib/qt6/libexec
> ...

Thank you so much for locating the fix and taking the time to explain it
in so much detail.

I ran into this problem with qpdfview again and confirm that what you
propose here makes it just work.

Helmut



Bug#1061067: qml6-module-qtqml-statemachine and qml6-module-qtscxml have an undeclared file conflict

2024-01-17 Thread Helmut Grohne
Package: qml6-module-qtscxml,qml6-module-qtqml-statemachine
Version: 6.6.1-1
Severity: serious
User: debian...@lists.debian.org
Usertags: fileconflict
Control: affects -1 + libqt6scxmlqml6 libqt6statemachineqml6

qml6-module-qtqml-statemachine and qml6-module-qtscxml have an
undeclared file conflict. This may result in an unpack error from dpkg.

The file /usr/lib/x86_64-linux-gnu/libQt6StateMachineQml.so.6 is
contained in the packages
 * libqt6statemachineqml6
   * 6.4.2-2 as present in bookworm
   * 6.4.2-2~bpo11+1 as present in bullseye-backports
   * 6.4.2-4 as present in trixie|unstable
 * qml6-module-qtqml-statemachine/6.6.1-1 as present in experimental

The file /usr/lib/x86_64-linux-gnu/libQt6ScxmlQml.so.6 is contained in
the packages
 * libqt6scxmlqml6
   * 6.4.2-2 as present in bookworm
   * 6.4.2-2~bpo11+1 as present in bullseye-backports
   * 6.4.2-4 as present in trixie|unstable
 * qml6-module-qtscxml/6.6.1-1 as present in experimental

These packages can be unpacked concurrently, because there is no
relevant Replaces or Conflicts relation. Attempting to unpack these
packages concurrently results in an unpack error from dpkg, because none
of the packages installs a diversion for the affected files.

Kind regards

The Debian Usr Merge Analysis Tool

This bug report has been automatically filed with no human intervention.
The source code is available at https://salsa.debian.org/helmutg/dumat.
If the filing is unclear or in error, don't hesitate to contact
hel...@subdivi.de for assistance.



Bug#1060267: -qmake: emits wrong QT_HOST_LIBEXECS

2024-01-08 Thread Helmut Grohne
Package: qmake6
Version: 6.4.2+dfsg-20
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
X-Debbugs-Cc: debian-cr...@lists.debian.org
Control: affects -1 + src:mkvtoolnix

Hi,

-qmake6 -query currently says:

...
QT_HOST_LIBEXECS:/usr/libexec
...

A native qmake6 instead says:

...
QT_HOST_LIBEXECS:/usr/lib/qt6/libexec
...

During a cross build of mkvtoolnix, I can see:

sh: 1: /usr/libexec/rcc: not found
sh: 1: /usr/libexec/uic: not found
sh: 1: /usr/libexec/rcc: not found
sh: 1: /usr/libexec/uic: not found


Evidently, mkvtoolnix strings together QT_HOST_LIBEXECS and rcc/uic and
expects that to work. This looks reasonable initially, do you agree?

In any case, the given QT_HOST_LIBEXECS quite definitely is wrong. Can
you figure out how to make it emit a more sane value?

I guess we need to change /usr/lib//qt6/qt6.conf, but I
wouldn't know how.

Either way, if someone sees, cross build failures involving qmake6,
consider extending the affects of this bug.

Helmut



Re: Bug#1057359: qmake: use qmake6 when QT_SELECT=qt6

2023-12-11 Thread Helmut Grohne
Hi,

On Mon, Dec 04, 2023 at 10:58:44AM +0100, Salvo Tomaselli wrote:
> I use this in my rules when using qt6
> 
> 
> %:
> dh $@
> 
> override_dh_auto_configure:
> ln -s /usr/bin/qmake6 ./qmake
> PATH=`pwd`:$(PATH) dh_auto_configure
> 
> override_dh_auto_clean:
> $(RM) qmake
> dh_auto_clean

This is also being used in src:explosive-c4 now and the approach breaks
cross compilation. Please stop doing this, we'll have to touch all of
these.

Still the use case is real and we need a better way to build packages
with qmake6. I was talking with Sune and Lisandro on IRC and their
consensus seems to have been that qtchooser and QT_SELECT are dead and
should not be used for Qt6. They suggested that we add add a new
--buildsystem to debhelper. We already have qmake_qt4 and qmake, why not
have qmake6? While changing QT_SELECT from qt5 to qt6 would be
convenient, changing it to "dh $@ --buildsystem qmake6" is easy enough,
no? The qmake6 build system can reuse qmake just like qmake_qt4 and
doing it that way immediately makes cross compilation just work (since
we already have -qmake6). Lisandro requested naming it qmake6
rather than qmake_qt6. Even though this breaks consistency with earlier
use in debhelper, the similarity to how upstream calls it more
important.

Salvo and Alexandre, do you second this?

Can I also get some ack from Qt maintainers such that we can move
forward in consensus?

Helmut
diff --minimal -Nru debhelper-13.11.8/debian/changelog 
debhelper-13.11.9/debian/changelog
--- debhelper-13.11.8/debian/changelog  2023-11-15 09:10:26.0 +0100
+++ debhelper-13.11.9/debian/changelog  2023-12-11 16:21:08.0 +0100
@@ -1,3 +1,9 @@
+debhelper (13.11.9) UNRELEASED; urgency=medium
+
+  * Add the qmake6 build system. (Closes: #-1)
+
+ -- Helmut Grohne   Mon, 11 Dec 2023 16:21:08 +0100
+
 debhelper (13.11.8) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru 
debhelper-13.11.8/lib/Debian/Debhelper/Buildsystem/qmake6.pm 
debhelper-13.11.9/lib/Debian/Debhelper/Buildsystem/qmake6.pm
--- debhelper-13.11.8/lib/Debian/Debhelper/Buildsystem/qmake6.pm
1970-01-01 01:00:00.0 +0100
+++ debhelper-13.11.9/lib/Debian/Debhelper/Buildsystem/qmake6.pm
2023-12-11 16:20:28.0 +0100
@@ -0,0 +1,15 @@
+package Debian::Debhelper::Buildsystem::qmake6;
+
+use strict;
+use warnings;
+use parent qw(Debian::Debhelper::Buildsystem::qmake);
+
+sub DESCRIPTION {
+   "qmake for QT 6 (*.pro)";
+}
+
+sub _qmake {
+   return 'qmake6';
+}
+
+1


Bug#1057346: qt6-base-dev-tools is wrongly marked Multi-Arch: foreign

2023-12-03 Thread Helmut Grohne
Package: qt6-base-dev-tools
User: debian-cr...@lists.debian.org
Severity: important
Usertags: ftcbfs
Control: affects -1 + src:kuserfeedback
X-Debbugs-Cc: debian-cr...@lists.debian.org

Hi Qt maintainers and cross people,

I think I've found one of those innocent looking cross build failures
that turn into something big. src:kuserfeedback actually cross builds
successfully, but what comes out is broken:

qml6-module-org-kde-userfeedback_1.3.0-3_arm64.deb contains
./usr/lib/x86_64-linux-gnu/qt6/qml/org/kde/userfeedback/libKUserFeedbackQmlQt6.so

qt6-kuserfeedback-dev_1.3.0-3_arm64.deb contains
./usr/lib/x86_64-linux-gnu/qt6/mkspecs/modules/qt_KUserFeedbackCoreQt6.pri
and
./usr/lib/x86_64-linux-gnu/qt6/mkspecs/modules/qt_KUserFeedbackWidgetsQt6.pri

Evidently, something inserts build architecture multiarch libdirs
somehow and that's bad. Digging into kuserfeedback, I think the origin
of the earlier one is KDE_INSTALL_QMLDIR (see
src/provider/qml/CMakeLists.txt). Looking beyond, I think this is set
from extra-cmake-modules. It's not exactly clear to me how this comes
about to be. If you know please tell.

So I looked into how extra-cmake-modules constructs such paths and found
kde-modules/KDEInstallDirs6.cmake which looks related. I cannot really
draw the connection and assume there is one. Is that still convincing
enough? Is someone able to fill this gap?

Assuming we're still on track, I think stuff comes out of ecm_query_qt,
which is defined in modules/ECMQueryQt.cmake. This works differently for
Qt5 and Qt6. For Qt5, it invokes Qt5::qmake -query. This is something we
redirected to point at ${DEB_HOST_GNU_TYPE}-qmake and this generally
gives the right variables. Getting there was a longer journey, but this
now works neatly. What we're looking at here though is the Qt6 case and
there we use Qt6::qtpaths. As far as I understand it, this is new in
Qt6. While we did add a ${DEB_HOST_GNU_TYPE}-qmake6 wrapper script, I am
not aware of any qtpaths6 wrapper. Running it like qtpaths6 --query
QT_INSTALL_QML gives /usr/lib/x86_64-linux-gnu/qt6/qml here and that
very plausibly explains the original failure.

It also tells us that qtpaths6 definitely is not something that is
appropriate for shipping in a Multi-Arch: foreign package as is.
qt6-base-dev-tools is that package and it is currently marked
Multi-Arch: foreign. Just removing the marking is not the solution here.
We really want the qtpaths6 executable to reside in a Multi-Arch:
foreign package. Otherwise, we cannot run it. What we need here is a
wrapper script ${DEB_HOST_GNU_TYPE}-qtpaths6 for qtpaths6 that sets
architecture-dependent properties in matching ways. This probably
belongs to some Multi-Arch: same package. Then Qt6::qtpaths needs to be
redefined to point at the triplet-prefixed one. It is not clear to me
how packages have to be reorganized. That package containing
${DEB_HOST_GNU_TYPE}-qtpaths6 somehow needs to be pulled into the build
for kuserfeedback. The most obvious option is to rename
qt6-base-dev-tools to qt6-base-dev-tools-bin and use the previous name
for the Multi-Arch: same package. That may not be the best of solutions
though. Possibly, there already is a suitable Multi-Arch: same package
that is required anyway, which can hold these wrappers.

This is as far as I got. Does that make sense to you? Is that actionable
to Qt maintainers?

Helmut



Bug#1057338: sddm FTBFS: systemd.pc moved the upstream unit to /usr

2023-12-03 Thread Helmut Grohne
Source: sddm
Version: 0.20.0-1
Severity: serious
Tags: ftbfs patch
User: helm...@debian.org
Usertags: dep17m2

Hi,

I'm sorry for having noticed this late. When we changed the way
systemd.pc places systemd units, we did a partial archive rebuild and
missed out on sddm. On Nov 30th, the changed systemd was uploaded and
ssdm FTBFS since. The upstream unit is now installed to /usr, which
makes debian/rules fail to delete it and this trips up dh_missing. I've
got a patch for you to delete both locations for now. You may delete the
old location once you are sure that you don't want to backport to
bookworm anymore.

Helmut
diff --minimal -Nru sddm-0.20.0/debian/changelog sddm-0.20.0/debian/changelog
--- sddm-0.20.0/debian/changelog2023-06-24 08:38:52.0 +0200
+++ sddm-0.20.0/debian/changelog2023-12-03 07:36:33.0 +0100
@@ -1,3 +1,10 @@
+sddm (0.20.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS: Also ignore /usr-moved upstream systemd unit. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 03 Dec 2023 07:36:33 +0100
+
 sddm (0.20.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru sddm-0.20.0/debian/rules sddm-0.20.0/debian/rules
--- sddm-0.20.0/debian/rules2023-02-20 22:44:19.0 +0100
+++ sddm-0.20.0/debian/rules2023-12-03 07:36:31.0 +0100
@@ -30,7 +30,7 @@
 
 execute_after_dh_auto_install:
# not installed, as the Debian version is used instead
-   rm -f $(CURDIR)/debian/tmp/lib/systemd/system/sddm.service
+   rm -f $(CURDIR)/debian/tmp/lib/systemd/system/sddm.service 
$(CURDIR)/debian/tmp/usr/lib/systemd/system/sddm.service
 
 execute_after_dh_fixperms-arch:
# ensure script is marked as executable


Bug#1057299: designer-qt6: is libqquickwidget.so part of the interface or an implementation detail?

2023-12-02 Thread Helmut Grohne
Package: designer-qt6
Version: 6.6.0-2
Severity: important
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:phonon

Hi,

I am wondering whether users of designer-qt6 are supposed to use
libqquickwidget.so. Do you consider this plugin/library to be part of
the interface provided by designer-qt6 or is that internal and must not
be used by other packages?

If it is part of the interface, then designer-qt6 is wrongly marked
Multi-Arch: foreign. A shared library cannot be Multi-Arch: foreign. The
marking must be removed.

If it is not part of the interface, src:phonon must not use it during
build. In effect, this means phonon is rc-buggy.

There also is a middle ground. Maybe designer-qt6 is really meant to be
Multi-Arch: foreign. It is also possible to move libqquickwidget.so to a
different package (that is not Multi-Arch: foreign) and have
designer-qt6 depend on that extra package. Then designer-qt6 continues
to work and Multi-Arch: foreign remains valid on it, but src:phonon must
then Build-Depends on that new package.

My impression is that the last of options is what really is meant here,
but it requires restructuring packages and going through NEW. What do
you think?

In any case, the way this is currently set up grossly violates multiarch
concepts and something needs to be done.

Helmut



Bug#1057297: knewstuff FTCBFS: skips building the designer plugin

2023-12-02 Thread Helmut Grohne
Source: knewstuff
Version: 5.107.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

knewstuff fails to cross build from source, because it skips building
the designer plugin, but the packaging expects the designer plugin to be
built. Consider applying the attached patch.

Helmut
diff --minimal -Nru knewstuff-5.107.0/debian/changelog 
knewstuff-5.107.0/debian/changelog
--- knewstuff-5.107.0/debian/changelog  2023-06-18 16:08:45.0 +0200
+++ knewstuff-5.107.0/debian/changelog  2023-12-02 12:46:35.0 +0100
@@ -1,3 +1,10 @@
+knewstuff (5.107.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCFBS: Always build the designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 02 Dec 2023 12:46:35 +0100
+
 knewstuff (5.107.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru knewstuff-5.107.0/debian/patches/cross.patch 
knewstuff-5.107.0/debian/patches/cross.patch
--- knewstuff-5.107.0/debian/patches/cross.patch1970-01-01 
01:00:00.0 +0100
+++ knewstuff-5.107.0/debian/patches/cross.patch2023-12-02 
12:46:35.0 +0100
@@ -0,0 +1,17 @@
+--- knewstuff-5.107.0.orig/CMakeLists.txt
 knewstuff-5.107.0/CMakeLists.txt
+@@ -69,8 +69,12 @@
+ 
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+-
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++if (CMAKE_CROSSCOMPILING)
++set(BUILD_DESIGNERPLUGIN_DEFAULT OFF)
++else()
++set(BUILD_DESIGNERPLUGIN_DEFAULT ON)
++endif()
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" 
${BUILD_DESIGNERPLUGIN_DEFAULT})
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of 
deprecated API excluded from the build [default=0].")
diff --minimal -Nru knewstuff-5.107.0/debian/patches/series 
knewstuff-5.107.0/debian/patches/series
--- knewstuff-5.107.0/debian/patches/series 2023-03-16 22:42:02.0 
+0100
+++ knewstuff-5.107.0/debian/patches/series 2023-12-02 12:46:35.0 
+0100
@@ -1 +1,2 @@
 remove-executable-flag-from-desktop-files
+cross.patch
diff --minimal -Nru knewstuff-5.107.0/debian/rules 
knewstuff-5.107.0/debian/rules
--- knewstuff-5.107.0/debian/rules  2023-03-16 22:42:02.0 +0100
+++ knewstuff-5.107.0/debian/rules  2023-12-02 12:46:35.0 +0100
@@ -11,7 +11,7 @@
dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
xvfb-run -a dh_auto_test


Bug#1053824: qt6-base-dev has an undeclared file conflict

2023-10-11 Thread Helmut Grohne
Package: qt6-base-dev
Version: 6.6.0+dfsg-1
Severity: serious
User: debian...@lists.debian.org
Usertags: fileconflict
Control: affects -1 + qmake6

qt6-base-dev has an undeclared file conflict. This may result in an
unpack error from dpkg.

The files
 * /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/qt_config.prf
 * /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/qt_functions.prf
are contained in the packages
 * qmake6
   * 6.4.2+dfsg-10 as present in bookworm
   * 6.4.2+dfsg-11~bpo11+1 as present in bullseye-backports
   * 6.4.2+dfsg-18 as present in trixie|unstable
 * qt6-base-dev/6.6.0+dfsg-1 as present in experimental

These packages can be unpacked concurrently, because there is no
relevant Replaces or Conflicts relation. Attempting to unpack these
packages concurrently results in an unpack error from dpkg, because none
of the packages installs a diversion for the affected files.

Kind regards

The Debian Usr Merge Analysis Tool

This bug report has been automatically filed with no human intervention.
The source code is available at https://salsa.debian.org/helmutg/dumat.
If the filing is unclear or in error, don't hesitate to contact
hel...@subdivi.de for assistance.



Bug#1052178: qtscxml FTCBFS: runs the built qscxmlc

2023-09-20 Thread Helmut Grohne
Hi Lisandro,

On Wed, Sep 20, 2023 at 03:03:28PM -0300, Lisandro Pérez Meyer (ICS) wrote:
> tag 1052178 pending
> thanks

Thanks.

> Patch applied. Does this also happens with Qt 6?

Consider answering such questions yourself to avoid the delay incurred
by me in future:

https://crossqa.debian.net/src/qt6-scxml

Hint: If you cannot remember the link, go to tracker.debian.org and
locate the "cross" link in the links section.

It just works on Qt 6.

Helmut



Bug#1052178: qtscxml FTCBFS: runs the built qscxmlc

2023-09-18 Thread Helmut Grohne
Source: qtscxml-everywhere-src
Version: 5.15.10-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qtscxml-everywhere-src fails to cross build from source, because it runs
the built qscxmlc during build. It turns out that the build system is
quite clever and actually looks for a native qscxmlc first and falls
back to the host one only in case the native one is not found. As such,
adding the missing dependency is sufficient here. I would like to thank
Lisandro for helping me discover the relevant source code. As usual, I'm
attaching a patch for your convenience.

Helmut
diff --minimal -Nru qtscxml-everywhere-src-5.15.10/debian/changelog 
qtscxml-everywhere-src-5.15.10/debian/changelog
--- qtscxml-everywhere-src-5.15.10/debian/changelog 2023-07-08 
18:17:12.0 +0200
+++ qtscxml-everywhere-src-5.15.10/debian/changelog 2023-09-18 
11:07:41.0 +0200
@@ -1,3 +1,10 @@
+qtscxml-everywhere-src (5.15.10-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Add libqt5scxml5-bin to cross Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Mon, 18 Sep 2023 11:07:41 +0200
+
 qtscxml-everywhere-src (5.15.10-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --minimal -Nru qtscxml-everywhere-src-5.15.10/debian/control 
qtscxml-everywhere-src-5.15.10/debian/control
--- qtscxml-everywhere-src-5.15.10/debian/control   2023-07-08 
18:17:12.0 +0200
+++ qtscxml-everywhere-src-5.15.10/debian/control   2023-09-18 
11:07:36.0 +0200
@@ -6,6 +6,7 @@
Dmitry Shachnev ,
Lisandro Damián Nicanor Pérez Meyer 
 Build-Depends: debhelper-compat (= 13),
+   libqt5scxml5-bin ,
pkg-kde-tools,
qml-module-qttest (>= 5.15.10+dfsg~),
qtbase5-dev (>= 5.15.10+dfsg~),


Bug#1042709: qt6-base FTCBFS: doesn't build sqlbrowser

2023-07-30 Thread Helmut Grohne
Source: qt6-base
Version: 6.4.2+dfsg-17
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

Hi,

qt6-base fails to cross build again. This time, it misses building
sqlbrowser. While fixing it, I noticed that the variable we are passing
is deprecated and also update it. I'm attaching a patch for your
convenience.

Should we also
s/QT_BUILD_TOOLS_WHEN_CROSSCOMPILING/QT_FORCE_BUILD_TOOLS/ across the
rest of the qt6 packaging?

Helmut
--- qt6-base-6.4.2+dfsg/debian/changelog
+++ qt6-base-6.4.2+dfsg/debian/changelog
@@ -1,3 +1,12 @@
+qt6-base (6.4.2+dfsg-17.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do build sqlbrowser. (Closes: #-1)
+  * Move from deprecated QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to
+QT_FORCE_BUILD_TOOLS.
+
+ -- Helmut Grohne   Sun, 30 Jul 2023 12:26:03 +0200
+
 qt6-base (6.4.2+dfsg-17) unstable; urgency=medium
 
   * Team upload.
--- qt6-base-6.4.2+dfsg/debian/patches/cross.patch
+++ qt6-base-6.4.2+dfsg/debian/patches/cross.patch
@@ -21,7 +21,17 @@
  LABEL "Android deployment tool"
  PURPOSE "The Android deployment tool automates the process of creating 
Android packages."
 -CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression)
-+CONDITION QT_FEATURE_regularexpression)
++CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND 
QT_FEATURE_regularexpression)
  
  qt_feature("macdeployqt" PRIVATE
  SECTION "Deployment"
+--- a/examples/sql/CMakeLists.txt
 b/examples/sql/CMakeLists.txt
+@@ -12,6 +12,6 @@ if(TARGET Qt::Xml)
+ qt_internal_add_example(masterdetail)
+ endif()
+ 
+-if(NOT CMAKE_CROSSCOMPILING)
++if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
+ qt_internal_add_example(sqlbrowser)
+ endif()
--- qt6-base-6.4.2+dfsg/debian/rules
+++ qt6-base-6.4.2+dfsg/debian/rules
@@ -24,7 +24,7 @@
extra_cmake_args += \
-DQT_HOST_PATH=/usr \
-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
-   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+   -DQT_FORCE_BUILD_TOOLS=ON
 endif
 
 %:


Bug#1040496: qt6-virtualkeyboard FTBFS with parallel=1: qmlcachegen segfaults

2023-07-25 Thread Helmut Grohne
Hi Lisandro,

On Tue, Jul 25, 2023 at 09:23:14PM -0300, Lisandro Damian Nicanor Perez Meyer 
wrote:
> As discussed on IRC I am hacking around this in qt6-virtualkeyboard 
> 6.4.2+dfsg-3 so parallel is at least 2. I personally do not think this is an 
> RC bug, but at least we have a way to avoid the FTBFS for the time being.

Let me clarify my view on this. I see a failure to build from source
when passing parallel=1 as an RC bug. However, I do not see a failure to
honour the requested parallelity as an important bug. When I request
parallel=1 and your package successfully performs a parallel build,
that's not an important bug in my view. There are a number of packages
in the archive doing this. As long as your workaround does not cause
random FTBFS (e.g. on slower buildds), I think it adequately addresses
the issue I raised and I'm happy with you closing the bug.

Leaving that aside, an unexplained segfault during build is probably
worth investigation (though not an RC bug either).

Is this something you can agree to?

Helmut



Bug#1041300: qt6-base-dev: undeclared file conflict with libqt6opengl6-dev

2023-07-16 Thread Helmut Grohne
Package: qt6-base-dev
Version: 6.4.2+dfsg-12
Severity: serious

The recent upload makes qt6-base-dev include a fair number of files also
contained in libqt6opengl6-dev. Is this some kind of packaging mistake?

Helmut



Bug#1040717: qt6-remoteobjects FTCBFS: misses the native repc

2023-07-09 Thread Helmut Grohne
Source: qt6-remoteobjects
Version: 6.4.2-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-remoteobjects recently gained that common -DQT_HOST_PATH flag.
Thanks for adding it without having me file a patch for it.

This is one of the cases where that change is necessary and
insufficient. We also need a native repc here. We need another
dependency and some cmake flags to get that working. I'm a attaching a
patch for your convenience.

Note that this kind of change also somewhat is a pattern, but it is less
mechanical and less frequent than the -DQT_HOST_PATH one. Therefore, I
see no need for you to proactively do this for me in other packages.

Helmut
diff --minimal -Nru qt6-remoteobjects-6.4.2/debian/changelog 
qt6-remoteobjects-6.4.2/debian/changelog
--- qt6-remoteobjects-6.4.2/debian/changelog2023-06-22 00:06:36.0 
+0200
+++ qt6-remoteobjects-6.4.2/debian/changelog2023-07-08 12:08:13.0 
+0200
@@ -1,3 +1,10 @@
+qt6-remoteobjects (6.4.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the build repc and also build it for host. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 08 Jul 2023 12:08:13 +0200
+
 qt6-remoteobjects (6.4.2-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-remoteobjects-6.4.2/debian/control 
qt6-remoteobjects-6.4.2/debian/control
--- qt6-remoteobjects-6.4.2/debian/control  2022-12-30 16:46:01.0 
+0100
+++ qt6-remoteobjects-6.4.2/debian/control  2023-07-08 12:08:12.0 
+0200
@@ -18,6 +18,7 @@
qt6-base-private-dev (>= 6.4.2+dfsg~),
qt6-declarative-dev (>= 6.4.2+dfsg~),
qt6-declarative-private-dev (>= 6.4.2+dfsg~),
+   qt6-remoteobjects-dev:native ,
xauth ,
xvfb ,
 Standards-Version: 4.6.2
diff --minimal -Nru qt6-remoteobjects-6.4.2/debian/rules 
qt6-remoteobjects-6.4.2/debian/rules
--- qt6-remoteobjects-6.4.2/debian/rules2023-06-22 00:05:50.0 
+0200
+++ qt6-remoteobjects-6.4.2/debian/rules2023-07-08 12:08:13.0 
+0200
@@ -6,7 +6,10 @@
 
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-   extra_cmake_args += -DQT_HOST_PATH=/usr
+   extra_cmake_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
 endif
 
 %:


Bug#1040496: qt6-virtualkeyboard FTBFS with parallel=1: qmlcachegen segfaults

2023-07-06 Thread Helmut Grohne
Source: qt6-virtualkeyboard
Version: 6.4.2+dfsg-2
Severity: serious
Tags: ftbfs

qt6-virtualkeyboard fails to build from source in unstable when passing
DEB_BUILD_OPTIONS=parallel=1. A build ends as follows:

| [110/301] cd /<>/obj-x86_64-linux-gnu/src/components && 
/usr/bin/cmake -E make_directory 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmlcache && 
/usr/lib/qt6/libexec/qmlcachegen --bare --resource-path 
/qt-project.org/imports/QtQuick/VirtualKeyboard/Components/Keyboard.qml -I 
/<>/obj-x86_64-linux-gnu/lib/x86_64-linux-gnu/qt6/qml -I 
/usr/lib/x86_64-linux-gnu/qt6/qml -i 
/<>/obj-x86_64-linux-gnu/lib/x86_64-linux-gnu/qt6/qml/QtQuick/VirtualKeyboard/Components/qmldir
 --resource 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmake_QtQuick_VirtualKeyboard_Components.qrc
 --resource 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qtvkbcomponentsplugin_raw_qml_0.qrc
 -o 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmlcache/qtvkbcomponentsplugin_Keyboard_qml.cpp
 /<>/src/components/Keyboard.qml
| FAILED: src/components/.rcc/qmlcache/qtvkbcomponentsplugin_Keyboard_qml.cpp 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmlcache/qtvkbcomponentsplugin_Keyboard_qml.cpp
| cd /<>/obj-x86_64-linux-gnu/src/components && /usr/bin/cmake -E 
make_directory 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmlcache && 
/usr/lib/qt6/libexec/qmlcachegen --bare --resource-path 
/qt-project.org/imports/QtQuick/VirtualKeyboard/Components/Keyboard.qml -I 
/<>/obj-x86_64-linux-gnu/lib/x86_64-linux-gnu/qt6/qml -I 
/usr/lib/x86_64-linux-gnu/qt6/qml -i 
/<>/obj-x86_64-linux-gnu/lib/x86_64-linux-gnu/qt6/qml/QtQuick/VirtualKeyboard/Components/qmldir
 --resource 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmake_QtQuick_VirtualKeyboard_Components.qrc
 --resource 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qtvkbcomponentsplugin_raw_qml_0.qrc
 -o 
/<>/obj-x86_64-linux-gnu/src/components/.rcc/qmlcache/qtvkbcomponentsplugin_Keyboard_qml.cpp
 /<>/src/components/Keyboard.qml
| Segmentation fault (core dumped)
| ninja: build stopped: subcommand failed.
| dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j1 -v 
returned exit code 1
| make: *** [debian/rules:12: binary] Error 25
| dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 
2

This originally was a cross build failure, but it also reproduces
natively. Therefore, I know that it also fails on an arm64 machine. In
all of my testing, all parallel=1 builds reliably failed while all
builds that weren't parallel=1 succeeded (cross or native). This is not
necessarily a bug in qt6-virtualkeyboard itself. I'll leave it up to you
to reassign as necessary.

Helmut



Bug#1034951: ktexteditor-data: missing Breaks+Replaces for libkf5texteditor-dev when upgrading from bullseye

2023-04-27 Thread Helmut Grohne
Package: ktexteditor-data
Version: 5.103.0-1
Severity: serious
Justification: dpkg unpack error

Attempting to unpack ktexteditor-data/5.103.0-1 from Debian bookworm
on a minimal Debian bullseye with libkf5texteditor-dev/5.78.0-3
installed, causes an unpack error from dpkg due to
/usr/share/kdevappwizard/templates/ktexteditor-plugin.tar.bz2 being contained 
in both packages.

| (Reading database ... 23827 files and directories currently installed.)
| Preparing to unpack .../ktexteditor-data_5.103.0-1_all.deb ...
| Unpacking ktexteditor-data (5.103.0-1) over (5.78.0-3) ...
| dpkg: error processing archive ./ktexteditor-data_5.103.0-1_all.deb 
(--unpack):
|  trying to overwrite 
'/usr/share/kdevappwizard/templates/ktexteditor-plugin.tar.bz2', which is also 
in package libkf5texteditor-dev 5.78.0-3
| dpkg-deb: error: paste subprocess was killed by signal (Broken pipe)
| Processing triggers for dbus (1.12.24-0+deb11u1) ...
| Errors were encountered while processing:
|  ./ktexteditor-data_5.103.0-1_all.deb


Please ensure that ktexteditor-data has sufficient Breaks and Replaces 
declarations.

Helmut



Bug#1034410: qt6-3d FTCBFS: does not pass QT_HOST_PATH

2023-04-14 Thread Helmut Grohne
Source: qt6-3d
Version: 6.4.2+dfsg-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-3d fails to cross build from source, because it does not pass
QT_HOST_PATH. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-3d-6.4.2+dfsg/debian/changelog 
qt6-3d-6.4.2+dfsg/debian/changelog
--- qt6-3d-6.4.2+dfsg/debian/changelog  2023-02-04 11:18:40.0 +0100
+++ qt6-3d-6.4.2+dfsg/debian/changelog  2023-04-12 20:44:28.0 +0200
@@ -1,3 +1,10 @@
+qt6-3d (6.4.2+dfsg-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 12 Apr 2023 20:44:28 +0200
+
 qt6-3d (6.4.2+dfsg-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-3d-6.4.2+dfsg/debian/rules 
qt6-3d-6.4.2+dfsg/debian/rules
--- qt6-3d-6.4.2+dfsg/debian/rules  2022-12-30 16:46:01.0 +0100
+++ qt6-3d-6.4.2+dfsg/debian/rules  2023-04-12 20:44:26.0 +0200
@@ -3,13 +3,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+extra_cmake_args=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1033706: qt6-networkauth FTCBFS: does not pass QT_HOST_PATH

2023-03-30 Thread Helmut Grohne
Source: qt6-networkauth
Version: 6.4.2-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

Hi,

yeah, this is another package missing QT_HOST_PATH and it's the same
obvious patch as usual. Attached.

Helmut
diff --minimal -Nru qt6-networkauth-6.4.2/debian/changelog 
qt6-networkauth-6.4.2/debian/changelog
--- qt6-networkauth-6.4.2/debian/changelog  2023-01-26 23:03:37.0 
+0100
+++ qt6-networkauth-6.4.2/debian/changelog  2023-03-30 14:02:57.0 
+0200
@@ -1,3 +1,10 @@
+qt6-networkauth (6.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Thu, 30 Mar 2023 14:02:57 +0200
+
 qt6-networkauth (6.4.2-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-networkauth-6.4.2/debian/rules 
qt6-networkauth-6.4.2/debian/rules
--- qt6-networkauth-6.4.2/debian/rules  2022-12-30 16:46:01.0 +0100
+++ qt6-networkauth-6.4.2/debian/rules  2023-03-30 14:02:56.0 +0200
@@ -3,13 +3,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+extra_cmake_args=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --buildsystem=cmake+ninja --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1033647: qt6-connectivity FTCBFS: does not pass QT_HOST_PATH to cmake

2023-03-29 Thread Helmut Grohne
Source: qt6-connectivity
Version: 6.4.2-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

Hi,

qt6-connectivity is another package that misses QT_HOST_PATH. I've
attached the obvious patch.

Helmut
diff --minimal -Nru qt6-connectivity-6.4.2/debian/changelog 
qt6-connectivity-6.4.2/debian/changelog
--- qt6-connectivity-6.4.2/debian/changelog 2023-01-22 11:20:28.0 
+0100
+++ qt6-connectivity-6.4.2/debian/changelog 2023-03-29 09:57:30.0 
+0200
@@ -1,3 +1,10 @@
+qt6-connectivity (6.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH to cmake. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 29 Mar 2023 09:57:30 +0200
+
 qt6-connectivity (6.4.2-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-connectivity-6.4.2/debian/rules 
qt6-connectivity-6.4.2/debian/rules
--- qt6-connectivity-6.4.2/debian/rules 2023-01-22 11:17:11.0 +0100
+++ qt6-connectivity-6.4.2/debian/rules 2023-03-29 09:57:26.0 +0200
@@ -4,13 +4,20 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+extra_cmake_args=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1032889: itinerary doesn't start at all

2023-03-13 Thread Helmut Grohne
Hi Scott and Sune,

On Mon, Mar 13, 2023 at 03:31:35PM +, Scott Kitterman wrote:
> Is qml-module-org-kde-i18n-localedata installed?

Thanks for the suggestion. It was not installed. Installing it didn't
fix it, but the error message looked different afterwards (the VM didn't
have copy). I guessed that qml-module-org-kde-kirigami2 would also
be needed and after installing that, I actually got a window! I cannot
tell whether i18n is also needed or just kirigami2.

Helmut



Bug#1032889: itinerary doesn't start at all

2023-03-13 Thread Helmut Grohne
Package: itinerary
Version: 22.12.2-1
Severity: serious

Hi,

I wanted to give itinerary a try, so I installed a pretty minimal system
in a VM and installed itinerary with recommends enabled. When I started
it from a graphical terminal, it printed a few lines and hung without
displaying a window. Even installing task-kde-desktop would not make a
difference to this. So I assume that this application is quite
fundamentally broken. If you happen to find a way to actually run it,
please downgrade the severity of this bug. Here is the output:

| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| org.kde.kpublictransport: Unknown backend setting: "supportedOutputFormats"
| has portal: false
| QQmlApplicationEngine failed to load component
| qrc:/main.qml:192:9: Type App.TimelinePage unavailable
| qrc:/TimelinePage.qml:170:9: Type App.HotelPage unavailable
| qrc:/HotelPage.qml:19:9: Type App.HotelEditor unavailable
| qrc:/HotelEditor.qml:32:9: Type App.PlaceEditor unavailable
| qrc:/PlaceEditor.qml:13:1: module "org.kde.i18n.localeData" is not installed

Hope this helps

Helmut



Bug#1032307: kwin FTCBFS: the devil is in the detail

2023-03-03 Thread Helmut Grohne
Source: kwin
Version: 4:5.27.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
X-Debbugs-Cc: debian-cr...@lists.debian.org

Hi,

I noticed that kwin fails to cross build from source and while looking
into it, it turned ever more complex. I'll copy it to d-cross@l.d.o for
instruction purposes.

The immediate failure looked fairly simple to me:

| In file included from 
/<>/obj-mipsel-linux-gnu/src/kwin_autogen/IEXH3JLKNG/moc_drmlease_v1_interface_p.cpp:10,
|  from 
/<>/obj-mipsel-linux-gnu/src/kwin_autogen/mocs_compilation.cpp:159:
| 
/<>/obj-mipsel-linux-gnu/src/kwin_autogen/IEXH3JLKNG/../../../../src/wayland/drmlease_v1_interface_p.h:52:10:
 error: ‘void 
KWaylandServer::DrmLeaseDeviceV1Interface::wp_drm_lease_device_v1_destroy_global()’
 marked ‘override’, but does not override
|52 | void wp_drm_lease_device_v1_destroy_global() override;
|   |  ^
| make[3]: *** [src/CMakeFiles/kwin.dir/build.make:235: 
src/CMakeFiles/kwin.dir/kwin_autogen/mocs_compilation.cpp.o] Error 1

I thought, this probably also fails natively and I can file a FTBFS.
Nope, it builds natively. Then I actually looked into the source and
found that wp_drm_lease_device_v1_destroy_global is a method in a class
DrmLeaseDeviceV1Interface supposedly inherited from
QtWaylandServer::wp_drm_lease_device_v1, for which I couldn't locate any
source with codesearch. That's when Sune Vuorela reminded me of
qtwaylandscanner. I thought that since we're using the same
qtwaylandscanner binary for both the native amd64 build and the amd64 ->
mipsel cross build, the difference must be the compiler invocation, so I
compared it and found that really the only difference was the compiler
binary name. Bummer. After a little more time, I actually went down and
compared the qtwaylandscanner invocation lines and observed that
qtwaylandscanner (cross build) != qtwaylandscanner_kde (native build)
and that their outputs would differ in precisely the method that is
missing here. So then I looked for where qtwaylandscanner_kde would come
from and learned that we aren't supposed to pass it but rather
src/wayland/tools/CMakeLists.txt wants to build it itself and you should
be passing a KF5_HOST_TOOLING path. Note that when kde says "host", GNU
people need to read "build". So I tried setting that, but it influences
a ton of other packages and would require me to install the entire KF5
stack natively. I then noticed that it only really is being used to
derive a NATIVE_PREFIX, which only actually needs to contain a native
qt5 base. So I tried patching out the requirement for passing
KF5_HOST_TOOLING and that actually happened to work.

I hope that this was educational or entertaining to read. If not, you
can just apply the attached patch and have kwin cross build again.

Helmut
diff --minimal -Nru kwin-5.27.0/debian/changelog kwin-5.27.0/debian/changelog
--- kwin-5.27.0/debian/changelog2023-02-18 17:08:46.0 +0100
+++ kwin-5.27.0/debian/changelog2023-03-02 08:43:06.0 +0100
@@ -1,3 +1,15 @@
+kwin (4:5.27.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ qtwaylandscanner != qtwaylandscanner_kde. Don't pass it.
++ Instead pass NATIVE_PREFIX of a qt5 base installation to build
+  a native qtwaylandscanner_kde as ExternalProject.
++ Do not require a full native KF5 toolchain.
++ Require a native qt5 base.
+
+ -- Helmut Grohne   Thu, 02 Mar 2023 08:43:06 +0100
+
 kwin (4:5.27.0-1) unstable; urgency=medium
 
   [ Pino Toscano ]
diff --minimal -Nru kwin-5.27.0/debian/control kwin-5.27.0/debian/control
--- kwin-5.27.0/debian/control  2023-02-17 22:43:47.0 +0100
+++ kwin-5.27.0/debian/control  2023-03-02 08:43:06.0 +0100
@@ -85,6 +85,7 @@
plasma-wayland-protocols (>= 1.9.0~),
python3:any,
qtbase5-dev (>= 5.15.2~),
+   qtbase5-dev:native (>= 5.15.2~),
qtbase5-private-dev,
qtdeclarative5-dev (>= 5.15.2~),
qttools5-dev (>= 5.15.2~),
diff --minimal -Nru kwin-5.27.0/debian/patches/cross.patch 
kwin-5.27.0/debian/patches/cross.patch
--- kwin-5.27.0/debian/patches/cross.patch  1970-01-01 01:00:00.0 
+0100
+++ kwin-5.27.0/debian/patches/cross.patch  2023-03-02 08:43:06.0 
+0100
@@ -0,0 +1,19 @@
+--- kwin-5.27.0.orig/src/wayland/tools/CMakeLists.txt
 kwin-5.27.0/src/wayland/tools/CMakeLists.txt
+@@ -13,13 +13,12 @@
+ add_executable(qtwaylandscanner_kde IMPORTED GLOBAL)
+ set_target_properties(qtwaylandscanner_kde PROPERTIES IMPORTED_LOCATION 
${QTWAYLANDSCANNER_KDE_EXECUTABLE})
+ elseif(CMAKE_CROSSCOMPILING)
+-if (NOT KF5_HOST_TOOLING)
+-message(FATAL_ERROR "Please provide a prefix with a native Qt build 
and pass -DKF5_HOST_TOOLING=path")
+-endif()
+-
+ # se

Bug#1030980: Qt6::qmake IMPORTED_LOCATION points to build architecture qmake6

2023-02-20 Thread Helmut Grohne
Hi Dmitry and Lisandro,

thanks for working on this.

On Mon, Feb 20, 2023 at 10:49:52AM +0300, Dmitry Shachnev wrote:
> On Sun, Feb 19, 2023 at 08:20:43PM -0300, Lisandro Damián Nicanor Pérez Meyer 
> wrote:
> > On Sun, 19 Feb 2023 at 16:59, Dmitry Shachnev  wrote:
> > > What are these paths?
> > >
> > > I think one that Helmut mentioned is the most important and should cover 
> > > most
> > > cases.
> >
> > Paths to uic. moc et all.
> 
> IIRC, uic and moc produce the same output on all architectures, so we do not
> need cross wrappers for them.
> 
> So calling the native /usr/lib/qt6/bin/{uic,moc} should be absolutely fine.

I agree with all of that.

Lisandro also asked:

| sbuild -host arm64 -sAd unstable some_qt6_app.dsc a good way to test this?

I's --host rather than -host.

Do not pass -A. To simplify matters, cross builds are always assumed to
be arch-only.

Other than that, this should work.

Maybe you should check that qemu's binfmt integration is disabled.
Otherwise, you may be a successful build that only happened to work due
to using qemu. You can run "update-binfmts --disable" to disable all
binfmts and reenable them afterwards.

Helmut



Bug#1030980: Qt6::qmake IMPORTED_LOCATION points to build architecture qmake6

2023-02-09 Thread Helmut Grohne
Package: qt6-base-dev
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:fcitx-qt5

Hi,

thanks for adding the -qmake6 wrapper. This piece seems to work
fine. The next step is making packages actually use it and this is where
it gets difficult.

fcitx-qt6 extracts the Qt6::qmake IMPORTED_LOCATION and expects to find
a working qmake there. What it gets is the build architecture qmake
instead of our lovely wrapper. Bummer.

I looked into how this could be fixed and got entangled in the mess of
cmake files until I completely lost track. What I found is that the
imported location is (wrongly) defined in
/usr/lib//cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake as
${_IMPORT_PREFIX}/lib/qt6/libexec/qmake aka /usr/lib/qt6/libexec/qmake
while it should be /usr/bin/-qmake6.  Tracking down how this
file is generated is where I failed. Would someone be available to
support me with that task?

Thanks in advance

Helmut



Bug#1030384: qt6-serialport FTCBFS: does not pass QT_HOST_PATH to cmake

2023-02-03 Thread Helmut Grohne
Source: qt6-serialport
Version: 6.4.2-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-serialport fails to cross build from source, because it does not
pass QT_HOST_PATH to cmake. I've attached the usual patch for your
convenience.

Helmut
diff --minimal -Nru qt6-serialport-6.4.2/debian/changelog 
qt6-serialport-6.4.2/debian/changelog
--- qt6-serialport-6.4.2/debian/changelog   2023-01-24 12:38:10.0 
+0100
+++ qt6-serialport-6.4.2/debian/changelog   2023-02-03 14:40:13.0 
+0100
@@ -1,3 +1,10 @@
+qt6-serialport (6.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH to cmake. (Closes: #-1)
+
+ -- Helmut Grohne   Fri, 03 Feb 2023 14:40:13 +0100
+
 qt6-serialport (6.4.2-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-serialport-6.4.2/debian/rules 
qt6-serialport-6.4.2/debian/rules
--- qt6-serialport-6.4.2/debian/rules   2022-12-30 16:46:01.0 +0100
+++ qt6-serialport-6.4.2/debian/rules   2023-02-03 14:40:12.0 +0100
@@ -4,13 +4,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+extra_cmake_args=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --buildsystem=cmake+ninja --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1030035: qt6-charts FTCBFS: does not pass QT_HOST_PATH

2023-01-30 Thread Helmut Grohne
Source: qt6-charts
Version: 6.4.2-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-charts fails to cross build from source, because it does not pass
QT_HOST_PATH. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-charts-6.4.2/debian/changelog 
qt6-charts-6.4.2/debian/changelog
--- qt6-charts-6.4.2/debian/changelog   2023-01-24 12:26:24.0 +0100
+++ qt6-charts-6.4.2/debian/changelog   2023-01-30 13:18:31.0 +0100
@@ -1,3 +1,10 @@
+qt6-charts (6.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Mon, 30 Jan 2023 13:18:31 +0100
+
 qt6-charts (6.4.2-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-charts-6.4.2/debian/rules qt6-charts-6.4.2/debian/rules
--- qt6-charts-6.4.2/debian/rules   2022-12-30 16:46:01.0 +0100
+++ qt6-charts-6.4.2/debian/rules   2023-01-30 13:18:27.0 +0100
@@ -3,13 +3,20 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+cmake_extra_args :=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
+
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1029082: qtbase-opensource-src-gles FTCBFS: out of sync with qtbase-opensource-src

2023-01-17 Thread Helmut Grohne
Source: qtbase-opensource-src-gles
Version: 5.15.8+dfsg-1
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qtbase-opensource-src-gles fails to build from source, because it
requires its version to match exactly the version of
qtbase-opensource-src, but an upload is presently missing:

test "`dpkg-query -f '${Version}' -W qt5-qmake-bin`" = "5.15.8+dfsg-1"
make[1]: *** [debian/rules:73: override_dh_auto_configure] Error 1

Would you mind either uploading these packages in lockstep or relaxing
the version check (e.g. ignoring the Debian release) such that it no
longer fails?

Helmut



Bug#1024752: closed by Debian FTP Masters (reply to Patrick Franz ) (Bug#1024752: fixed in qt6-websockets 6.4.1-2)

2023-01-03 Thread Helmut Grohne
Control: reopen -1

Hi Patrick,

On Sun, Dec 11, 2022 at 12:57:05AM +, Debian Bug Tracking System wrote:
> It has been closed by Debian FTP Masters  
> (reply to Patrick Franz ).

I think the patch got broken during application. extra_cmake_args vs
cmake_extra_args. Could you fix that up?

Helmut



Bug#1025663: qmake6: how should users query for QT_INSTALL_PLUGINS?

2022-12-26 Thread Helmut Grohne
Control: tags -1 + patch

On Mon, Dec 26, 2022 at 10:27:18AM -0300, Lisandro Damián Nicanor Pérez Meyer 
wrote:
> I would very much prefer (a). Now, as you said, timing is important
> here. Do we need a pass through NEW? If that's the case then that will
> need to happen after the next transition, if time allows it. If it can
> be easily added to the existing packaging without the need of NEW then
> we might add it right now.

No, (a) does not require going through NEW. There already is qmake6-bin.
qmake6 and qmake6-bin even have the needed Multi-Arch values already.

> Last time you did the packaging with DMitry, so I'm kind of lost here.

Dmitry also expressed being in favour of (a). Notably missing is a
response from Patrick.

In any case, I've attached a patch for it now. It is based on what we do
for qt5.

I caution though that selecting version 5 or 6 is kinda messed up. If
you run qmake6 or -qmake6, it'll use qt6 as expected. If you
run plain qmake, it'll go through qtchooser and select the relevant
version via QT_SELECT. Howeve, -qmake is presently owned by
qt5-qmake only and will bypass qtchoser without honouring QT_SELECT. If
we want "QT_SELECT=6 -qmake" to run the cross qt6 qmake, we'll
also have to modify qtchooser and qt5-qmake.

Helmut
diff -Nru qt6-base-6.3.1+dfsg/debian/changelog 
qt6-base-6.3.1+dfsg/debian/changelog
--- qt6-base-6.3.1+dfsg/debian/changelog2022-10-01 18:58:47.0 
+0200
+++ qt6-base-6.3.1+dfsg/debian/changelog2022-12-26 22:56:51.0 
+0100
@@ -1,3 +1,10 @@
+qt6-base (6.3.1+dfsg-10.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install -qmake6 cross wrapper. (Closes: #1025663)
+
+ -- Helmut Grohne   Mon, 26 Dec 2022 22:56:51 +0100
+
 qt6-base (6.3.1+dfsg-10) unstable; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
diff -Nru qt6-base-6.3.1+dfsg/debian/qmake-cross-wrapper.in 
qt6-base-6.3.1+dfsg/debian/qmake-cross-wrapper.in
--- qt6-base-6.3.1+dfsg/debian/qmake-cross-wrapper.in   1970-01-01 
01:00:00.0 +0100
+++ qt6-base-6.3.1+dfsg/debian/qmake-cross-wrapper.in   2022-12-26 
22:56:51.0 +0100
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+if [ "x$1" = x-qt6 ] || [ "x$1" = "x-qt=6" ] || [ "x$1" = "x-qt=qt6" ]; then
+   shift
+fi
+
+QMAKE_MODE=
+
+if [ "x$1" = x-query ]; then
+   exec /usr/lib/qt6/bin/qmake "$@" -qtconf 
/usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf
+elif [ "x$1" = x-makefile ] || [ "x$1" = x-project ]; then
+   QMAKE_MODE="$1"
+   shift
+fi
+
+exec /usr/lib/qt6/bin/qmake6 \
+   $QMAKE_MODE \
+   -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf \
+   -early \
+   QMAKE_CC=${CC:-@DEB_HOST_GNU_TYPE@-gcc} \
+   QMAKE_CXX=${CXX:-@DEB_HOST_GNU_TYPE@-g++} \
+   QMAKE_LINK=${CXX:-@DEB_HOST_GNU_TYPE@-g++} \
+   QMAKE_STRIP=${STRIP:-@DEB_HOST_GNU_TYPE@-strip} \
+   QMAKE_QMAKE=/usr/bin/@DEB_HOST_GNU_TYPE@-qmake6 \
+   PKG_CONFIG=@DEB_HOST_GNU_TYPE@-pkg-config \
+   -before \
+   "$@"
diff -Nru qt6-base-6.3.1+dfsg/debian/qmake6.install 
qt6-base-6.3.1+dfsg/debian/qmake6.install
--- qt6-base-6.3.1+dfsg/debian/qmake6.install   2022-04-22 19:50:08.0 
+0200
+++ qt6-base-6.3.1+dfsg/debian/qmake6.install   2022-12-26 22:56:45.0 
+0100
@@ -1,3 +1,4 @@
+usr/bin/*-qmake6
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/aix-g++-64/qmake.conf
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/aix-g++-64/qplatformdefs.h
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/aix-g++/qmake.conf
diff -Nru qt6-base-6.3.1+dfsg/debian/rules qt6-base-6.3.1+dfsg/debian/rules
--- qt6-base-6.3.1+dfsg/debian/rules2022-09-17 19:21:11.0 +0200
+++ qt6-base-6.3.1+dfsg/debian/rules2022-12-26 22:56:51.0 +0100
@@ -89,6 +89,12 @@
sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/qt.conf.in \
> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/qt6.conf
 
+   mkdir -p debian/tmp/usr/bin
+   sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+   -e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
+   < debian/qmake-cross-wrapper.in > 
debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
+   chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
+
 override_dh_makeshlibs:
dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport 
-XlibQt6EglFsKmsSupport -XlibQt6XcbQpa
 


Bug#906966: closed by Maximiliano Curia (Bug#906966: fixed in kdesignerplugin 5.51.0-1)

2022-12-15 Thread Helmut Grohne
Control: reopen -1
Control: found -1 5.83.0-1

On Wed, Nov 07, 2018 at 05:27:04PM +, Debian Bug Tracking System wrote:
> #906966: kdesignerplugin FTCBFS: KF5::kgendesignerplugin: not found
> 
> It has been closed by Maximiliano Curia .

The fix has been reverted in 5.83.0-1. Would someone know why?

Helmut



Bug#1025663: qmake6: how should users query for QT_INSTALL_PLUGINS?

2022-12-08 Thread Helmut Grohne
Hi Fab,

please keep debian-cr...@lists.debian.org in the loop. Full quoting.

On Thu, Dec 08, 2022 at 08:29:52AM +0100, Fab Stz wrote:
> Not sure this fits your issue and if this could work.
> 
> I used to produce android-builds that are sort of 'target' builds (and not 
> host builds). There is a specific qmake to be called when building with a 
> target-build. That qmake is in the bin directory of the target build. And 
> that 
> qmake uses the "target_qt.conf" file which should contain the path you expect.

Before we delve into this, I'd like to clarify terminology. I'm going to
assume that when you say "target" you mean "host" in GNU terminology and
when you say "host" you mean "build" in GNU terminology. Please correct
me if I got that wrong.

I think this is similar to what I called "a" and I'll call your variant
"a2" to ease comparison. In both cases, there is a specific qmake (either
a binary in case of a2 or a wrapper script in case of a). Both reference
separate qtconf. In case of qt5, the wrapper injects a -qtconf argument.
The aspect where this differ is the location. In a2 you have the
standard qmake6 name on a non-$PATH directory whereas in a, you a
different executable name on $PATH.

> However, for now, not all path are there and especially the Plugins dir isn't 
> there. They will be once this is merged:
> 
> https://codereview.qt-project.org/c/qt/qtbase/+/436758/19/cmake/
> QtQmakeHelpers.cmake
> 
> Maybe a solution could be to run qmake by specifying your own target_qt.conf 
> that has the values you need ?

I think we're closer that you might expect. For most non-Debian
ecosystems, you need a specific target_qt.conf due to the need for
sysroots. It is specific to the combination of build architecture and
host architecture (in Qt terminology: host architecture and target
architecture). However, cross building on Debian has done away with sysroots
and replaced them with multiarch. As such, we can remove the build
architecture (in Qt terminology: host architecture) from the
configuration and just use the existing
/usr/lib/${DEB_HOST_MULTIARCH}/qt6/qt6.conf. This is what we do for qt5
already.

To me this reinforces the view that we should rather go for a wrapper
than have our build matrix explode into O(n^2) (for n being the count of
architectures).

Let me give an example:

$ dpkg --print-architecture
amd64
$ sudo dpkg --add-architecture armhf
$ sudo apt update
...
$ sudo apt install qmake6:armhf
...
$ qmake6 -qtconf /usr/lib/arm-linux-gnueabihf/qt6/qt6.conf -query 
QT_INSTALL_PLUGINS
/usr/lib/arm-linux-gnueabihf/qt6/plugins
$

And to do proposal a, we'd have a wrapper
/usr/bin/arm-linux-gnueabihf-qmake6 (just like the one for qt5) that
would inject the -qtconf argument. So that would become:

$ arm-linux-gnueabihf-qmake6 -query QT_INSTALL_PLUGINS
/usr/lib/arm-linux-gnueabihf/qt6/plugins
$

And then we could point Qt6::qmake at this path.

In order to support other workflows, we can also have a separate
directory with a symlink to this named just qmake6 to support the
sysroot approach.

I'd like to get some reply from Patrick before moving forward with this
though. And it would be super awesome if this could be included in
bookworm, so time isn't infinite here.

Helmut



Bug#1025663: qmake6: how should users query for QT_INSTALL_PLUGINS?

2022-12-06 Thread Helmut Grohne
Package: qmake6
Version: 6.3.1+dfsg-10
Severity: important
Control: affects -1 + src:fcitx-qt5
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
X-Debbugs-Cc: debian-cr...@lists.debian.org

Hi,

we've hit an interesting issue with qmake for QT6. This almost certainly
is a pattern and I'll use fcitx-qt5 as an example.

fcitx-qt5 looks for a target Qt6::qmake and queries its LOCATION
property to be able to run it. Then it runs that with -query
QT_INSTALL_PLUGINS to locate the installation directory for plugins.
Unfortunately, what it gets is the build architecture one rather than
the host architecture one.

The crux of this is that /usr/bin/qmake6 cannot know about the host
architecture. That information is a parameter of the build and nothing
has passed this information along to it. It cannot just pull this
information out of nothing. So we basically have two options:

a) Make sure that Qt6::qmake's LOCATION resolves to something that
   includes the information of the host architecture somehow.
b) Declare that this method of querying qmake is unsupported and fix
   every package (including fcitx-qt5) in some other way.

For b), I have no clue what that other way would be. If someone knows,
that would be great. I also have little clue how frequent this pattern
is and how many packages we would have to fix. The expectation is "many"
from my experience with QT5.

The implications of a) are quite well understood, because that's the
route we opted for with QT5. It's a fairly involved route that took us
more than a year to work properly, but maybe we can speed up by learning
from earlier mistakes, so how does it work?

The qmake6 package gains new binaries /usr/bin/-qmake6. These
actually are shell scripts that wrap qmake6 and inject the information
about the host architecture into the command line. Then, we centrally
divert Qt6::qmake to this location and everything will magically work.
To get an idea how this works, install qt5-qmake and look at
/usr/bin/$(dpkg -qDEB_BUILD_GNU_TYPE)-qmake. That should be fairly
obvious. We're in a far better position than we started with QT5 as we
already have the necessary qmake6 vs qmake6-bin split in place in
exactly the way it needs to be. Also a number of client packages have
been switched from AC_PATH_PROG to AC_PATH_TOOL for locating qmake
already.

What we need now is a choice on which way we do it. The choice
essentially is:

a) Add architecture-specific qmake wrappers for QT6.
b) Declare that running qmake6 -query SOMEVAR is unsupported.

Patrick and Pino, what's your thoughts on this? If you feel like you
cannot make such a choice, let us figure out what information is
missing.

I have a preference for a) at this time, because it's changing one
package versus a rabbit hole. Do you agree?

Helmut



Bug#1025064: qt6-scxml FTCBFS: QT_HOST_PATH and more

2022-11-29 Thread Helmut Grohne
Source: qt6-scxml
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-scxml fails to cross build from source. It's the usual QT_HOST_PATH
thing together with requiring a native tool and the usual variables. I'm
attaching the tested patch for your convenience.

Helmut
diff --minimal -Nru qt6-scxml-6.3.1/debian/changelog 
qt6-scxml-6.3.1/debian/changelog
--- qt6-scxml-6.3.1/debian/changelog2022-08-15 19:23:40.0 +0200
+++ qt6-scxml-6.3.1/debian/changelog2022-11-28 10:53:05.0 +0100
@@ -1,3 +1,12 @@
+qt6-scxml (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Pass QT_HOST_PATH and QT_HOST_PATH_CMAKE_DIR.
++ B-D: qt6-scxml-dev:native .
+
+ -- Helmut Grohne   Mon, 28 Nov 2022 10:53:05 +0100
+
 qt6-scxml (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-scxml-6.3.1/debian/control 
qt6-scxml-6.3.1/debian/control
--- qt6-scxml-6.3.1/debian/control  2022-08-15 18:52:08.0 +0200
+++ qt6-scxml-6.3.1/debian/control  2022-11-28 10:53:05.0 +0100
@@ -18,6 +18,7 @@
qt6-base-private-dev (>= 6.3.1+dfsg~),
qt6-declarative-dev (>= 6.3.1+dfsg~),
qt6-declarative-private-dev (>= 6.3.1+dfsg~),
+   qt6-scxml-dev:native ,
xauth ,
xvfb ,
 Standards-Version: 4.6.1
diff --minimal -Nru qt6-scxml-6.3.1/debian/rules qt6-scxml-6.3.1/debian/rules
--- qt6-scxml-6.3.1/debian/rules2021-12-07 10:44:16.0 +0100
+++ qt6-scxml-6.3.1/debian/rules2022-11-28 10:53:05.0 +0100
@@ -4,12 +4,21 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+cmake_extra_args :=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1024752: qt6-websockets FTCBFS: does not pass QT_HOST_PATH

2022-11-24 Thread Helmut Grohne
Source: qt6-websockets
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-websockets fails to cross build from source, because it does not
pass QT_HOST_PATH. I'm attaching the usual patch.

Helmut
diff --minimal -Nru qt6-websockets-6.3.1/debian/changelog 
qt6-websockets-6.3.1/debian/changelog
--- qt6-websockets-6.3.1/debian/changelog   2022-08-15 19:24:16.0 
+0200
+++ qt6-websockets-6.3.1/debian/changelog   2022-11-23 21:18:22.0 
+0100
@@ -1,3 +1,10 @@
+qt6-websockets (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass -DQT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 23 Nov 2022 21:18:22 +0100
+
 qt6-websockets (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-websockets-6.3.1/debian/rules 
qt6-websockets-6.3.1/debian/rules
--- qt6-websockets-6.3.1/debian/rules   2021-11-24 14:07:16.0 +0100
+++ qt6-websockets-6.3.1/debian/rules   2022-11-23 21:18:18.0 +0100
@@ -3,12 +3,18 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+cmake_extra_args :=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1024420: kplotting FTCBFS: does not build the designer plugin

2022-11-19 Thread Helmut Grohne
Source: kplotting
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kplotting fails to cross build from source, because dh_install misses
the designer plugin. The option to build it should be available during
cross builds and should be set by the packaging. Given feedback on
earlier patches, I've now made the default computation work properly in
an upstreamable way.

Helmut
diff --minimal -Nru kplotting-5.98.0/debian/changelog 
kplotting-5.98.0/debian/changelog
--- kplotting-5.98.0/debian/changelog   2022-09-18 23:11:36.0 +0200
+++ kplotting-5.98.0/debian/changelog   2022-11-18 21:04:21.0 +0100
@@ -1,3 +1,10 @@
+kplotting (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Fri, 18 Nov 2022 21:04:21 +0100
+
 kplotting (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kplotting-5.98.0/debian/patches/cross.patch 
kplotting-5.98.0/debian/patches/cross.patch
--- kplotting-5.98.0/debian/patches/cross.patch 1970-01-01 01:00:00.0 
+0100
+++ kplotting-5.98.0/debian/patches/cross.patch 2022-11-18 21:04:21.0 
+0100
@@ -0,0 +1,16 @@
+--- kplotting-5.98.0.orig/CMakeLists.txt
 kplotting-5.98.0/CMakeLists.txt
+@@ -30,7 +30,12 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++if (CMAKE_CROSSCOMPILING)
++set(BUILD_DESIGNERPLUGIN_DEFAULT OFF)
++else()
++set(BUILD_DESIGNERPLUGIN_DEFAULT ON)
++endif()
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" 
${BUILD_DESIGNERPLUGIN_DEFAULT})
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING
diff --minimal -Nru kplotting-5.98.0/debian/patches/series 
kplotting-5.98.0/debian/patches/series
--- kplotting-5.98.0/debian/patches/series  1970-01-01 01:00:00.0 
+0100
+++ kplotting-5.98.0/debian/patches/series  2022-11-18 21:01:36.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kplotting-5.98.0/debian/rules kplotting-5.98.0/debian/rules
--- kplotting-5.98.0/debian/rules   2022-07-28 00:30:37.0 +0200
+++ kplotting-5.98.0/debian/rules   2022-11-18 21:04:21.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
 override_dh_auto_test:
# Disable auto_tests at build time
:


Bug#1024417: kgpg FTBFS: Did not find GPGME

2022-11-19 Thread Helmut Grohne
Source: kgpg
Version: 4:22.04-2.2
Severity: serious
Tags: ftbfs
X-Debbugs-Cc: Debian GnuPG Maintainers 

kgpg fails to build from source in unstable. The relevant portion is:

| -- No usable gpgme flavors found.
| CMake Error at cmake/FindGpgme.cmake:367 (message):
|   Did not find GPGME
| Call Stack (most recent call first):
|   CMakeLists.txt:61 (find_package)
| 
| 
| -- Configuring incomplete, errors occurred!

I think this is due to gpgme having dropped its gpgme-config tool in
favour of providing a .pc file. I think the change is good in principle,
but the transition is executed in a bad way. gpgme-config was always
difficult for cross compilation while .pc just works.

In any case, this puts kgpg into a difficult spot. I hope you can deal
with it somehow. I've put the gpgme maintainers in the loop for
assistance.

Helmut



Bug#1023944: kxmlgui FTCBFS: disables designer plugin

2022-11-13 Thread Helmut Grohne
Control: retitle -1 kxmlgui FTCBFS: disables designer plugin

On Sat, Nov 12, 2022 at 09:09:36PM +0100, Helmut Grohne wrote:
> kxmlgui fails to cross build from source, because building tests fails.
> However, cross builds are performed with the nocheck option, so they
> should not be building tests. I'm attaching a patch to disable building
> tests for nocheck builds for your convenience. With this patch, it cross
> builds successfully.

Sorry, Wrong bug template. This is one the FTCBFS bugs where the
designer plugin is not being built. The patch is correct, but the bug
text is wrong.

Helmut



Bug#1024024: kpty FTCBFS: does not locate utempter

2022-11-13 Thread Helmut Grohne
Source: kpty
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kpty fails to cross build from source, because it requires specifying
the location of utempter for cross builds, but the packaging doesn't do
that yet. I'm attaching a patch for your convenience.

I am slightly wondering though whether utempter could provide a
pkg-config file containing its location. Do you think that would be
useful?

Helmut
diff --minimal -Nru kpty-5.98.0/debian/changelog kpty-5.98.0/debian/changelog
--- kpty-5.98.0/debian/changelog2022-09-18 23:11:43.0 +0200
+++ kpty-5.98.0/debian/changelog2022-11-13 04:58:07.0 +0100
@@ -1,3 +1,10 @@
+kpty (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Specify location of utempter. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 13 Nov 2022 04:58:07 +0100
+
 kpty (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kpty-5.98.0/debian/rules kpty-5.98.0/debian/rules
--- kpty-5.98.0/debian/rules2022-07-28 00:29:51.0 +0200
+++ kpty-5.98.0/debian/rules2022-11-13 04:58:06.0 +0100
@@ -2,12 +2,18 @@
 # -*- makefile -*-
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/architecture.mk
+
+cmake_extra_args :=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += 
-DUTEMPTER_EXECUTABLE=/usr/lib/$(DEB_HOST_MULTIARCH)/utempter/utempter
+endif
 
 %:
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON $(cmake_extra_args)
 
 override_dh_auto_test:
# Disable dh_auto_test at build time


Bug#1024023: mark libkf5codecs-dev Multi-Arch: same

2022-11-13 Thread Helmut Grohne
Package: libkf5codecs-dev
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:kcmutils

kcmutils currently fails to cross build from source. In order to fix
that, it'll have to gain native build dependencies that cause
libkf5codecs-dev to be required for both build architecture and host
architecture simultaneously. Thus, this package needs to become
Multi-Arch: same. This is also reported by the multiarch hinter, which
makes it a relatively safe thing to do. I'm attaching a patch for your
convenience.

Helmut
diff --minimal -Nru kcodecs-5.98.0/debian/changelog 
kcodecs-5.98.0/debian/changelog
--- kcodecs-5.98.0/debian/changelog 2022-09-18 23:11:34.0 +0200
+++ kcodecs-5.98.0/debian/changelog 2022-11-13 04:23:36.0 +0100
@@ -1,3 +1,10 @@
+kcodecs (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Mark libkf5codecs-dev Multi-Arch: same. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 13 Nov 2022 04:23:36 +0100
+
 kcodecs (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kcodecs-5.98.0/debian/control kcodecs-5.98.0/debian/control
--- kcodecs-5.98.0/debian/control   2022-09-18 23:11:34.0 +0200
+++ kcodecs-5.98.0/debian/control   2022-11-13 04:23:34.0 +0100
@@ -32,6 +32,7 @@
 
 Package: libkf5codecs-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libkf5codecs5 (= ${binary:Version}),
  qtbase5-dev (>= 5.15.2~),


Bug#1023944: kxmlgui FTCBFS: building tests fails

2022-11-12 Thread Helmut Grohne
Source: kxmlgui
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kxmlgui fails to cross build from source, because building tests fails.
However, cross builds are performed with the nocheck option, so they
should not be building tests. I'm attaching a patch to disable building
tests for nocheck builds for your convenience. With this patch, it cross
builds successfully.

Helmut
diff --minimal -Nru kxmlgui-5.98.0/debian/changelog 
kxmlgui-5.98.0/debian/changelog
--- kxmlgui-5.98.0/debian/changelog 2022-09-18 23:11:47.0 +0200
+++ kxmlgui-5.98.0/debian/changelog 2022-11-12 21:06:41.0 +0100
@@ -1,3 +1,10 @@
+kxmlgui (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 21:06:41 +0100
+
 kxmlgui (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kxmlgui-5.98.0/debian/patches/cross.patch 
kxmlgui-5.98.0/debian/patches/cross.patch
--- kxmlgui-5.98.0/debian/patches/cross.patch   1970-01-01 01:00:00.0 
+0100
+++ kxmlgui-5.98.0/debian/patches/cross.patch   2022-11-12 21:04:52.0 
+0100
@@ -0,0 +1,11 @@
+--- kxmlgui-5.98.0.orig/CMakeLists.txt
 kxmlgui-5.98.0/CMakeLists.txt
+@@ -39,7 +39,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ # Dependencies
diff --minimal -Nru kxmlgui-5.98.0/debian/patches/series 
kxmlgui-5.98.0/debian/patches/series
--- kxmlgui-5.98.0/debian/patches/series1970-01-01 01:00:00.0 
+0100
+++ kxmlgui-5.98.0/debian/patches/series2022-11-12 21:04:34.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kxmlgui-5.98.0/debian/rules kxmlgui-5.98.0/debian/rules
--- kxmlgui-5.98.0/debian/rules 2022-07-28 00:30:54.0 +0200
+++ kxmlgui-5.98.0/debian/rules 2022-11-12 21:06:40.0 +0100
@@ -9,7 +9,7 @@
dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON 
-DXMLGUI_DISTRIBUTION_TEXT="$(DEB_VENDOR) packages" -DBUILD_TESTING=OFF
+   dh_auto_configure -- -DBUILD_QCH=ON 
-DXMLGUI_DISTRIBUTION_TEXT="$(DEB_VENDOR) packages" -DBUILD_TESTING=OFF 
-DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
# Disable dh_auto_test at build time


Bug#1023943: ktextwidgets FTCBFS: disables designer plugin

2022-11-12 Thread Helmut Grohne
Source: ktextwidgets
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

ktextwidgets fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables building the designer plugin during
cross builds. I think this should be an option and it practically works.
I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru ktextwidgets-5.98.0/debian/changelog 
ktextwidgets-5.98.0/debian/changelog
--- ktextwidgets-5.98.0/debian/changelog2022-09-18 23:11:47.0 
+0200
+++ ktextwidgets-5.98.0/debian/changelog2022-11-12 18:28:07.0 
+0100
@@ -1,3 +1,10 @@
+ktextwidgets (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 18:28:07 +0100
+
 ktextwidgets (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru ktextwidgets-5.98.0/debian/patches/cross.patch 
ktextwidgets-5.98.0/debian/patches/cross.patch
--- ktextwidgets-5.98.0/debian/patches/cross.patch  1970-01-01 
01:00:00.0 +0100
+++ ktextwidgets-5.98.0/debian/patches/cross.patch  2022-11-12 
18:27:50.0 +0100
@@ -0,0 +1,11 @@
+--- ktextwidgets-5.98.0.orig/CMakeLists.txt
 ktextwidgets-5.98.0/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ add_definitions(-DTRANSLATION_DOMAIN=\"ktextwidgets5\")
diff --minimal -Nru ktextwidgets-5.98.0/debian/patches/series 
ktextwidgets-5.98.0/debian/patches/series
--- ktextwidgets-5.98.0/debian/patches/series   1970-01-01 01:00:00.0 
+0100
+++ ktextwidgets-5.98.0/debian/patches/series   2022-11-12 18:27:31.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru ktextwidgets-5.98.0/debian/rules 
ktextwidgets-5.98.0/debian/rules
--- ktextwidgets-5.98.0/debian/rules2022-07-28 00:32:10.0 +0200
+++ ktextwidgets-5.98.0/debian/rules2022-11-12 18:28:06.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
xvfb-run -a --server-args="-screen 0 1024x768x24" dh_auto_test 
--no-parallel


Bug#1023942: kglobalaccel FTCBFS: building tests fails

2022-11-12 Thread Helmut Grohne
Source: kglobalaccel
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kglobalaccel fails to cross build from source, because building tests
fails. However, cross builds are performed with the nocheck option, so
they should not be building tests. I'm attaching a patch to disable
building tests for nocheck builds for your convenience. With this patch,
it cross builds successfully.

Helmut
diff --minimal -Nru kglobalaccel-5.98.0/debian/changelog 
kglobalaccel-5.98.0/debian/changelog
--- kglobalaccel-5.98.0/debian/changelog2022-09-18 23:11:44.0 
+0200
+++ kglobalaccel-5.98.0/debian/changelog2022-11-12 19:49:39.0 
+0100
@@ -1,3 +1,10 @@
+kglobalaccel (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Disable tests during nocheck. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 19:49:39 +0100
+
 kglobalaccel (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kglobalaccel-5.98.0/debian/rules 
kglobalaccel-5.98.0/debian/rules
--- kglobalaccel-5.98.0/debian/rules2022-07-28 00:29:58.0 +0200
+++ kglobalaccel-5.98.0/debian/rules2022-11-12 19:49:39.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON $(if $(filter 
nocheck,$(DEB_BUILD_OPTIONS)),-DBUILD_TESTING=OFF)
 
 override_dh_shlibdeps:
dh_shlibdeps -- -xlibkf5globalaccel-bin


Bug#1023941: kiconthemes FTCBFS: disables designer plugin

2022-11-12 Thread Helmut Grohne
Source: kiconthemes
Version: 5.98.0-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kiconthemes fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables building the designer plugin during
cross builds. I think this should be an option and it practically works.
I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru kiconthemes-5.98.0/debian/changelog 
kiconthemes-5.98.0/debian/changelog
--- kiconthemes-5.98.0/debian/changelog 2022-09-22 08:52:51.0 +0200
+++ kiconthemes-5.98.0/debian/changelog 2022-11-12 18:13:06.0 +0100
@@ -1,3 +1,10 @@
+kiconthemes (5.98.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 18:13:06 +0100
+
 kiconthemes (5.98.0-2) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru kiconthemes-5.98.0/debian/patches/cross.patch 
kiconthemes-5.98.0/debian/patches/cross.patch
--- kiconthemes-5.98.0/debian/patches/cross.patch   1970-01-01 
01:00:00.0 +0100
+++ kiconthemes-5.98.0/debian/patches/cross.patch   2022-11-12 
18:12:32.0 +0100
@@ -0,0 +1,11 @@
+--- kiconthemes-5.98.0.orig/CMakeLists.txt
 kiconthemes-5.98.0/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ ecm_setup_version(PROJECT
diff --minimal -Nru kiconthemes-5.98.0/debian/patches/series 
kiconthemes-5.98.0/debian/patches/series
--- kiconthemes-5.98.0/debian/patches/series1970-01-01 01:00:00.0 
+0100
+++ kiconthemes-5.98.0/debian/patches/series2022-11-12 18:12:17.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kiconthemes-5.98.0/debian/rules 
kiconthemes-5.98.0/debian/rules
--- kiconthemes-5.98.0/debian/rules 2022-09-22 08:40:09.0 +0200
+++ kiconthemes-5.98.0/debian/rules 2022-11-12 18:12:45.0 +0100
@@ -7,7 +7,7 @@
dh $@
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF 
-DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
# Disable dh_auto_test on build time


Bug#1023897: kwidgetsaddons FTCBFS: disables designer plugin

2022-11-12 Thread Helmut Grohne
Source: kcompletion
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kcompletion fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables building the designer plugin during
cross builds. I think this should be an option and it practically works.
I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru kcompletion-5.98.0/debian/changelog 
kcompletion-5.98.0/debian/changelog
--- kcompletion-5.98.0/debian/changelog 2022-09-18 23:11:40.0 +0200
+++ kcompletion-5.98.0/debian/changelog 2022-11-12 08:03:24.0 +0100
@@ -1,3 +1,10 @@
+kcompletion (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 08:03:24 +0100
+
 kcompletion (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kcompletion-5.98.0/debian/patches/cross.patch 
kcompletion-5.98.0/debian/patches/cross.patch
--- kcompletion-5.98.0/debian/patches/cross.patch   1970-01-01 
01:00:00.0 +0100
+++ kcompletion-5.98.0/debian/patches/cross.patch   2022-11-12 
08:03:06.0 +0100
@@ -0,0 +1,11 @@
+--- kcompletion-5.98.0.orig/CMakeLists.txt
 kcompletion-5.98.0/CMakeLists.txt
+@@ -46,7 +46,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 C
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ ecm_set_disabled_deprecation_versions(
diff --minimal -Nru kcompletion-5.98.0/debian/patches/series 
kcompletion-5.98.0/debian/patches/series
--- kcompletion-5.98.0/debian/patches/series1970-01-01 01:00:00.0 
+0100
+++ kcompletion-5.98.0/debian/patches/series2022-11-12 08:03:01.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kcompletion-5.98.0/debian/rules 
kcompletion-5.98.0/debian/rules
--- kcompletion-5.98.0/debian/rules 2022-07-28 00:30:14.0 +0200
+++ kcompletion-5.98.0/debian/rules 2022-11-12 08:03:22.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test


Bug#1023896: kconfigwidgets FTCBFS: disables designer plugin

2022-11-12 Thread Helmut Grohne
Source: kconfigwidgets
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kconfigwidgets fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables building the designer plugin during
cross builds. I think this should be an option and it practically works.
I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru kconfigwidgets-5.98.0/debian/changelog 
kconfigwidgets-5.98.0/debian/changelog
--- kconfigwidgets-5.98.0/debian/changelog  2022-09-18 23:11:44.0 
+0200
+++ kconfigwidgets-5.98.0/debian/changelog  2022-11-12 09:11:35.0 
+0100
@@ -1,3 +1,10 @@
+kconfigwidgets (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 09:11:35 +0100
+
 kconfigwidgets (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kconfigwidgets-5.98.0/debian/patches/cross.patch 
kconfigwidgets-5.98.0/debian/patches/cross.patch
--- kconfigwidgets-5.98.0/debian/patches/cross.patch1970-01-01 
01:00:00.0 +0100
+++ kconfigwidgets-5.98.0/debian/patches/cross.patch2022-11-12 
09:11:25.0 +0100
@@ -0,0 +1,11 @@
+--- kconfigwidgets-5.98.0.orig/CMakeLists.txt
 kconfigwidgets-5.98.0/CMakeLists.txt
+@@ -41,7 +41,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 C
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KCONFIGWIDGETS
diff --minimal -Nru kconfigwidgets-5.98.0/debian/patches/series 
kconfigwidgets-5.98.0/debian/patches/series
--- kconfigwidgets-5.98.0/debian/patches/series 1970-01-01 01:00:00.0 
+0100
+++ kconfigwidgets-5.98.0/debian/patches/series 2022-11-12 09:11:22.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kconfigwidgets-5.98.0/debian/rules 
kconfigwidgets-5.98.0/debian/rules
--- kconfigwidgets-5.98.0/debian/rules  2022-07-28 00:31:55.0 +0200
+++ kconfigwidgets-5.98.0/debian/rules  2022-11-12 09:11:31.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
xvfb-run -a --server-args="-screen 0 1024x768x24" dbus-run-session 
dh_auto_test --buildsystem=kf5 -O--buildsystem=kf5


Bug#1023894: kitemviews FTCBFS: disables designer plugin

2022-11-12 Thread Helmut Grohne
Source: kitemviews
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kitemviews fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables building the designer plugin during
cross builds. I think this should be an option and it practically works.
I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru kitemviews-5.98.0/debian/changelog 
kitemviews-5.98.0/debian/changelog
--- kitemviews-5.98.0/debian/changelog  2022-09-18 23:11:36.0 +0200
+++ kitemviews-5.98.0/debian/changelog  2022-11-12 07:36:22.0 +0100
@@ -1,3 +1,10 @@
+kitemviews (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 07:36:22 +0100
+
 kitemviews (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kitemviews-5.98.0/debian/patches/cross.patch 
kitemviews-5.98.0/debian/patches/cross.patch
--- kitemviews-5.98.0/debian/patches/cross.patch1970-01-01 
01:00:00.0 +0100
+++ kitemviews-5.98.0/debian/patches/cross.patch2022-11-12 
07:35:57.0 +0100
@@ -0,0 +1,11 @@
+--- kitemviews-5.98.0.orig/CMakeLists.txt
 kitemviews-5.98.0/CMakeLists.txt
+@@ -33,7 +33,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 C
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KITEMVIEWS
diff --minimal -Nru kitemviews-5.98.0/debian/patches/series 
kitemviews-5.98.0/debian/patches/series
--- kitemviews-5.98.0/debian/patches/series 1970-01-01 01:00:00.0 
+0100
+++ kitemviews-5.98.0/debian/patches/series 2022-11-12 07:35:53.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kitemviews-5.98.0/debian/rules 
kitemviews-5.98.0/debian/rules
--- kitemviews-5.98.0/debian/rules  2022-07-28 00:29:26.0 +0200
+++ kitemviews-5.98.0/debian/rules  2022-11-12 07:36:15.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
 override_dh_auto_test:
# Disable auto tests at build time
:


Bug#1023893: kwidgetsaddons FTCBFS: disables designer plugin

2022-11-12 Thread Helmut Grohne
Source: kwidgetsaddons
Version: 5.98.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kwidgetsaddons fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables building the designer plugin during
cross builds. I think this should be an option and it practically works.
I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru kwidgetsaddons-5.98.0/debian/changelog 
kwidgetsaddons-5.98.0/debian/changelog
--- kwidgetsaddons-5.98.0/debian/changelog  2022-09-18 23:11:37.0 
+0200
+++ kwidgetsaddons-5.98.0/debian/changelog  2022-11-12 07:04:15.0 
+0100
@@ -1,3 +1,10 @@
+kwidgetsaddons (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 12 Nov 2022 07:04:15 +0100
+
 kwidgetsaddons (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kwidgetsaddons-5.98.0/debian/patches/cross.patch 
kwidgetsaddons-5.98.0/debian/patches/cross.patch
--- kwidgetsaddons-5.98.0/debian/patches/cross.patch1970-01-01 
01:00:00.0 +0100
+++ kwidgetsaddons-5.98.0/debian/patches/cross.patch2022-11-12 
07:04:06.0 +0100
@@ -0,0 +1,11 @@
+--- kwidgetsaddons-5.98.0.orig/CMakeLists.txt
 kwidgetsaddons-5.98.0/CMakeLists.txt
+@@ -41,7 +41,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 C
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON 
"NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" "NOT 
CMAKE_CROSSCOMPILING")
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt 
Designer")
+ 
+ 
diff --minimal -Nru kwidgetsaddons-5.98.0/debian/patches/series 
kwidgetsaddons-5.98.0/debian/patches/series
--- kwidgetsaddons-5.98.0/debian/patches/series 1970-01-01 01:00:00.0 
+0100
+++ kwidgetsaddons-5.98.0/debian/patches/series 2022-11-12 07:04:02.0 
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kwidgetsaddons-5.98.0/debian/rules 
kwidgetsaddons-5.98.0/debian/rules
--- kwidgetsaddons-5.98.0/debian/rules  2022-07-28 00:31:11.0 +0200
+++ kwidgetsaddons-5.98.0/debian/rules  2022-11-12 07:04:13.0 +0100
@@ -7,7 +7,7 @@
dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF 
-DBUILD_DESIGNERPLUGIN=ON
 
 override_dh_auto_test:
# Disable the unittests at build time.


Bug#1023745: qt6-multimedia FTCBFS: does not pass QT_HOST_PATH to cmake

2022-11-09 Thread Helmut Grohne
Source: qt6-multimedia
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-multimedia fails to cross build from source, because it does not
pass QT_HOST_PATH to cmake. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-multimedia-6.3.1/debian/changelog 
qt6-multimedia-6.3.1/debian/changelog
--- qt6-multimedia-6.3.1/debian/changelog   2022-08-15 19:22:50.0 
+0200
+++ qt6-multimedia-6.3.1/debian/changelog   2022-11-08 22:33:18.0 
+0100
@@ -1,3 +1,10 @@
+qt6-multimedia (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass -DQT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Tue, 08 Nov 2022 22:33:18 +0100
+
 qt6-multimedia (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-multimedia-6.3.1/debian/rules 
qt6-multimedia-6.3.1/debian/rules
--- qt6-multimedia-6.3.1/debian/rules   2021-12-05 18:02:15.0 +0100
+++ qt6-multimedia-6.3.1/debian/rules   2022-11-08 22:33:18.0 +0100
@@ -4,12 +4,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+cmake_extra_args :=
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
+
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023188: qt6-languageserver FTCBFS: does not pass QT_HOST_PATH

2022-10-31 Thread Helmut Grohne
Source: qt6-languageserver
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-languageserver fails to cross build from source, because it does
not pass QT_HOST_PATH to cmake. I'm attaching a patch for your
convenience.

Helmut
diff --minimal -Nru qt6-languageserver-6.3.1/debian/changelog 
qt6-languageserver-6.3.1/debian/changelog
--- qt6-languageserver-6.3.1/debian/changelog   2022-08-15 19:22:45.0 
+0200
+++ qt6-languageserver-6.3.1/debian/changelog   2022-10-31 11:24:16.0 
+0100
@@ -1,3 +1,10 @@
+qt6-languageserver (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Mon, 31 Oct 2022 11:24:16 +0100
+
 qt6-languageserver (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-languageserver-6.3.1/debian/rules 
qt6-languageserver-6.3.1/debian/rules
--- qt6-languageserver-6.3.1/debian/rules   2022-06-19 13:14:41.0 
+0200
+++ qt6-languageserver-6.3.1/debian/rules   2022-10-31 11:24:14.0 
+0100
@@ -6,12 +6,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+cmake_extra_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023187: qt6-quick3d FTCBFS: missing QT_HOST_PATH and more

2022-10-31 Thread Helmut Grohne
Source: qt6-quick3d
Version: 6.3.1-3
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-quick3d fails to cross build from source. The immediate issue is a
lack of QT_HOST_PATH. Beyond that, it also needs its own native tools
during build. That amounts to a self-dependency and setting
QT_HOST_PATH_CMAKE_DIR. Finally, we need to ask for building those tools
during cross builds. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-quick3d-6.3.1/debian/changelog 
qt6-quick3d-6.3.1/debian/changelog
--- qt6-quick3d-6.3.1/debian/changelog  2022-08-17 00:29:11.0 +0200
+++ qt6-quick3d-6.3.1/debian/changelog  2022-10-30 21:20:33.0 +0100
@@ -1,3 +1,13 @@
+qt6-quick3d (6.3.1-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Pass QT_HOST_PATH*.
++ Depend on ourselves when cross compiling.
++ Do build tools when cross compiling.
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 21:20:33 +0100
+
 qt6-quick3d (6.3.1-3) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-quick3d-6.3.1/debian/control 
qt6-quick3d-6.3.1/debian/control
--- qt6-quick3d-6.3.1/debian/control2022-08-15 18:52:08.0 +0200
+++ qt6-quick3d-6.3.1/debian/control2022-10-30 21:20:33.0 +0100
@@ -20,6 +20,7 @@
qt6-base-private-dev (>= 6.3.1+dfsg~),
qt6-declarative-dev (>= 6.3.1+dfsg~),
qt6-declarative-private-dev (>= 6.3.1+dfsg~),
+   qt6-quick3d-dev:native ,
zlib1g-dev,
 Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
diff --minimal -Nru qt6-quick3d-6.3.1/debian/rules 
qt6-quick3d-6.3.1/debian/rules
--- qt6-quick3d-6.3.1/debian/rules  2022-01-03 06:40:27.0 +0100
+++ qt6-quick3d-6.3.1/debian/rules  2022-10-30 21:20:33.0 +0100
@@ -6,12 +6,22 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+cmake_extra_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023158: qt6-quicktimeline FTCBFS: does not pass QT_HOST_PATH

2022-10-30 Thread Helmut Grohne
Source: qt6-quicktimeline
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-quicktimeline fails to cross build from source, because it does not
pass QT_HOST_PATH to cmake. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-quicktimeline-6.3.1/debian/changelog 
qt6-quicktimeline-6.3.1/debian/changelog
--- qt6-quicktimeline-6.3.1/debian/changelog2022-08-15 19:23:31.0 
+0200
+++ qt6-quicktimeline-6.3.1/debian/changelog2022-10-30 21:14:56.0 
+0100
@@ -1,3 +1,10 @@
+qt6-quicktimeline (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 21:14:56 +0100
+
 qt6-quicktimeline (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-quicktimeline-6.3.1/debian/rules 
qt6-quicktimeline-6.3.1/debian/rules
--- qt6-quicktimeline-6.3.1/debian/rules2021-11-17 22:21:04.0 
+0100
+++ qt6-quicktimeline-6.3.1/debian/rules2022-10-30 21:14:55.0 
+0100
@@ -4,6 +4,12 @@
 # Use already defined DEB_HOST_* variables.
 include /usr/share/dpkg/architecture.mk
 
+cmake_extra_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
@@ -11,7 +17,8 @@
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023157: qt6-shadertools FTCBFS: does not pass QT_HOST_PATH and more

2022-10-30 Thread Helmut Grohne
Source: qt6-shadertools
Version: 6.3.1-3
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-shadertools fails to cross build from source. The immediate failure
is missing QT_HOST_PATH. Then Qt6::qsb is missing. Fixing that involves
depending on the qsb tool, the relevant cmake files and setting
QT_HOST_PATH_CMAKE_DIR. Beyond that we need to request qsb despite doing
a cross build. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-shadertools-6.3.1/debian/changelog 
qt6-shadertools-6.3.1/debian/changelog
--- qt6-shadertools-6.3.1/debian/changelog  2022-10-01 21:27:40.0 
+0200
+++ qt6-shadertools-6.3.1/debian/changelog  2022-10-30 18:55:46.0 
+0100
@@ -1,3 +1,13 @@
+qt6-shadertools (6.3.1-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Pass QT_HOST_PATH and QT_HOST_PATH_CMAKE_DIR.
++ New cross build dependency on native qsb.
++ Do build tools when cross compiling.
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 18:55:46 +0100
+
 qt6-shadertools (6.3.1-3) unstable; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
diff --minimal -Nru qt6-shadertools-6.3.1/debian/control 
qt6-shadertools-6.3.1/debian/control
--- qt6-shadertools-6.3.1/debian/control2022-10-01 21:21:43.0 
+0200
+++ qt6-shadertools-6.3.1/debian/control2022-10-30 18:55:46.0 
+0100
@@ -6,12 +6,14 @@
 Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libgl1-mesa-dev,
+   libqt6shadertools6-dev:native ,
libvulkan-dev [linux-any],
ninja-build,
pkg-config,
pkg-kde-tools,
qt6-base-dev (>= 6.3.1+dfsg~),
qt6-base-private-dev (>= 6.3.1+dfsg~),
+   qt6-shader-baker ,
 Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
diff --minimal -Nru qt6-shadertools-6.3.1/debian/rules 
qt6-shadertools-6.3.1/debian/rules
--- qt6-shadertools-6.3.1/debian/rules  2022-10-01 21:22:41.0 +0200
+++ qt6-shadertools-6.3.1/debian/rules  2022-10-30 18:55:46.0 +0100
@@ -6,13 +6,23 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+cmake_extra_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+cmake_extra_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(cmake_extra_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023088: qt6-wayland FTCBFS: does not pass QT_HOST_PATH and more

2022-10-30 Thread Helmut Grohne
Source: qt6-wayland
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-wayland fails to cross build from source. The immediate failure is a
missing QT_HOST_PATH variable. Beyond that, it also needs
QT_HOST_PATH_CMAKE_DIR and the relevant cmake files from a native
qt6-wayland-dev. Surprisingly qt6-wayland-dev does not yet depend on
qt6-wayland-dev-tools even though its cmake files reference the
contained tool. I think this is a missing runtime dependency. Finally,
we also need to tell qt6-wayland to cross build its tools. I'm attaching
a patch that makes qt6-wayland cross buildable for your convenience.

Helmut
diff --minimal -Nru qt6-wayland-6.3.1/debian/changelog 
qt6-wayland-6.3.1/debian/changelog
--- qt6-wayland-6.3.1/debian/changelog  2022-08-15 19:24:06.0 +0200
+++ qt6-wayland-6.3.1/debian/changelog  2022-10-30 00:56:48.0 +0200
@@ -1,3 +1,14 @@
+qt6-wayland (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Pass QT_HOST_PATH and QT_HOST_PATH_CMAKE_DIR.
++ Depend on a native version of ourselves.
++ qt6-wayland-dev needs to depend on qt6-wayland-dev-tools.
++ Do build tools when cross compiling.
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 00:56:48 +0200
+
 qt6-wayland (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-wayland-6.3.1/debian/control 
qt6-wayland-6.3.1/debian/control
--- qt6-wayland-6.3.1/debian/control2022-08-15 18:52:08.0 +0200
+++ qt6-wayland-6.3.1/debian/control2022-10-30 00:56:48.0 +0200
@@ -24,6 +24,7 @@
qt6-base-private-dev (>= 6.3.1+dfsg~),
qt6-declarative-dev (>= 6.3.1+dfsg~),
qt6-declarative-private-dev (>= 6.3.1+dfsg~),
+   qt6-wayland-dev:native ,
xauth ,
xvfb ,
zlib1g-dev,
@@ -144,6 +146,7 @@
  libqt6waylandeglclienthwintegration6 (= ${binary:Version}),
  libqt6waylandeglcompositorhwintegration6 (= ${binary:Version}),
  libqt6wlshellintegration6 (= ${binary:Version}),
+ qt6-wayland-dev-tools (= ${binary:Version}),
  ${misc:Depends},
 Description: Qt 6 Wayland - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --minimal -Nru qt6-wayland-6.3.1/debian/rules 
qt6-wayland-6.3.1/debian/rules
--- qt6-wayland-6.3.1/debian/rules  2021-12-13 22:33:29.0 +0100
+++ qt6-wayland-6.3.1/debian/rules  2022-10-30 00:56:48.0 +0200
@@ -4,12 +4,22 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+extra_cmake_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023077: qt6-webchannel FTCBFS: does not pass QT_HOST_PATH to cmake

2022-10-29 Thread Helmut Grohne
Source: qt6-webchannel
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-webchannel fails to cross build from source, because it does not
pass QT_HOST_PATH to cmake. Please consider applying the attached patch
to fix that.

Helmut
diff --minimal -Nru qt6-webchannel-6.3.1/debian/changelog 
qt6-webchannel-6.3.1/debian/changelog
--- qt6-webchannel-6.3.1/debian/changelog   2022-08-15 19:24:11.0 
+0200
+++ qt6-webchannel-6.3.1/debian/changelog   2022-10-30 00:51:53.0 
+0200
@@ -1,3 +1,10 @@
+qt6-webchannel (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 00:51:53 +0200
+
 qt6-webchannel (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-webchannel-6.3.1/debian/rules 
qt6-webchannel-6.3.1/debian/rules
--- qt6-webchannel-6.3.1/debian/rules   2021-11-25 00:17:42.0 +0100
+++ qt6-webchannel-6.3.1/debian/rules   2022-10-30 00:51:52.0 +0200
@@ -3,12 +3,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+extra_cmake_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023075: qt6-positioning FTCBFS: does not pass QT_HOST_PATH

2022-10-29 Thread Helmut Grohne
Source: qt6-positioning
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-positioning fails to cross build from source, because it does not
pass QT_HOST_PATH. Please consider applying the attached patch to fix
that.

Helmut
diff --minimal -Nru qt6-positioning-6.3.1/debian/changelog 
qt6-positioning-6.3.1/debian/changelog
--- qt6-positioning-6.3.1/debian/changelog  2022-08-15 19:22:59.0 
+0200
+++ qt6-positioning-6.3.1/debian/changelog  2022-10-30 00:46:52.0 
+0200
@@ -1,3 +1,10 @@
+qt6-positioning (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 00:46:52 +0200
+
 qt6-positioning (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-positioning-6.3.1/debian/rules 
qt6-positioning-6.3.1/debian/rules
--- qt6-positioning-6.3.1/debian/rules  2021-12-04 16:03:23.0 +0100
+++ qt6-positioning-6.3.1/debian/rules  2022-10-30 00:46:51.0 +0200
@@ -3,12 +3,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+extra_cmake_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023074: qt6-svg FTCBFS: does not pass QT_HOST_PATH

2022-10-29 Thread Helmut Grohne
Source: qt6-svg
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-svg fails to cross build from source, because it does not pass
QT_HOST_PATH. Please consider applying the attached patch to fix that.

Helmut
diff --minimal -Nru qt6-svg-6.3.1/debian/changelog 
qt6-svg-6.3.1/debian/changelog
--- qt6-svg-6.3.1/debian/changelog  2022-08-15 19:23:56.0 +0200
+++ qt6-svg-6.3.1/debian/changelog  2022-10-30 00:40:25.0 +0200
@@ -1,3 +1,10 @@
+qt6-svg (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 30 Oct 2022 00:40:25 +0200
+
 qt6-svg (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-svg-6.3.1/debian/rules qt6-svg-6.3.1/debian/rules
--- qt6-svg-6.3.1/debian/rules  2021-12-02 09:24:06.0 +0100
+++ qt6-svg-6.3.1/debian/rules  2022-10-30 00:40:25.0 +0200
@@ -4,12 +4,19 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+extra_cmake_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)

 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023073: qt6-declarative FTCBFS: QT_HOST_PATH not specified and more

2022-10-29 Thread Helmut Grohne
Source: qt6-declarative
Version: 6.3.1+dfsg-5
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-declarative fails to cross build from source. The immediate failure
is QT_HOST_PATH not being specified. A few more things come up and I've
created a patch for your convenience. The details are in the changelog.
Please consider applying it.

Helmut
diff --minimal -Nru qt6-declarative-6.3.1+dfsg/debian/changelog 
qt6-declarative-6.3.1+dfsg/debian/changelog
--- qt6-declarative-6.3.1+dfsg/debian/changelog 2022-09-04 07:34:45.0 
+0200
+++ qt6-declarative-6.3.1+dfsg/debian/changelog 2022-10-29 16:02:51.0 
+0200
@@ -1,3 +1,13 @@
+qt6-declarative (6.3.1+dfsg-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Pass QT_HOST_* variables to cmake.
++ Build tools when cross compiling.
++ Build depend on ourselves during cross compiling.
+
+ -- Helmut Grohne   Sat, 29 Oct 2022 16:02:51 +0200
+
 qt6-declarative (6.3.1+dfsg-5) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru qt6-declarative-6.3.1+dfsg/debian/control 
qt6-declarative-6.3.1+dfsg/debian/control
--- qt6-declarative-6.3.1+dfsg/debian/control   2022-09-03 20:11:00.0 
+0200
+++ qt6-declarative-6.3.1+dfsg/debian/control   2022-10-29 16:02:51.0 
+0200
@@ -16,6 +16,7 @@
pkg-kde-tools,
qt6-base-dev (>= 6.3.1+dfsg~),
qt6-base-private-dev (>= 6.3.1+dfsg~),
+   qt6-declarative-dev:native ,
qt6-languageserver-private-dev (>= 6.3.1~),
 Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
diff --minimal -Nru qt6-declarative-6.3.1+dfsg/debian/rules 
qt6-declarative-6.3.1+dfsg/debian/rules
--- qt6-declarative-6.3.1+dfsg/debian/rules 2021-11-20 19:53:33.0 
+0100
+++ qt6-declarative-6.3.1+dfsg/debian/rules 2022-10-29 16:02:51.0 
+0200
@@ -6,12 +6,22 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+extra_cmake_args :=
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+extra_cmake_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+   $(extra_cmake_args)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Bug#1023054: qt6-base FTCBFS: multiple reasons

2022-10-29 Thread Helmut Grohne
Source: qt6-base
Version: 6.3.1+dfsg-10
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-base fails to cross build from source for many different reasons.
I've created a patch that makes it cross buildable and documented the
individual aspects in the changelog. Does all of that make sense to you?
The most contentious parts are probably in cross.patch. Do you think
they're upstreamable in some way?

Helmut
diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/changelog 
qt6-base-6.3.1+dfsg/debian/changelog
--- qt6-base-6.3.1+dfsg/debian/changelog2022-10-01 18:58:47.0 
+0200
+++ qt6-base-6.3.1+dfsg/debian/changelog2022-10-28 19:58:00.0 
+0200
@@ -1,3 +1,16 @@
+qt6-base (6.3.1+dfsg-10.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1)
++ cross.patch: Honour PKG_CONFIG_EXECUTABLE
++ cross.patch: Allow building android tools
++ Pass QT_HOST_* variables to build.
++ Depend on a native qt toolchain for the former.
++ Do build tools even when cross building.
++ Add excess files t debian/not-installed.
+
+ -- Helmut Grohne   Fri, 28 Oct 2022 19:58:00 +0200
+
 qt6-base (6.3.1+dfsg-10) unstable; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/control 
qt6-base-6.3.1+dfsg/debian/control
--- qt6-base-6.3.1+dfsg/debian/control  2022-09-17 19:21:11.0 +0200
+++ qt6-base-6.3.1+dfsg/debian/control  2022-10-28 19:58:00.0 +0200
@@ -71,6 +71,7 @@
ninja-build,
pkg-config,
pkg-kde-tools (>= 0.15.17~),
+   qt6-base-dev:native ,
unixodbc-dev,
zlib1g-dev,
 Standards-Version: 4.6.1
diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/not-installed 
qt6-base-6.3.1+dfsg/debian/not-installed
--- qt6-base-6.3.1+dfsg/debian/not-installed2022-09-11 13:58:51.0 
+0200
+++ qt6-base-6.3.1+dfsg/debian/not-installed2022-10-28 19:58:00.0 
+0200
@@ -4,3 +4,8 @@
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
 usr/lib/qt6/bin/qmake
 usr/lib/qt6/bin/qtpaths
+# cross build specific:
+usr/lib/qt6/bin/host-qmake
+usr/lib/qt6/bin/host-qtpaths
+usr/lib/qt6/bin/target_qt.conf
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/qdevice.pri
diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/patches/cross.patch 
qt6-base-6.3.1+dfsg/debian/patches/cross.patch
--- qt6-base-6.3.1+dfsg/debian/patches/cross.patch  1970-01-01 
01:00:00.0 +0100
+++ qt6-base-6.3.1+dfsg/debian/patches/cross.patch  2022-10-28 
19:58:00.0 +0200
@@ -0,0 +1,22 @@
+--- 
qt6-base-6.3.1+dfsg.orig/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 qt6-base-6.3.1+dfsg/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+@@ -146,8 +146,6 @@
+ set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using 
pkg-config")
+ if(NOT pkg_config_enabled)
+ qt_build_internals_disable_pkg_config()
+-else()
+-unset(PKG_CONFIG_EXECUTABLE CACHE)
+ endif()
+ endfunction()
+ 
+--- qt6-base-6.3.1+dfsg.orig/src/tools/configure.cmake
 qt6-base-6.3.1+dfsg/src/tools/configure.cmake
+@@ -2,7 +2,7 @@
+ SECTION "Deployment"
+ LABEL "Android deployment tool"
+ PURPOSE "The Android deployment tool automates the process of creating 
Android packages."
+-CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression)
++CONDITION QT_FEATURE_regularexpression)
+ 
+ qt_feature("macdeployqt" PRIVATE
+ SECTION "Deployment"
diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/patches/series 
qt6-base-6.3.1+dfsg/debian/patches/series
--- qt6-base-6.3.1+dfsg/debian/patches/series   2022-09-17 13:50:40.0 
+0200
+++ qt6-base-6.3.1+dfsg/debian/patches/series   2022-10-28 19:58:00.0 
+0200
@@ -11,3 +11,4 @@
 
 # Don't use yield on CPUs that might not support it
 armel-noyield.patch
+cross.patch
diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/rules 
qt6-base-6.3.1+dfsg/debian/rules
--- qt6-base-6.3.1+dfsg/debian/rules2022-09-17 19:21:11.0 +0200
+++ qt6-base-6.3.1+dfsg/debian/rules2022-10-28 19:58:00.0 +0200
@@ -19,6 +19,13 @@
 extra_cmake_args += -DFEATURE_sctp=OFF
 endif
 
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+   extra_cmake_args += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+   -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
+
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 


Bug#1022986: qt6-5compat FTCBFS: missing QT_HOST_PATH

2022-10-28 Thread Helmut Grohne
Source: qt6-5compat
Version: 6.3.1-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-5compat fails to cross build from source, because QT_HOST_PATH isn't
passed. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru qt6-5compat-6.3.1/debian/changelog 
qt6-5compat-6.3.1/debian/changelog
--- qt6-5compat-6.3.1/debian/changelog  2022-08-15 19:22:22.0 +0200
+++ qt6-5compat-6.3.1/debian/changelog  2022-10-28 18:15:11.0 +0200
@@ -1,3 +1,10 @@
+qt6-5compat (6.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Set qt6-specific cross variables. (Closes: #-1)
+
+ -- Helmut Grohne   Fri, 28 Oct 2022 18:15:11 +0200
+
 qt6-5compat (6.3.1-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-5compat-6.3.1/debian/rules 
qt6-5compat-6.3.1/debian/rules
--- qt6-5compat-6.3.1/debian/rules  2021-11-29 07:30:03.0 +0100
+++ qt6-5compat-6.3.1/debian/rules  2022-10-28 18:15:09.0 +0200
@@ -7,9 +7,16 @@
 %:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
+CMAKE_FLAGS = -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+CMAKE_FLAGS += \
+   -DQT_HOST_PATH=/usr \
+   -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/cmake
+endif
+
 override_dh_auto_configure:
-   dh_auto_configure -- \
-   -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+   dh_auto_configure -- $(CMAKE_FLAGS)
 
 execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files


Re: Bug#1010049: qt6-base-dev: should provide a QT_HOST_PATH directory for cross building

2022-10-28 Thread Helmut Grohne
On Tue, Sep 06, 2022 at 11:47:32PM +0200, Fab Stz wrote:
> Actually the correct values seem to be:
> 
> -DQT_HOST_PATH=/usr
> -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/cmake
> 
> With these, it works for me when cross building Qt 6.4beta4 with 6.3.1 
> shipped by Debian (provided you also set   -DQT_NO_PACKAGE_VERSION_CHECK=TRUE 
> when using different Qt versions)

Thank you very much for figuring these out. I confirm that these values
work for e.g. src:qt6-5compat.

The original request was that qt6 should provide a path for
QT_HOST_PATH. You explained that it already does. As such, this bug is
addressed without source changes and I am therefore closing it.

Helmut



Bug#1022961: extra-cmake-modules FTCBFS: unsatisfiable cross Build-Depends

2022-10-28 Thread Helmut Grohne
Source: extra-cmake-modules
Version: 5.98.0-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability

extra-cmake-modules cannot be cross built from source, because its
Build-Depends are not cross-satisfiable. All of the affected ones are
already tagged , so I tried moving them to B-D-I. That happened
to not work out as manual pages are generated from sphinx. So I left
those that are needed for manual pages in B-D and annotated them :native
to support cross builds. Please consider applying the attached patch.

Helmut
diff --minimal -Nru extra-cmake-modules-5.98.0/debian/changelog 
extra-cmake-modules-5.98.0/debian/changelog
--- extra-cmake-modules-5.98.0/debian/changelog 2022-10-05 13:46:03.0 
+0200
+++ extra-cmake-modules-5.98.0/debian/changelog 2022-10-28 09:56:27.0 
+0200
@@ -1,3 +1,10 @@
+extra-cmake-modules (5.98.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Reduce Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Fri, 28 Oct 2022 09:56:27 +0200
+
 extra-cmake-modules (5.98.0-2) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru extra-cmake-modules-5.98.0/debian/control 
extra-cmake-modules-5.98.0/debian/control
--- extra-cmake-modules-5.98.0/debian/control   2022-08-21 17:08:12.0 
+0200
+++ extra-cmake-modules-5.98.0/debian/control   2022-10-28 09:56:27.0 
+0200
@@ -6,15 +6,15 @@
Norbert Preining ,
 Build-Depends: cmake (>= 3.16~),
debhelper-compat (= 13),
-   libjs-jquery (>= 3.5.1+dfsg-3) ,
-   libjs-underscore ,
pkg-kde-tools (>= 0.15.16~),
-   python3-distutils ,
-   python3-setuptools ,
-   python3-sphinx (>= 1.2~) ,
-   python3-sphinxcontrib.qthelp ,
-   python3-sphinxcontrib.serializinghtml ,
-Build-Depends-Indep: dh-sequence-sphinxdoc
+   python3-sphinx:native (>= 1.2~) ,
+   python3-sphinxcontrib.qthelp:native ,
+Build-Depends-Indep: dh-sequence-sphinxdoc,
+ libjs-jquery (>= 3.5.1+dfsg-3) ,
+ libjs-underscore ,
+ python3-distutils ,
+ python3-setuptools ,
+ python3-sphinxcontrib.serializinghtml ,
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://invent.kde.org/frameworks/extra-cmake-modules


Bug#1022136: kwin FTCBFS: does not find qtwaylandscanner

2022-10-20 Thread Helmut Grohne
Source: kwin
Version: 4:5.26.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kwin fails to cross build from source, because it does not find
qtwaylandscanner. The error message from cmake makes it look a little
different, but this the heart of it. Passing the path to it to cmake
fixes this part and is ignored in native builds. After doing this, the
build gets a little further until it bumps into #1022135. I'm attaching
a patch for the former issue for your convenience.

Helmut
diff --minimal -Nru kwin-5.26.0/debian/changelog kwin-5.26.0/debian/changelog
--- kwin-5.26.0/debian/changelog2022-10-11 15:44:23.0 +0200
+++ kwin-5.26.0/debian/changelog2022-10-20 19:38:44.0 +0200
@@ -1,3 +1,10 @@
+kwin (4:5.26.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve cross building: Pass qtwaylandscanner to cmake. (Closes: #-1)
+
+ -- Helmut Grohne   Thu, 20 Oct 2022 19:38:44 +0200
+
 kwin (4:5.26.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kwin-5.26.0/debian/rules kwin-5.26.0/debian/rules
--- kwin-5.26.0/debian/rules2022-10-02 18:15:15.0 +0200
+++ kwin-5.26.0/debian/rules2022-10-20 19:38:44.0 +0200
@@ -14,7 +14,8 @@
 
 
 override_dh_auto_configure:
-   dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF
+   dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF \
+   
-DQTWAYLANDSCANNER_KDE_EXECUTABLE=/usr/lib/qt5/bin/qtwaylandscanner
 
 override_dh_auto_test:
# Disable auto tests at build time


Bug#1022135: libkf5kcmutils-bin should be Multi-Arch: foreign

2022-10-20 Thread Helmut Grohne
Package: libkf5kcmutils-bin
Version: 5.98.0-1
Tags: patch
Control: affects -1 + src:kwin

libkf5kcmutils-bin contains essentially only kcmdesktopfilegenerator.
src:kwin fails to cross build from source by failing to run this tool. I
see that this utility already was split out to a *-bin package. This is
a great first step to support cross building, but it is not sufficient.
In order to make this split useful to cross building, libkf5kcmutils-bin
needs to be marked Multi-Arch: foreign. Unfortunately, we cannot
presently mark it such, because kcmdesktopfilegenerator lives on an
architecture-dependent path. So what needs to happen here?

1. Move kcmdesktopfilegenerator to an architecture-independent path in
   libkf5kcmutils-bin. This is going to break consumers that expect it
   in its original location. So a symbolic link from the old location to
   the new location is needed.

2. Move this symbolic link added in the previous step from
   libkf5kcmutils-bin to libkf5kcmutils-dev. Remember to add the
   required Breaks+Replaces.

3. Since libkf5kcmutils-bin no longer has an architecture-dependent
   path, it can be marked Multi-Arch: foreign.

Do you agree with this approach? I've implemented it in the attached
patch.

Helmut
diff --minimal -Nru kcmutils-5.98.0/debian/changelog 
kcmutils-5.98.0/debian/changelog
--- kcmutils-5.98.0/debian/changelog2022-09-18 23:13:26.0 +0200
+++ kcmutils-5.98.0/debian/changelog2022-10-20 21:03:11.0 +0200
@@ -1,3 +1,10 @@
+kcmutils (5.98.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Make libkf5kcmutils-bin Multi-Arch: foreign. (Closes: #-1)
+
+ -- Helmut Grohne   Thu, 20 Oct 2022 21:03:11 +0200
+
 kcmutils (5.98.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff --minimal -Nru kcmutils-5.98.0/debian/control 
kcmutils-5.98.0/debian/control
--- kcmutils-5.98.0/debian/control  2022-09-18 23:13:26.0 +0200
+++ kcmutils-5.98.0/debian/control  2022-10-20 21:03:08.0 +0200
@@ -32,6 +32,7 @@
 
 Package: libkf5kcmutils-bin
 Architecture: any
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: runtime files for kcmutils
  KCMUtils provides various classes to work with KCModules. KCModules can be
@@ -60,6 +61,8 @@
  libkf5service-dev (>= 5.98.0~),
  libkf5xmlgui-dev (>= 5.98.0~),
  ${misc:Depends},
+Breaks: libkf5kcmutils-bin (<< 5.98.0-1.1~)
+Replaces: libkf5kcmutils-bin (<< 5.98.0-1.1~)
 Recommends: libkf5kcmutils-doc (= ${source:Version})
 Description: Extra APIs to write KConfig modules
  Some utility classes for KSettings, KCModule and KPlugin.
diff --minimal -Nru kcmutils-5.98.0/debian/libkf5kcmutils-bin.install 
kcmutils-5.98.0/debian/libkf5kcmutils-bin.install
--- kcmutils-5.98.0/debian/libkf5kcmutils-bin.install   2022-08-15 
23:04:53.0 +0200
+++ kcmutils-5.98.0/debian/libkf5kcmutils-bin.install   2022-10-20 
21:00:16.0 +0200
@@ -1 +1 @@
-usr/lib/*/libexec/kf5/kcmdesktopfilegenerator
+usr/lib/*/libexec/kf5/kcmdesktopfilegenerator 
usr/libexec/kf5/kcmdesktopfilegenerator
diff --minimal -Nru kcmutils-5.98.0/debian/libkf5kcmutils-dev.links 
kcmutils-5.98.0/debian/libkf5kcmutils-dev.links
--- kcmutils-5.98.0/debian/libkf5kcmutils-dev.links 1970-01-01 
01:00:00.0 +0100
+++ kcmutils-5.98.0/debian/libkf5kcmutils-dev.links 2022-10-20 
21:01:53.0 +0200
@@ -0,0 +1 @@
+usr/libexec/kf5/kcmdesktopfilegenerator 
usr/lib/${DEB_HOST_MULTIARCH}/libexec/kf5/kcmdesktopfilegenerator


Bug#1022109: sonnet FTCBFS: forcefully disables designer plugin

2022-10-20 Thread Helmut Grohne
Source: sonnet
Version: 5.98.0-1
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

sonnet fails to cross build from source, because the upstream
CMakeLists.txt forcefully disables the designer plugin when cross
building. However, the Debian packaging requires it and thus fails. I
don't quite understand the reasons for why upstream disables it as it
cross builds just fine. I also don't understand why they make that
non-overridable. So I'm proposing to simply drop that condition. Please
consider applying the attached patch.

Helmut
--- sonnet-5.98.0.orig/CMakeLists.txt
+++ sonnet-5.98.0/CMakeLists.txt
@@ -57,7 +57,7 @@
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
 
 if(SONNET_USE_WIDGETS)
-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
+option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
 add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
 endif()
 


Bug#1010049: qt6-base-dev: should provide a QT_HOST_PATH directory for cross building

2022-04-23 Thread Helmut Grohne
Hi,

On Sat, Apr 23, 2022 at 09:38:54AM +0200, Helmut Grohne wrote:
> I expect that QT_HOST_PATH also needs to point to architecture-dependent
> files (e.g. libraries). Qt5 has faced as similar problem and thus added

Dmitry noted that none of Qt6's executables (possibly except for qmake)
are architecture-dependent and encouraged me to try
-DQT_HOST_PATH=/usr/lib/qt6. When you do that, you get the following
error:

| CMake Error at /usr/lib/aarch64-linux-gnu/cmake/Qt6/Qt6Config.cmake:61 
(find_package):
|   Could not find a package configuration file provided by "Qt6HostInfo" with
|   any of the following names:
| 
| Qt6HostInfoConfig.cmake
| qt6hostinfo-config.cmake
| 
|   Add the installation prefix of "Qt6HostInfo" to CMAKE_PREFIX_PATH or set
|   "Qt6HostInfo_DIR" to a directory containing one of the above files.  If
|   "Qt6HostInfo" provides a separate development package or SDK, be sure it
|   has been installed.
| Call Stack (most recent call first):
|   CMakeLists.txt:16 (find_package)
| 
| 
| -- Configuring incomplete, errors occurred!

So no, that's not the solution unfortunately. As far as I can see, this
file is architecture-dependent and since QT_HOST_PATH defines its
location, QT_HOST_PATH must be architecture-dependent as I expected.

Helmut



Bug#1010049: qt6-base-dev: should provide a QT_HOST_PATH directory for cross building

2022-04-23 Thread Helmut Grohne
Package: qt6-base-dev
Version: 6.2.4+dfsg-4
X-Debbugs-Cc: debian-cr...@lists.debian.org
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:qt6-base src:qt6-charts src:qt6-declarative 
src:qt6-quick3d

qt6-charts (for example) fails to cross build from source. You can see a
failure at
https://crossqa.debian.net/build/qt6-charts_6.2.4-2_mipsel_20220423044846.log.
The crucial bit is:

| CMake Error at /usr/lib/mipsel-linux-gnu/cmake/Qt6/QtSetup.cmake:224 
(message):
|   You need to set QT_HOST_PATH to cross compile Qt.

I think this makes it relatively obvious what needs to happen to fix it:
We should provide QT_HOST_PATH. This is where the problems begin.
According to https://doc.qt.io/qt-6/cmake-variable-qt-host-path.html,
QT_HOST_PATH should point to the qt6 installation and include e.g. moc.
Debian's qt6 moc is installed as /usr/lib/qt6/libexec/moc by
qt6-base-dev-tools. It's good that this has been split into a
Multi-Arch: foreign package already. However, that path is
architecture-independent and thus likely not suitable for QT_HOST_PATH.
I expect that QT_HOST_PATH also needs to point to architecture-dependent
files (e.g. libraries). Qt5 has faced as similar problem and thus added
symlink farms to qtbase5-dev in /usr/lib//qt5/bin pointing to
the moc from qtbase5-dev-tools. I think we need a similar symlink farm
for Qt6, but I don't know what Qt6 expects from a QT_HOST_PATH.

So this raises multiple questions:
 * What should QT_HOST_PATH be?
   + /usr/lib//qt6
   + /usr/lib/
   + Something else?
 * How do we have to structure the contents of QT_HOST_PATH?
   + Where precisely do tools like moc and rcc have to be located?
   + What other files are required to be located?

I request assistance from the Qt6 maintainers in figuring this out and
providing answers to the questions above. I hope that we can
constructively work this out together in a similar way that Lisandro and
Dmitry made cross building work for Qt5. At that time, none of the
involved parties knew how it would work, but combining the knowledge
resulted in a solution. Thank you for considering. I've written down
what I know.

Helmut



Bug#1007994: qtpaths is broken for cross compilation

2022-03-20 Thread Helmut Grohne
Package: qttools5-dev-tools
Version: 5.15.2-5+b1
Severity: important
Justification: multiarch violation
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:qt5ct

Dear qt maintainers,

we have a bigger problem about qtpaths. I haven't checked, but I think
it also affects qt6. When building qt5ct (and likely others), it locates
qtpaths. We presently have 3 different locations:
 * /usr/bin/qtpaths (wrapper for the next)
 * /usr/lib/qt5/bin/qtpaths (actual binary)
 * /usr/lib//qt5/bin/qtpaths (symlink to the second)

Note that since qtpaths resides in qttools5-dev-tools, which happens to
be Multi-Arch: foreign, the  path is only ever
available for the build architecture and no client package has the
ability to ever select a host architecture qtpaths even if it were
trying to do so.

qt5ct happens to select the second one. It then runs qtpaths
--plugin-dir and gets back /usr/lib//qt5/plugins.
Unsurprisingly, that multiarchtriplet happens to bet the build
architecture one.  This is very bad and produces misbuilds. I don't see
any way that qt5ct could improve on this aspect without also changing
qttools5-dev-tools.

So how do we fix that?

Quite obviously, qtpaths is architecture dependent. Thus we need an
instance of it that happens to be architecture aware. Most likely that'd
be both of /usr/bin/-qtpaths and
/usr/lib//qt5/bin/qtpaths.  While the latter may look
present, we really mean the host architecture one here.

Step 1: Construct a qtpaths wrapper script that makes it return output
for a given architecture instead of the native one. We've done this e.g.
for qmake already, but I couldn't figure out how to make it work for
qtpaths. I couldn't find an option for qtpaths similar to -qtconf for
qmake. Is there anything better we can do than replacing it entirely
with a shell script?

Step 2: Split packages. qttools5-dev-tools quite obviously cannot
continue being Multi-Arch: foreign. So much of it must be moved to a new
Multi-Arch: foreign package qttools5-dev-tools-bin. Then a new and
almost empty qttools5-dev-tools Multi-Arch: same package depends on
qttools5-dev-tools-bin. That way no client package is broken. Initially
qttools5-dev-tools keeps /usr/lib/ and everything else
moves to qttools5-dev-tools-bin.

Step 3: Add the wrapper script from step1 to qttools5-dev-tools. That
probably replaces the present symlink
/usr/lib//qt5/bin/qtpaths.

Note that steps 1 and 2 can be performed in parallel and independently.
Starting step 2 early is paramount as it will trip through new.

What happens to /usr/bin/-qtpaths is very unclear to me.
It's even unclear whether we need it at all given that packages seem to
prefer picking a qt installation root (e.g.
/usr/lib//qt5) and then locating everything from
there. If we need it, we likely need to involve qtchooser in order to
support qt6.

So does this make sense from the qt-maintainers pov?

Helmut



Bug#1006869: ksyntax-highlighting FTCBFS: missing native build dependencies

2022-03-06 Thread Helmut Grohne
Source: ksyntax-highlighting
Version: 5.90.0-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

ksyntax-highlighting fails to cross build from source, because it misses
build dependencies on a few native components as its build system
performs a native compilation step of some build tools. Please consider
applying the attached patch to include the missing dependencies. Note
that I did not add version restrictions, because those are implicit via
the Multi-Arch: same version-lock and the host version restrictions
(i.e. don't repeat yourself).

Helmut
--- ksyntax-highlighting-5.90.0/debian/changelog
+++ ksyntax-highlighting-5.90.0/debian/changelog
@@ -1,3 +1,11 @@
+ksyntax-highlighting (5.90.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Add missing native dependencies qtbase5-dev and qttools5-dev.
+(Closes: #-1)
+
+ -- Helmut Grohne   Sun, 06 Mar 2022 10:02:19 +0100
+
 ksyntax-highlighting (5.90.0-2) unstable; urgency=medium
 
   * Team upload.
--- ksyntax-highlighting-5.90.0/debian/control
+++ ksyntax-highlighting-5.90.0/debian/control
@@ -13,8 +13,10 @@
perl:any,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.15.2~),
+   qtbase5-dev:native,
qtdeclarative5-dev (>= 5.15.2~),
qttools5-dev (>= 5.4),
+   qttools5-dev:native,
 Standards-Version: 4.6.0
 Homepage: https://invent.kde.org/frameworks/syntax-highlighting
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/syntax-highlighting


Bug#998354: plasma-wayland-protocols FTCBFS: missing Build-Depends: qt5-qmake

2021-11-02 Thread Helmut Grohne
Source: plasma-wayland-protocols
Version: 1.4.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

plasma-wayland-protocols fails to cross build from source, because it
uses qmake to query for paths via ECM without the relevant dependency on
qt5-qmake. As a consequence, running qmake as part of the build fails.
Please apply the attached patch to fix the missing dependency.

Helmut
diff --minimal -Nru plasma-wayland-protocols-1.4.0/debian/changelog 
plasma-wayland-protocols-1.4.0/debian/changelog
--- plasma-wayland-protocols-1.4.0/debian/changelog 2021-09-05 
10:22:42.0 +0200
+++ plasma-wayland-protocols-1.4.0/debian/changelog 2021-11-02 
21:01:11.0 +0100
@@ -1,3 +1,10 @@
+plasma-wayland-protocols (1.4.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Missing Build-Depens: qt5-qmake. (Closes: #-1)
+
+ -- Helmut Grohne   Tue, 02 Nov 2021 21:01:11 +0100
+
 plasma-wayland-protocols (1.4.0-1) unstable; urgency=medium
 
   [ Norbert Preining ]
diff --minimal -Nru plasma-wayland-protocols-1.4.0/debian/control 
plasma-wayland-protocols-1.4.0/debian/control
--- plasma-wayland-protocols-1.4.0/debian/control   2021-09-05 
10:21:53.0 +0200
+++ plasma-wayland-protocols-1.4.0/debian/control   2021-11-02 
21:00:29.0 +0100
@@ -7,6 +7,7 @@
 Build-Depends: cmake (>= 3.5~),
debhelper-compat (= 13),
extra-cmake-modules (>= 5.69.0~),
+   qt5-qmake,
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Homepage: https://invent.kde.org/libraries/plasma-wayland-protocols


Bug#986434: kmail FTBFS: /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libKF5MailCommon.so.5.15.3.abi2: undefined reference to `MessageCore::MailingList::MailingList()@ABI_5_1'

2021-04-05 Thread Helmut Grohne
Source: kmail
Version: 4:20.08.3-1
Severity: serious
Tags: ftbfs

kmail fails to build from source in unstable on amd64. It runs into a
pile of linker errors while linking the kmail executable. Example:

| /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libKF5MailCommon.so.5.15.3.abi2: 
undefined reference to `MessageCore::MailingList::MailingList()@ABI_5_1'

Maybe libkf5mailcommon5abi2 is underlinked? Please reassign the bug if
necessary. Seems to be a fairly recent issue as reproducible.d.n didn't
run into it on 2021-03-24. I don't see what could have caused this.
Should be trivially reproducible though.

Helmut



Bug#981788: qtxmlpatterns-opensource-src: annotate Build-Depends: qml-module-qtquick2

2021-02-03 Thread Helmut Grohne
Source: qtxmlpatterns-opensource-src
Version: 5.15.2-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

qtxmlpatterns-opensource-src participates in dependency loops relevant
to architecture bootstrap. Instead of looking into such a hard problem,
I looked into easily droppable dependencies and found that a nocheck
build with qml-module-qtquick2 moved to Build-Conflicts exactly
reproduces the binary artifacts of a regular build. Please consider
applying the attached patch to annotate it .

Helmut
diff --minimal -Nru qtxmlpatterns-opensource-src-5.15.2/debian/changelog 
qtxmlpatterns-opensource-src-5.15.2/debian/changelog
--- qtxmlpatterns-opensource-src-5.15.2/debian/changelog2020-12-11 
09:32:46.0 +0100
+++ qtxmlpatterns-opensource-src-5.15.2/debian/changelog2021-02-03 
15:18:15.0 +0100
@@ -1,3 +1,10 @@
+qtxmlpatterns-opensource-src (5.15.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Annotate Build-Depends: qml-module-qtquick2 . (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 03 Feb 2021 15:18:15 +0100
+
 qtxmlpatterns-opensource-src (5.15.2-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.5.1, no changes needed.
diff --minimal -Nru qtxmlpatterns-opensource-src-5.15.2/debian/control 
qtxmlpatterns-opensource-src-5.15.2/debian/control
--- qtxmlpatterns-opensource-src-5.15.2/debian/control  2020-12-11 
09:32:46.0 +0100
+++ qtxmlpatterns-opensource-src-5.15.2/debian/control  2021-02-03 
15:18:14.0 +0100
@@ -11,7 +11,7 @@
 Build-Depends: debhelper-compat (= 13),
dpkg-dev (>= 1.17.14),
pkg-kde-tools,
-   qml-module-qtquick2 (>= 5.15.2+dfsg~),
+   qml-module-qtquick2 (>= 5.15.2+dfsg~) ,
qtbase5-private-dev (>= 5.15.2+dfsg~),
qtdeclarative5-private-dev (>= 5.15.2+dfsg~),
xauth ,


Bug#981254: phonon: drop unused Build-Depends: libqt5opengl-dev

2021-01-28 Thread Helmut Grohne
Source: phonon
Version: 4:4.11.1-3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

phonon participates in dependency loops relevant to architecture
bootstrap. Rather than look into such a difficult problem, I looked into
easily droppable dependencies. It turns out that the libqt5opengl-dev
dependency is totally unused. The only mention of it is in
debian/changelog where no reason was given for adding it. Please
consider applying the attached patch to drop it.

Helmut
diff --minimal -Nru phonon-4.11.1/debian/changelog 
phonon-4.11.1/debian/changelog
--- phonon-4.11.1/debian/changelog  2019-11-12 21:09:15.0 +0100
+++ phonon-4.11.1/debian/changelog  2021-01-28 09:11:22.0 +0100
@@ -1,3 +1,10 @@
+phonon (4:4.11.1-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unused libqt5opengl-dev from Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Thu, 28 Jan 2021 09:11:22 +0100
+
 phonon (4:4.11.1-3) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru phonon-4.11.1/debian/control phonon-4.11.1/debian/control
--- phonon-4.11.1/debian/control2019-11-08 23:18:16.0 +0100
+++ phonon-4.11.1/debian/control2021-01-28 09:11:21.0 +0100
@@ -12,7 +12,6 @@
extra-cmake-modules (>= 5.60~),
libglib2.0-dev,
libpulse-dev (>= 0.9.21),
-   libqt5opengl5-dev,
pkg-kde-tools (>= 0.12),
qtbase5-dev,
qttools5-dev,


Bug#981202: kconfig: reduce Build-Depends

2021-01-27 Thread Helmut Grohne
Source: kconfig
Version: 5.78.0-3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

kconfig participates in dependency loops relevant to architecture
bootstrap. Rather than work on such a difficult problem, I looked into
easily droppable dependencies. As far as I know, Norbert already dropped
graphviz in git. I'm including it here for completeness and
confirmation. Beyond that, xauth and xvfb are only used for testing and
thus can be annotated . Please consider applying the attached
patch.

Helmut
diff --minimal -Nru kconfig-5.78.0/debian/changelog 
kconfig-5.78.0/debian/changelog
--- kconfig-5.78.0/debian/changelog 2021-01-18 11:45:56.0 +0100
+++ kconfig-5.78.0/debian/changelog 2021-01-27 17:43:45.0 +0100
@@ -1,3 +1,12 @@
+kconfig (5.78.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends: (Closes: #-1)
++ Drop unused graphviz.
++ Annotate xauth and xvfb with .
+
+ -- Helmut Grohne   Wed, 27 Jan 2021 17:43:45 +0100
+
 kconfig (5.78.0-3) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru kconfig-5.78.0/debian/control kconfig-5.78.0/debian/control
--- kconfig-5.78.0/debian/control   2021-01-18 11:26:42.0 +0100
+++ kconfig-5.78.0/debian/control   2021-01-27 17:43:43.0 +0100
@@ -9,14 +9,13 @@
debhelper-compat (= 13),
doxygen (>= 1.8.13~),
extra-cmake-modules (>= 5.78.0~),
-   graphviz,
libqt5sql5-sqlite,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.14.0~),
qttools5-dev (>= 5.4),
qttools5-dev-tools (>= 5.4),
-   xauth,
-   xvfb,
+   xauth ,
+   xvfb ,
 Standards-Version: 4.5.1
 Homepage: https://invent.kde.org/frameworks/kconfig
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kconfig


Bug#981159: extra-cmake-modules: drop unused qt Build-Depends

2021-01-26 Thread Helmut Grohne
Source: extra-cmake-modules
Version: 5.78.0-3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

extra-cmake-modules participates in dependency loops relevant to
architecture bootstrap. Instead of looking into such a difficult
problem, I looked for easily droppable dependencies and found that its
qt dependencies are unused - presumably since its test suite is
disabled. Please consider applying the attached patch to drop the
relevant dependencies. Alternatively, consider enabling the tests.

Helmut
diff --minimal -Nru extra-cmake-modules-5.78.0/debian/changelog 
extra-cmake-modules-5.78.0/debian/changelog
--- extra-cmake-modules-5.78.0/debian/changelog 2021-01-22 14:43:12.0 
+0100
+++ extra-cmake-modules-5.78.0/debian/changelog 2021-01-27 06:54:03.0 
+0100
@@ -1,3 +1,10 @@
+extra-cmake-modules (5.78.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unused qt build dependencies. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 27 Jan 2021 06:54:03 +0100
+
 extra-cmake-modules (5.78.0-3) unstable; urgency=medium
 
   * Cherry-pick upstream fix for tar invocation in app templates.
diff --minimal -Nru extra-cmake-modules-5.78.0/debian/control 
extra-cmake-modules-5.78.0/debian/control
--- extra-cmake-modules-5.78.0/debian/control   2021-01-11 14:56:40.0 
+0100
+++ extra-cmake-modules-5.78.0/debian/control   2021-01-27 06:54:03.0 
+0100
@@ -14,9 +14,6 @@
python3-sphinx ,
python3-sphinxcontrib.qthelp ,
python3-sphinxcontrib.serializinghtml ,
-   qtdeclarative5-dev,
-   qttools5-dev (>= 5.4),
-   qttools5-dev-tools (>= 5.4),
 Build-Depends-Indep: dh-sequence-sphinxdoc
 Standards-Version: 4.5.1
 Rules-Requires-Root: no


Bug#981136: ki18n: drop unused Build-Depends: graphviz, qtscript5-dev

2021-01-26 Thread Helmut Grohne
Source: ki18n
Version: 5.78.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

ki18n participates in dependency loops relevant to architecture
bootstrap. Instead of looking into such a difficult problem, I looked
for easily droppable dependencies. Norbert likely already committed the
dropping of graphviz to git. I'm including it for completeness and
confirmation here. Beyond that, qtscript5-dev is also unused. No
#include of it is mentioned anywhere in the source. I think it can
safely be dropped and I verified that doing so does not change output
artifacts. Please consider applying the attached patch.

Helmut
diff --minimal -Nru ki18n-5.78.0/debian/changelog ki18n-5.78.0/debian/changelog
--- ki18n-5.78.0/debian/changelog   2021-01-17 04:02:22.0 +0100
+++ ki18n-5.78.0/debian/changelog   2021-01-26 06:54:07.0 +0100
@@ -1,3 +1,10 @@
+ki18n (5.78.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unused graphviz and qtscript5-dev from Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Tue, 26 Jan 2021 06:54:07 +0100
+
 ki18n (5.78.0-2) unstable; urgency=medium
 
   * Release to unstable.
diff --minimal -Nru ki18n-5.78.0/debian/control ki18n-5.78.0/debian/control
--- ki18n-5.78.0/debian/control 2021-01-17 03:54:33.0 +0100
+++ ki18n-5.78.0/debian/control 2021-01-26 06:54:05.0 +0100
@@ -9,13 +9,11 @@
doxygen (>= 1.8.13~),
extra-cmake-modules (>= 5.78.0~),
gettext,
-   graphviz,
libqt5sql5-sqlite:native,
pkg-kde-tools (>= 0.15.15ubuntu1~),
python3:any,
qtbase5-dev (>= 5.14.0~),
qtdeclarative5-dev (>= 5.14.0~),
-   qtscript5-dev (>= 5.8.0~),
qttools5-dev,
qttools5-dev-tools (>= 5.4)
 Standards-Version: 4.5.1


Bug#981081: kdbusaddons: reduce Build-Depends

2021-01-25 Thread Helmut Grohne
Source: kdbusaddons
Version: 5.78.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

kdbusaddons participates in dependency loops relevant to architecture
bootstrap. Instead of looking into such a difficult problem, I looked
for easily droppable dependencies. I think Norbert already committed the
dropping of graphviz also included here for completeness and
confirmation. Beyond that, dbus-x11 is only used for testing and can be
annotated .  Please consider applying the attached patch.

Helmut
diff --minimal -Nru kdbusaddons-5.78.0/debian/changelog 
kdbusaddons-5.78.0/debian/changelog
--- kdbusaddons-5.78.0/debian/changelog 2021-01-17 04:02:20.0 +0100
+++ kdbusaddons-5.78.0/debian/changelog 2021-01-26 06:45:06.0 +0100
@@ -1,3 +1,12 @@
+kdbusaddons (5.78.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends: (Closes: #-1)
++ Drop unused graphviz.
++ Annotate test dependency dbus-x11 .
+
+ -- Helmut Grohne   Tue, 26 Jan 2021 06:45:06 +0100
+
 kdbusaddons (5.78.0-2) unstable; urgency=medium
 
   * Release to unstable.
diff --minimal -Nru kdbusaddons-5.78.0/debian/control 
kdbusaddons-5.78.0/debian/control
--- kdbusaddons-5.78.0/debian/control   2021-01-17 03:54:33.0 +0100
+++ kdbusaddons-5.78.0/debian/control   2021-01-26 06:45:05.0 +0100
@@ -5,11 +5,10 @@
 Uploaders: Maximiliano Curia ,
Norbert Preining 
 Build-Depends: cmake (>= 3.5~),
-   dbus-x11,
+   dbus-x11 ,
debhelper-compat (= 13),
doxygen,
extra-cmake-modules (>= 5.78.0~),
-   graphviz,
libqt5sql5-sqlite:native,
libqt5x11extras5-dev (>= 5.14.0~),
pkg-kde-tools (>= 0.15.15ubuntu1~),


Bug#980767: kcrash: reduce Build-Depends

2021-01-21 Thread Helmut Grohne
Source: kcrash
Version: 5.78.0-3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

kcrash particiapates in a number of dependency loops relevant to
architecture bootstrap. Rather than working on such a difficult issue, I
looked into easily droppable dependencies. Here we go:
 * graphviz isn't used. I think it was formerly used via doxygen, but no
   longer is.
 * Since bumping debhelper compat to 13, xauth and xvfb can be annotated
as the whole override is now skipped.

Please consider applying the attached patch.

Helmut
diff --minimal -Nru kcrash-5.78.0/debian/changelog 
kcrash-5.78.0/debian/changelog
--- kcrash-5.78.0/debian/changelog  2021-01-18 10:57:48.0 +0100
+++ kcrash-5.78.0/debian/changelog  2021-01-21 22:12:59.0 +0100
@@ -1,3 +1,13 @@
+kcrash (5.78.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends:
++ Annotate xauth and xvfb with  as compat 13 now skips the whole
+  override.
++ Drop unused graphviz dependency as doxygen doesn't call it.
+
+ -- Helmut Grohne   Thu, 21 Jan 2021 22:12:59 +0100
+
 kcrash (5.78.0-3) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru kcrash-5.78.0/debian/control kcrash-5.78.0/debian/control
--- kcrash-5.78.0/debian/control2021-01-18 10:46:08.0 +0100
+++ kcrash-5.78.0/debian/control2021-01-21 22:12:57.0 +0100
@@ -8,7 +8,6 @@
debhelper-compat (= 13),
doxygen,
extra-cmake-modules (>= 5.78.0~),
-   graphviz,
libkf5coreaddons-dev (>= 5.78.0~),
libkf5windowsystem-dev (>= 5.78.0~),
libqt5sql5-sqlite,
@@ -18,8 +17,8 @@
qtbase5-dev (>= 5.14.0~),
qttools5-dev,
qttools5-dev-tools (>= 5.4),
-   xauth,
-   xvfb
+   xauth ,
+   xvfb ,
 Standards-Version: 4.5.1
 Homepage: https://invent.kde.org/frameworks/kcrash
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kcrash


Bug#980264: kwindowsystem: reduce Build-Depends

2021-01-16 Thread Helmut Grohne
Source: kwindowsystem
Version: 5.78.0-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

kwindowsystem participates in a small dependency graph of packages
relevant to bootstrap. Instead of analyzing the mess, I looked into
easily droppable Build-Depends and kwindowsystem has two:

 * graphviz is entirely unused. I suppose that it was a support
   dependency for doxygen.
 * libxcb-icccm4-dev is only used for a testcase. It can be annotated
   , which makes it irrelevant to bootstrapping.

Please consider applying the attached patch.

Helmut
diff --minimal -Nru kwindowsystem-5.78.0/debian/changelog 
kwindowsystem-5.78.0/debian/changelog
--- kwindowsystem-5.78.0/debian/changelog   2021-01-13 02:32:44.0 
+0100
+++ kwindowsystem-5.78.0/debian/changelog   2021-01-16 22:52:28.0 
+0100
@@ -1,3 +1,13 @@
+kwindowsystem (5.78.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends: (Closes: #-1)
++ Drop unused graphviz.
++ Annotate libxcb-icccm4-dev  as it is only used in
+  autotests/kwindowinfox11test.cpp.
+
+ -- Helmut Grohne   Sat, 16 Jan 2021 22:52:28 +0100
+
 kwindowsystem (5.78.0-1) experimental; urgency=medium
 
   [ Norbert Preining ]
diff --minimal -Nru kwindowsystem-5.78.0/debian/control 
kwindowsystem-5.78.0/debian/control
--- kwindowsystem-5.78.0/debian/control 2021-01-11 14:56:43.0 +0100
+++ kwindowsystem-5.78.0/debian/control 2021-01-16 22:52:20.0 +0100
@@ -8,11 +8,10 @@
debhelper-compat (= 13),
doxygen,
extra-cmake-modules (>= 5.78.0~),
-   graphviz,
libqt5sql5-sqlite:native,
libqt5x11extras5-dev (>= 5.14.0~),
libx11-dev,
-   libxcb-icccm4-dev,
+   libxcb-icccm4-dev ,
libxcb-keysyms1-dev,
libxcb-res0-dev,
libxcb-xfixes0-dev,


Bug#979454: knotifications: reduce Build-Depends

2021-01-06 Thread Helmut Grohne
Source: knotifications
Version: 5.77.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

knotifications plays a role in a pile of dependency cycles relevant to
architecture bootstrap. Rather than working on cycles directly, I looked
into easily droppable Build-Depends and noticed that knotifications has
some:

 * dbus-x11 is only used during the test suite. It can be tagged
   .
 * I couldn't find any usage of graphviz. I propose dropping it.
 * xauth and xvfb are used to wrap the test suite in debian rules. They
   can be tagged .

A nocheck build with these dependencies disabled produces exactly the
same .debs as a build containing them. Please consider applying the
attached patch.

Helmut
diff --minimal -Nru knotifications-5.77.0/debian/changelog 
knotifications-5.77.0/debian/changelog
--- knotifications-5.77.0/debian/changelog  2020-12-22 02:33:35.0 
+0100
+++ knotifications-5.77.0/debian/changelog  2021-01-06 18:57:03.0 
+0100
@@ -1,3 +1,10 @@
+knotifications (5.77.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 06 Jan 2021 18:57:03 +0100
+
 knotifications (5.77.0-2) unstable; urgency=medium
 
   * Release to unstable.
diff --minimal -Nru knotifications-5.77.0/debian/control 
knotifications-5.77.0/debian/control
--- knotifications-5.77.0/debian/control2020-12-22 02:31:16.0 
+0100
+++ knotifications-5.77.0/debian/control2021-01-06 18:56:49.0 
+0100
@@ -5,11 +5,10 @@
 Uploaders: Maximiliano Curia ,
Norbert Preining ,
 Build-Depends: cmake (>= 3.5~),
-   dbus-x11,
+   dbus-x11 ,
debhelper-compat (= 13),
doxygen,
extra-cmake-modules (>= 5.77.0~),
-   graphviz,
libdbusmenu-qt5-dev,
libkf5config-dev (>= 5.77.0~),
libkf5coreaddons-dev (>= 5.77.0~),
@@ -24,8 +23,8 @@
qtbase5-dev (>= 5.13.0~),
qttools5-dev (>= 5.4),
qttools5-dev-tools (>= 5.4),
-   xauth,
-   xvfb,
+   xauth ,
+   xvfb ,
 Standards-Version: 4.5.1
 Homepage: https://invent.kde.org/frameworks/knotifications
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/knotifications


Bug#979452: kconfigwidgets: reduce Build-Depends

2021-01-06 Thread Helmut Grohne
Source: kconfigwidgets
Version: 5.77.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

kconfigwidgets is part of a set of interconnected packages with
dependency cycles, which happen to be relevant to architecture
bootstrap. Instead of looking into difficult dependency cycles, I'm
after the low hanging fruit, which is easily droppable dependencies:

 * I couldn't find any use of graphviz and propose dropping it.
 * xauth and xvfb are used in override_dh_auto_test, which is skipped by
   debhelper when the nocheck option is active since compat level 13.
   These can thus be annotated .

I've attempted building kconfigwidgets with these dependencies replaced
with Build-Conflicts and the build result is bit-identical. Therefore,
please consider applying the attached patch.

Helmut
diff --minimal -Nru kconfigwidgets-5.77.0/debian/changelog 
kconfigwidgets-5.77.0/debian/changelog
--- kconfigwidgets-5.77.0/debian/changelog  2020-12-22 02:33:33.0 
+0100
+++ kconfigwidgets-5.77.0/debian/changelog  2021-01-06 20:13:07.0 
+0100
@@ -1,3 +1,10 @@
+kconfigwidgets (5.77.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 06 Jan 2021 20:13:07 +0100
+
 kconfigwidgets (5.77.0-2) unstable; urgency=medium
 
   * Release to unstable.
diff --minimal -Nru kconfigwidgets-5.77.0/debian/control 
kconfigwidgets-5.77.0/debian/control
--- kconfigwidgets-5.77.0/debian/control2020-12-22 02:31:15.0 
+0100
+++ kconfigwidgets-5.77.0/debian/control2021-01-06 20:13:05.0 
+0100
@@ -9,7 +9,6 @@
doxygen,
extra-cmake-modules (>= 5.77.0~),
gettext,
-   graphviz,
libkf5auth-dev (>= 5.77.0~),
libkf5codecs-dev (>= 5.77.0~),
libkf5config-dev (>= 5.77.0~),
@@ -23,8 +22,8 @@
qtbase5-dev (>= 5.13.0~),
qttools5-dev,
qttools5-dev-tools (>= 5.4),
-   xauth,
-   xvfb,
+   xauth ,
+   xvfb ,
 Standards-Version: 4.5.1
 Homepage: https://invent.kde.org/frameworks/kconfigwidgets
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kconfigwidgets


Bug#979453: kwallet-kf5: drop unused Build-Depends

2021-01-06 Thread Helmut Grohne
Source: kwallet-kf5
Version: 5.77.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

kwallet-kf5 somehow made it into the big set of packages relevant to
architecture bootstrap via some dependency cycle. Rather that work on
that hard problem, how about dropping entirely unused Build-Depends to
shrink the problem?

I couldn't find any use of either graphviz nor boost in kwallet-kf5.
Indeed building a modified kwallet-kf5 with graphviz and libboost-dev
turned into Build-Conflicts exactly reproduces the .debs when building
without this modification. Please consider applying the attached patch.

Helmut
diff --minimal -Nru kwallet-kf5-5.77.0/debian/changelog 
kwallet-kf5-5.77.0/debian/changelog
--- kwallet-kf5-5.77.0/debian/changelog 2020-12-22 02:33:36.0 +0100
+++ kwallet-kf5-5.77.0/debian/changelog 2021-01-06 17:28:34.0 +0100
@@ -1,3 +1,10 @@
+kwallet-kf5 (5.77.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unused Build-Depends. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 06 Jan 2021 17:28:34 +0100
+
 kwallet-kf5 (5.77.0-2) unstable; urgency=medium
 
   * Release to unstable.
diff --minimal -Nru kwallet-kf5-5.77.0/debian/control 
kwallet-kf5-5.77.0/debian/control
--- kwallet-kf5-5.77.0/debian/control   2020-12-22 02:31:16.0 +0100
+++ kwallet-kf5-5.77.0/debian/control   2021-01-06 17:28:32.0 +0100
@@ -8,8 +8,6 @@
debhelper-compat (= 13),
doxygen,
extra-cmake-modules (>= 5.77.0~),
-   graphviz,
-   libboost-dev,
libgcrypt20-dev (>= 1.5.0~),
libgpgme-dev | libgpgme11-dev,
libgpgmepp-dev (>= 1.7.0~) | libgpgmepp6-dev,


Bug#978719: cantor: unregistered code copy of discount

2020-12-30 Thread Helmut Grohne
Source: cantor
Version: 4:20.12.0-1
Severity: important

cantor contains an embedded code copy of discount (a markdown
processor). The Debian policy recommends not using such copies and
instead using the archive copy. Did you attempt to unembed discount?

In some cases, unembedding is impossible. In such cases, embedded copies
should be registered with the security tracker. Please see
https://wiki.debian.org/EmbeddedCopies for details on the process.

Please close this bug when either unembedding discount or registering
the copy.

Helmut



Bug#977393: kdav FTCBFS: missing Build-Depends: qttools5-dev for qhelpgenerator

2020-12-14 Thread Helmut Grohne
Source: kdav
Version: 1:5.74.0-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kdav fails to cross build from source, because it does not find
qhelpgenerator. To that end, #918760 was filed, but the solution
requires all users of qhelpgenerator to build-depend on qttools5-dev.
kdav misses this dependency. Please consider applying the attached
patch.

Helmut
--- kdav-5.74.0/debian/changelog
+++ kdav-5.74.0/debian/changelog
@@ -1,3 +1,11 @@
+kdav (1:5.74.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add missing Build-Depends: qttools5-dev required for qhelpgenerator.
+(Closes: #-1, see #918760)
+
+ -- Helmut Grohne   Mon, 14 Dec 2020 16:50:23 +0100
+
 kdav (1:5.74.0-2) unstable; urgency=medium
 
   * Team upload to unstable.
--- kdav-5.74.0/debian/control
+++ kdav-5.74.0/debian/control
@@ -14,6 +14,7 @@
pkg-kde-tools (>= 0.12),
qhelpgenerator-qt5,
qtbase5-dev (>= 5.12.0~),
+   qttools5-dev,
xauth,
xvfb,
 Standards-Version: 4.5.0


Bug#977278: kaddressbook FTBFS: error: no matching function for call to ‘QPrinter::setPageMargins(int, int, int, int, QPrinter::Unit)’

2020-12-13 Thread Helmut Grohne
Source: kaddressbook
Version: 4:20.08.2-3
Severity: serious
Tags: ftbfs

kaddressbook fails to build from source on amd64 in unstable. A build
ends with:

| [ 35%] Building CXX object 
src/CMakeFiles/kaddressbookprivate.dir/printing/mike/mikesstyle.cpp.o
| cd /<>/obj-x86_64-linux-gnu/src && /usr/bin/c++ -DHAVE_QGPGME 
-DKCOREADDONS_LIB -DKF_DEPRECATED_WARNINGS_SINCE=0x06 
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054800 -DQT_CONCURRENT_LIB 
-DQT_CORE_LIB -DQT_DBUS_LIB -DQT_DEPRECATED_WARNINGS_SINCE=0x06 
-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00 -DQT_GUI_LIB -DQT_NETWORK_LIB 
-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_TO_ASCII 
-DQT_NO_DEBUG -DQT_NO_FOREACH -DQT_NO_KEYWORDS 
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_SIGNALS_SLOTS_KEYWORDS 
-DQT_NO_URL_CAST_FROM_STRING -DQT_PRINTSUPPORT_LIB -DQT_STRICT_ITERATORS 
-DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -DQT_XML_LIB 
-DTRANSLATION_DOMAIN=\"kaddressbook\" -DWITH_KUSERFEEDBACK -D_GNU_SOURCE 
-D_LARGEFILE64_SOURCE -Dkaddressbookprivate_EXPORTS 
-I/<>/obj-x86_64-linux-gnu/src -I/<>/src 
-I/<>/obj-x86_64-linux-gnu/src/kaddressbookprivate_autogen/include 
-I/<> -I/<>/obj-x86_64-linux-gnu 
-I/<>/src/printing -isystem /usr/include/KF5/PimCommonAkonadi 
-isystem /usr/include/KF5/pimcommonakonadi -isystem /usr/include/KF5 -isystem 
/usr/include/KF5/PimCommon -isystem /usr/include/KF5/pimcommon -isystem 
/usr/include/x86_64-linux-gnu/qt5 -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtCore -isystem 
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -isystem 
/usr/include/KF5/KIOCore -isystem /usr/include/KF5/KCoreAddons -isystem 
/usr/include/KF5/KService -isystem /usr/include/KF5/KConfigCore -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtConcurrent -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtDBus -isystem 
/usr/include/KF5/KConfigWidgets -isystem /usr/include/KF5/KCodecs -isystem 
/usr/include/KF5/KWidgetsAddons -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/KF5/KConfigGui 
-isystem /usr/include/x86_64-linux-gnu/qt5/QtXml -isystem 
/usr/include/KF5/KAuth -isystem /usr/include/KF5/AkonadiCore -isystem 
/usr/include/KF5/KItemModels -isystem /usr/include/KF5/AkonadiWidgets -isystem 
/usr/include/KF5/KContacts -isystem /usr/include/KF5/Akonadi/Contact -isystem 
/usr/include/KF5/akonadi/contact -isystem /usr/include/KF5/KIMAP -isystem 
/usr/include/KF5/KMime -isystem /usr/include/KF5/Libkdepim -isystem 
/usr/include/KF5/libkdepim -isystem /usr/include/KF5/KaddressbookGrantlee 
-isystem /usr/include/KF5/kaddressbookgrantlee -isystem 
/usr/include/KF5/GrantleeTheme -isystem /usr/include/KF5/grantleetheme -isystem 
/usr/include/KF5/KCMUtils -isystem /usr/include/KF5/KCompletion -isystem 
/usr/include/KF5/KXmlGui -isystem /usr/include/KF5/KJobWidgets -isystem 
/usr/include/KF5/KIOWidgets -isystem /usr/include/KF5/KIOGui -isystem 
/usr/include/KF5/KWindowSystem -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -isystem 
/usr/include/KF5/AkonadiSearch -isystem /usr/include/KF5/KI18n -isystem 
/usr/include/KF5/KAddressBookImportExport -isystem 
/usr/include/KF5/kaddressbookimportexport -isystem /usr/include/KF5/prison 
-isystem /usr/include/KUserFeedback -isystem /usr/include/qgpgme -isystem 
/usr/include/gpgme++ -g -O2 -fdebug-prefix-map=/<>=. 
-fstack-protector-strong -Wformat -Werror=format-security -Wdate-time 
-D_FORTIFY_SOURCE=2 -fno-operator-names -fno-exceptions -Wall -Wextra 
-Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith 
-Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -Wvla 
-Wdate-time -Wsuggest-override -Wlogical-op -pedantic 
-Wzero-as-null-pointer-constant -fPIC -fvisibility=hidden 
-fvisibility-inlines-hidden -fPIC -fexceptions -std=gnu++14 -o 
CMakeFiles/kaddressbookprivate.dir/printing/mike/mikesstyle.cpp.o -c 
/<>/src/printing/mike/mikesstyle.cpp
| /<>/src/printing/mike/mikesstyle.cpp: In member function 
‘virtual void KABPrinting::MikesStyle::print(const List&, 
KABPrinting::PrintProgress*)’:
| /<>/src/printing/mike/mikesstyle.cpp:126:66: error: no matching 
function for call to ‘QPrinter::setPageMargins(int, int, int, int, 
QPrinter::Unit)’
|   126 | printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
|   |  ^
| In file included from 
/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport/qprinter.h:46,
|  from 
/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport/QPrinter:1,
|  from /<>/src/printing/mike/mikesstyle.cpp:36:
| /usr/include/x86_64-linux-gnu/qt5/QtGui/qpagedpaintdevice.h:224:10: note: 
candidate: ‘bool QPagedPaintDevice::setPageMargins(const QMarginsF&, 
QPageLayout::Unit)’
|   224 | bool setPageMargins(const QMarginsF , QPageLayout::Unit 
units);
|   |  ^~
| 

Bug#977277: libkf5calendarsupport FTBFS: error: ‘class QPrinter’ has no member named ‘orientation’

2020-12-13 Thread Helmut Grohne
Source: libkf5calendarsupport
Version: 4:20.08.2-2
Severity: serious
Tags: ftbfs

libkf5calendarsupport fails to build from source on amd64 in unstable. A
build ends with:

| [ 54%] Building CXX object 
src/CMakeFiles/KF5CalendarSupport.dir/printing/calprintpluginbase.cpp.o
| cd /<>/obj-x86_64-linux-gnu/src && /usr/bin/c++ 
-DKCOREADDONS_LIB -DKCalCore=KCalendarCore -DKF5CalendarSupport_EXPORTS 
-DKF_DEPRECATED_WARNINGS_SINCE=0x06 
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054600 -DKGUIADDONS_LIB 
-DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB 
-DQT_DEPRECATED_WARNINGS_SINCE=0x06 -DQT_DISABLE_DEPRECATED_BEFORE=0x050f00 
-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_FROM_ASCII 
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_NO_FOREACH 
-DQT_NO_KEYWORDS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT 
-DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING 
-DQT_PRINTSUPPORT_LIB -DQT_STRICT_ITERATORS -DQT_USE_QSTRINGBUILDER 
-DQT_WIDGETS_LIB -DQT_XML_LIB -DTRANSLATION_DOMAIN=\"calendarsupport\" 
-D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I/<>/obj-x86_64-linux-gnu/src 
-I/<>/src 
-I/<>/obj-x86_64-linux-gnu/src/KF5CalendarSupport_autogen/include 
-isystem /usr/include/KF5/KMime -isystem /usr/include/KF5 -isystem 
/usr/include/x86_64-linux-gnu/qt5 -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtCore -isystem 
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -isystem 
/usr/include/KF5/KIdentityManagement -isystem 
/usr/include/KF5/KIdentityManagement/kidentitymanagement -isystem 
/usr/include/KF5/KCoreAddons -isystem /usr/include/KF5/KPIMTextEdit -isystem 
/usr/include/KF5/Akonadi/Calendar -isystem /usr/include/KF5/akonadi/calendar 
-isystem /usr/include/KF5/AkonadiCore -isystem /usr/include/KF5/KItemModels 
-isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem 
/usr/include/KF5/KCalendarCore -isystem /usr/include/KF5/KWidgetsAddons 
-isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem 
/usr/include/KF5/KI18n -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -isystem 
/usr/include/KF5/KCompletion -isystem /usr/include/KF5/KIOWidgets -isystem 
/usr/include/KF5/KIOGui -isystem /usr/include/KF5/KIOCore -isystem 
/usr/include/KF5/KService -isystem /usr/include/KF5/KConfigCore -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtConcurrent -isystem 
/usr/include/x86_64-linux-gnu/qt5/QtDBus -isystem 
/usr/include/KF5/KWindowSystem -isystem /usr/include/KF5/KJobWidgets -isystem 
/usr/include/KF5/KGuiAddons -isystem /usr/include/KF5/AkonadiWidgets -isystem 
/usr/include/KF5/KConfigWidgets -isystem /usr/include/KF5/KCodecs -isystem 
/usr/include/KF5/KConfigGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtXml 
-isystem /usr/include/KF5/KAuth -isystem /usr/include/KF5/Akonadi/Notes 
-isystem /usr/include/KF5/akonadi/notes -isystem /usr/include/KF5/KHolidays 
-isystem /usr/include/KF5/KCalUtils -isystem 
/usr/include/KF5/KCalUtils/kcalutils -isystem /usr/include/KF5/PimCommon 
-isystem /usr/include/KF5/pimcommon -g -O2 
-fdebug-prefix-map=/<>=. -fstack-protector-strong -Wformat 
-Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fno-operator-names 
-fno-exceptions -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat-security 
-Wno-long-long -Wpointer-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual 
-Werror=return-type -Wvla -Wdate-time -Wsuggest-override -Wlogical-op -pedantic 
-Wzero-as-null-pointer-constant -fPIC -fvisibility=hidden 
-fvisibility-inlines-hidden -fPIC -fexceptions -std=gnu++14 -o 
CMakeFiles/KF5CalendarSupport.dir/printing/calprintpluginbase.cpp.o -c 
/<>/src/printing/calprintpluginbase.cpp
| /<>/src/printing/calprintpluginbase.cpp: In member function 
‘QPrinter::Orientation CalendarSupport::CalPrintPluginBase::orientation() 
const’:
| /<>/src/printing/calprintpluginbase.cpp:253:33: error: ‘class 
QPrinter’ has no member named ‘orientation’; did you mean ‘Orientation’?
|   253 | return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
|   | ^~~
|   | Orientation
| make[3]: *** [src/CMakeFiles/KF5CalendarSupport.dir/build.make:382: 
src/CMakeFiles/KF5CalendarSupport.dir/printing/calprintpluginbase.cpp.o] Error 1
| make[3]: Leaving directory '/<>/obj-x86_64-linux-gnu'
| make[2]: *** [CMakeFiles/Makefile2:949: 
src/CMakeFiles/KF5CalendarSupport.dir/all] Error 2
| make[2]: Leaving directory '/<>/obj-x86_64-linux-gnu'
| make[1]: *** [Makefile:163: all] Error 2
| make[1]: Leaving directory '/<>/obj-x86_64-linux-gnu'
| dh_auto_build: error: cd obj-x86_64-linux-gnu && make -j1 "INSTALL=install 
--strip-program=true" VERBOSE=1 returned exit code 2
| make: *** [debian/rules:11: binary] Error 25
| dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 
2

Helmut



Bug#977275: kdeconnect FTCBFS: error parsing cmake expression containing unquoted variable

2020-12-13 Thread Helmut Grohne
Source: kdeconnect
Version: 20.08.3-1
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kdeconnect fails to cross build from source. plugins/CMakeLists.txt
contains a condition that contains an unquoted ${CMAKE_SYSTEM_VERSION}.
Since the toolchain does not set this optional variable, it evaluates to
nothing rather than an empty string and breaks parsing the condition
(which is only relevant to windows). Please quote the variable to allow
evaluating the expression without having to define the variable. Doing
so makes kdeconnect cross buildable. I'm attaching a patch for your
convenience.

Helmut
--- kdeconnect-20.08.3.orig/plugins/CMakeLists.txt
+++ kdeconnect-20.08.3/plugins/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 if(NOT SAILFISHOS)
 add_subdirectory(sendnotifications)
-if((WIN32 AND MSVC AND (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL 10.0.17763.0)) OR NOT WIN32)
+if((WIN32 AND MSVC AND ("${CMAKE_SYSTEM_VERSION}" VERSION_GREATER_EQUAL 10.0.17763.0)) OR NOT WIN32)
 add_subdirectory(mpriscontrol)
 endif()
 add_subdirectory(photo)


Bug#973449: qtbase-opensource-src FTCBFS for ppc64el: missing spec file

2020-10-30 Thread Helmut Grohne
Source: qtbase-opensource-src
Version: 5.15.1+dfsg-2
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qtbase-opensource-src still fails to cross build. When you attempt to
cross build it for ppc64el it fails quite early, because it lacks
mkspecs. For some reason, qt needs these for every single architecture
even though they could be generated automatically. I'm attaching the
patch for ppc64el based on the relevant arm64 files, but I do wonder
whether this could be solved generically somehow. Any ideas?

Helmut
--- /dev/null
+++ qtbase-opensource-src-5.15.1+dfsg/mkspecs/linux-powerpc64le-gnu-g++/qmake.conf
@@ -0,0 +1,24 @@
+#
+# qmake configuration for building with powerpc64le-linux-gnu-g++
+#
+
+MAKEFILE_GENERATOR  = UNIX
+CONFIG += incremental
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+# modifications to g++.conf
+QMAKE_CC= powerpc64le-linux-gnu-gcc
+QMAKE_CXX   = powerpc64le-linux-gnu-g++
+QMAKE_LINK  = powerpc64le-linux-gnu-g++
+QMAKE_LINK_SHLIB= powerpc64le-linux-gnu-g++
+
+# modifications to linux.conf
+QMAKE_AR= powerpc64le-linux-gnu-ar cqs
+QMAKE_OBJCOPY   = powerpc64le-linux-gnu-objcopy
+QMAKE_NM= powerpc64le-linux-gnu-nm -P
+QMAKE_STRIP = powerpc64le-linux-gnu-strip
+load(qt_config)
--- /dev/null
+++ qtbase-opensource-src-5.15.1+dfsg/mkspecs/linux-powerpc64le-gnu-g++/qplatformdefs.h
@@ -0,0 +1,40 @@
+/
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+/
+
+#include "../linux-g++/qplatformdefs.h"


Bug#972640: qmake cross wrapper: allow passing -qt5

2020-10-23 Thread Helmut Grohne
Hi Lisandro,

On Fri, Oct 23, 2020 at 08:24:43AM -0300, Lisandro Damián Nicanor Pérez Meyer 
wrote:
> > Since our wrapper always calls into qt5, we can simply skip that flag.
> > Doing so should make the marble build happier. Please consider applying
> > the attached patch.
>
> Mmm, shouldn't this call be intercepted by qtchooser?

I think either you or Dmitry told me that this was unnecesary: We
decided early on that cross compilation would not support qt4. We also
figured that qt6 was vastly different and thus would work differently.
Thus the cross wrapper only supports qt5.

Feel free more variants to specify qt5 when applying the patch.

Helmut



Bug#972800: sonnet FTCBFS: fails installing parsetrigrams

2020-10-23 Thread Helmut Grohne
Source: sonnet
Version: 5.74.0-2
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

Thank you for applying my previous ftcbfs patch. In the mean time, a new
problem surfaced: sonnet installs parsetrigrams and fails when it goes
missing. However, the cross build no longer builds it. Please consider
applying the attached patch to always build parsetrigrams and thus
complete the installation.

Helmut
--- sonnet-5.74.0.orig/data/CMakeLists.txt
+++ sonnet-5.74.0/data/CMakeLists.txt
@@ -1,18 +1,18 @@
 include(ECMMarkNonGuiExecutable)
 
-if(NOT CMAKE_CROSSCOMPILING)
-add_executable(parsetrigrams parsetrigrams.cpp)
-add_executable(gentrigrams gentrigrams.cpp)
+add_executable(parsetrigrams parsetrigrams.cpp)
+add_executable(gentrigrams gentrigrams.cpp)
 
-# Mark it as non-gui so we won't create an app bundle on Mac OS X
-ecm_mark_nongui_executable(parsetrigrams)
-ecm_mark_nongui_executable(gentrigrams)
+# Mark it as non-gui so we won't create an app bundle on Mac OS X
+ecm_mark_nongui_executable(parsetrigrams)
+ecm_mark_nongui_executable(gentrigrams)
 
-TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core)
-TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore)
-INSTALL(TARGETS parsetrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-INSTALL(TARGETS gentrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core)
+TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore)
+INSTALL(TARGETS parsetrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+INSTALL(TARGETS gentrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
+if(NOT CMAKE_CROSSCOMPILING)
 add_executable(KF5::parsetrigrams ALIAS parsetrigrams)
 else()
 if (NOT PARSETRIGRAMS_EXECUTABLE AND KF5_HOST_TOOLING)


Bug#972704: ki18n FTCBFS: wrong Build-Depends for qhelpgenerator

2020-10-22 Thread Helmut Grohne
Source: ki18n
Version: 5.74.0-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

ki18n still fails to cross build from source, because it fails to find
qhelpgenerator. It seems that correctly depending on qhelpgenerator is
hard. For one thing the libqt5sql5-sqlite dependency is there for
integrating with qhelpgenerator and thus should be native. Then
"something" changed and qhelpgenerator stopped being found. That
resulted in #918760. That bug was fixed, but as a consequence one now
has to depend on qttools5-dev for using qhelpgenerator. The attached
patch fixes both and this time, ki18n really should become cross
buildable. Thanks for bearing with me.

Helmut
diff --minimal -Nru ki18n-5.74.0/debian/changelog ki18n-5.74.0/debian/changelog
--- ki18n-5.74.0/debian/changelog   2020-10-19 23:13:06.0 +0200
+++ ki18n-5.74.0/debian/changelog   2020-10-21 22:13:46.0 +0200
@@ -1,3 +1,10 @@
+ki18n (5.74.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix cross Build-Depends for qhelpgenerator. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 21 Oct 2020 22:13:46 +0200
+
 ki18n (5.74.0-2) unstable; urgency=medium
 
   * Team upload to unstable.
diff --minimal -Nru ki18n-5.74.0/debian/control ki18n-5.74.0/debian/control
--- ki18n-5.74.0/debian/control 2020-10-19 22:46:33.0 +0200
+++ ki18n-5.74.0/debian/control 2020-10-21 22:13:46.0 +0200
@@ -9,12 +9,13 @@
extra-cmake-modules (>= 5.74.0~),
gettext,
graphviz,
-   libqt5sql5-sqlite,
+   libqt5sql5-sqlite:native,
pkg-kde-tools (>= 0.15.15ubuntu1~),
python3:any,
qtbase5-dev (>= 5.12.0~),
qtdeclarative5-dev (>= 5.12.0~),
qtscript5-dev (>= 5.8.0~),
+   qttools5-dev,
qttools5-dev-tools (>= 5.4),
 Standards-Version: 4.5.0
 Homepage: https://invent.kde.org/frameworks/ki18n


Bug#972640: qmake cross wrapper: allow passing -qt5

2020-10-21 Thread Helmut Grohne
Package: qt5-qmake
Version: 5.14.2+dfsg-6
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:marble

Hi,

I found a new way to break the -qmake cross wrapper. The
variant resides in marble's debian/rules. It actually does use the cross
wrapper, but it invokes it as "$(QMAKE) -qt=5 -query something". Since
our cross wrapper expects -query to come first, it doesn't recognize the
mode and fails.

Since our wrapper always calls into qt5, we can simply skip that flag.
Doing so should make the marble build happier. Please consider applying
the attached patch.

Helmut
diff --minimal -Nru qtbase-opensource-src-5.14.2+dfsg/debian/changelog 
qtbase-opensource-src-5.14.2+dfsg/debian/changelog
--- qtbase-opensource-src-5.14.2+dfsg/debian/changelog  2020-08-19 
19:40:32.0 +0200
+++ qtbase-opensource-src-5.14.2+dfsg/debian/changelog  2020-10-21 
19:28:25.0 +0200
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.14.2+dfsg-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * qmake cross wrapper: Allow passing -qt5. (Closes: #-1)
+
+ -- Helmut Grohne   Wed, 21 Oct 2020 19:28:25 +0200
+
 qtbase-opensource-src (5.14.2+dfsg-6) unstable; urgency=medium
 
   * Backport upstream patch to fix buffer overflow in XBM parser
diff --minimal -Nru 
qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in 
qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in
--- qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in 
2020-08-19 19:40:32.0 +0200
+++ qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in 
2020-10-21 19:28:21.0 +0200
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ "x$1" = x-qt5 ] || [ "x$1" = "x-qt=5" ]; then
+   shift
+fi
+
 QMAKE_MODE=
 
 if [ "x$1" = x-query ]; then


Bug#972606: plasma-workspace FTFBS: cmake error / some missing dependency

2020-10-20 Thread Helmut Grohne
Source: plasma-workspace
Version: 4:5.17.5-4
Severity: serious
Tags: ftbfs

plasma-workspace fails to build from source in unstable The issue is
fairly recent as neither reproducible builds nor crossqa have run into
it yet:

| -- Could NOT find KF5KDELibs4Support (found version "5.74.0"), checked the 
following files:
| 
/usr/lib/x86_64-linux-gnu/cmake/KF5KDELibs4Support/KF5KDELibs4SupportConfig.cmake
 (version 5.74.0)
| Reason given by package: KF5KDELibs4Support could not be found because 
dependency KF5ItemModels could not be found.
| 
| -- Found KF5Crash: 
/usr/lib/x86_64-linux-gnu/cmake/KF5Crash/KF5CrashConfig.cmake (found version 
"5.74.0") 
| -- Found KF5GlobalAccel: 
/usr/lib/x86_64-linux-gnu/cmake/KF5GlobalAccel/KF5GlobalAccelConfig.cmake 
(found version "5.74.0") 
| -- Found KF5DBusAddons: 
/usr/lib/x86_64-linux-gnu/cmake/KF5DBusAddons/KF5DBusAddonsConfig.cmake (found 
version "5.74.0") 
| -- Found KF5Wayland: 
/usr/lib/x86_64-linux-gnu/cmake/KF5Wayland/KF5WaylandConfig.cmake (found 
version "5.74.0") 
| -- Found KF5CoreAddons: 
/usr/lib/x86_64-linux-gnu/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake (found 
version "5.74.0") 
| -- Found KF5People: 
/usr/lib/x86_64-linux-gnu/cmake/KF5People/KF5PeopleConfig.cmake (found version 
"5.74.0") 
| -- Found KF5ActivitiesStats: 
/usr/lib/x86_64-linux-gnu/cmake/KF5ActivitiesStats/KF5ActivitiesStatsConfig.cmake
 (found version "5.74.0") 
| CMake Error at 
/usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
|   Could NOT find KF5 (missing: KDELibs4Support) (found suitable version
|   "5.74.0", minimum required is "5.62.0")
| Call Stack (most recent call first):
|   /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:458 
(_FPHSA_FAILURE_MESSAGE)
|   /usr/share/ECM/find-modules/FindKF5.cmake:94 
(find_package_handle_standard_args)
|   CMakeLists.txt:26 (find_package)
| 
| 
| -- Configuring incomplete, errors occurred!
| See also "/<>/obj-x86_64-linux-gnu/CMakeFiles/CMakeOutput.log".

I suspect that adding libkf5itemmodels-dev somewhere in the dependency
chain fixes this.

Helmut



Bug#971604: qtbase-opensource-src FTCBFS: fails finding mysql

2020-10-02 Thread Helmut Grohne
Source: qtbase-opensource-src
Version: 5.14.2+dfsg-6
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

We did have a few stabs at making qtbase-opensource-src cross buildable
already. At some point, it was running into an Exec format error when
running mysql_config and we concluded that this should be fixed on the
mariadb side. That's not gonna happen, because doing so would break
cross building mariadb. What needs to happens is that the world stops
using mysql_config. As bad as this sounds, the solution is quite simple,
because the building blocks are already included: pkg-config and
mysqlclient.pc. Please consider applying the attached one-line patch.

Once doing so, configuration of qtbase-opensource-src completes
successfully. The next failure is override_dh_auto_build-arch. There, we
run the just built qmake and that obviously fails with an Exec format
error. This is done to regenerate files that were included in the
source. There also is Lisandro's debian/generateTLDs.sh, which does more
of that. Can we use the build architecture qmake for these? Lisandro,
can you look into this part?

Helmut
--- qtbase-opensource-src-5.14.2+dfsg.orig/src/plugins/sqldrivers/configure.json
+++ qtbase-opensource-src-5.14.2+dfsg/src/plugins/sqldrivers/configure.json
@@ -67,6 +67,7 @@
 },
 "headers": "mysql.h",
 "sources": [
+{ "type": "pkgConfig", "args": "mysqlclient" },
 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },


Bug#969280: provide transitional dummy package qdbus

2020-08-30 Thread Helmut Grohne
Hi Lisandro,

On Sun, Aug 30, 2020 at 03:33:56PM -0300, Lisandro Damián Nicanor Pérez Meyer 
wrote:
> In which specific case this would be needed? A normal user should not
> install qdbus by hand, an a developer should be able to quickly find it.
> But of course I might be missing some use case.

I'm wondering whether I count as normal user or as developer here.
Likely I'm not a normal user, because I installed it by hand. I failed
to quickly find it and had to ask around. But the key here is: I should
not need to find it. If there was a transitional dummy package, it would
seamlessly upgrade without me hunting it. This is precisely what we have
transitional dummy packages for.

Helmut



Bug#969280: provide transitional dummy package qdbus

2020-08-30 Thread Helmut Grohne
Package: qdbus-qt5
Version: 5.14.2-3

The qdbus package vanished in the qt4 removal. It appears like one has
to stop using this software, unless one happens to know that there is a
qt5 variant of it. To a basic user, these are indistinguishable. I argue
that therefore qdbus-qt5 should just fill the gap and ship a
transitional dummy package called qdbus, which depends on qdbus-qt5.
That'd make upgrading a lot smoother. Thanks for considering.

Helmut



Bug#968981: qtfeedback-opensource-src FTBFS: Error copying /<>/doc/qtfeedback to /<>/debian/tmp/usr/share/qt5/doc/qtfeedback: Cannot open /<>/doc/qtfeedback for

2020-08-24 Thread Helmut Grohne
Source: qtfeedback-opensource-src
Version: 5.0~git20180329.a14bd0bb-1
Severity: serious
Tags: ftbfs

qtfeedback-opensource-src fails to build from source. On the buildds, it
failed to build on everything but amd64 and all, where it wasn't
attempted. On a local build on amd64 I see the very same failure:

| make[4]: Entering directory '/<>/src/feedback'
| /usr/lib/qt5/bin/qmake -install qinstall /<>/doc/qtfeedback 
/<>/debian/tmp/usr/share/qt5/doc/qtfeedback
| Error copying /<>/doc/qtfeedback to 
/<>/debian/tmp/usr/share/qt5/doc/qtfeedback: Cannot open 
/<>/doc/qtfeedback for input
| make[4]: *** [Makefile:605: install_inst_html_docs] Error 3
| make[4]: Leaving directory '/<>/src/feedback'
| make[3]: *** [Makefile:412: sub-feedback-install_docs_ordered] Error 2
| make[3]: Leaving directory '/<>/src'
| make[2]: *** [Makefile:347: sub-src-install_docs] Error 2
| make[2]: Leaving directory '/<>'
| make[1]: *** [debian/rules:24: override_dh_auto_install] Error 2
| make[1]: Leaving directory '/<>'
| make: *** [debian/rules:17: binary] Error 2
| dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 
2

Helmut



Bug#962756: kcalcore FTCBFS: qttools5-dev missing from Build-Depends

2020-06-13 Thread Helmut Grohne
Source: kcalcore
Version: 5:5.70.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kcalcore fails to cross build from source, because it fails finding
QHelpGenerator. For using it, a dependency on qttools5-dev is required.
Refer to #915122 for details. Please consider applying the attached
patch.

Helmut
diff --minimal -Nru kcalcore-5.70.0/debian/changelog 
kcalcore-5.70.0/debian/changelog
--- kcalcore-5.70.0/debian/changelog2020-05-26 23:56:26.0 +0200
+++ kcalcore-5.70.0/debian/changelog2020-06-13 15:39:49.0 +0200
@@ -1,3 +1,10 @@
+kcalcore (5:5.70.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Build-Depends: qttools5-dev. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 13 Jun 2020 15:39:49 +0200
+
 kcalcore (5:5.70.0-1) unstable; urgency=medium
 
   [ Sandro Knauß ]
diff --minimal -Nru kcalcore-5.70.0/debian/control 
kcalcore-5.70.0/debian/control
--- kcalcore-5.70.0/debian/control  2020-05-26 23:56:26.0 +0200
+++ kcalcore-5.70.0/debian/control  2020-06-13 15:39:49.0 +0200
@@ -11,7 +11,8 @@
libical-dev (>= 2.0~),
pkg-kde-tools (>> 0.15.15),
qhelpgenerator-qt5,
-   qtbase5-dev (>= 5.12.0~)
+   qtbase5-dev (>= 5.12.0~),
+   qttools5-dev,
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://projects.kde.org/projects/kde/pim/kcalcore


Bug#962429: kcontacts FTCBFS: missing Build-Depends qttools5-dev

2020-06-07 Thread Helmut Grohne
Source: kcontacts
Version: 5:5.70.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

kcontacts fails to cross build from source, because it misses a build
dependency on qttools5-dev. Please refer to #915122 for details and
consider applying the attached patch.

Helmut
diff --minimal -Nru kcontacts-5.70.0/debian/changelog 
kcontacts-5.70.0/debian/changelog
--- kcontacts-5.70.0/debian/changelog   2020-05-26 23:56:54.0 +0200
+++ kcontacts-5.70.0/debian/changelog   2020-06-07 22:12:41.0 +0200
@@ -1,3 +1,10 @@
+kcontacts (5:5.70.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Missing Build-Depends: qttools5-dev. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 07 Jun 2020 22:12:41 +0200
+
 kcontacts (5:5.70.0-1) unstable; urgency=medium
 
   [ Sandro Knauß ]
diff --minimal -Nru kcontacts-5.70.0/debian/control 
kcontacts-5.70.0/debian/control
--- kcontacts-5.70.0/debian/control 2020-05-26 23:56:54.0 +0200
+++ kcontacts-5.70.0/debian/control 2020-06-07 22:12:40.0 +0200
@@ -14,6 +14,7 @@
pkg-kde-tools (>> 0.15.15),
qhelpgenerator-qt5,
qtbase5-dev (>= 5.12.0~),
+   qttools5-dev,
xauth,
xvfb
 Standards-Version: 4.5.0


  1   2   3   >