Bug#978164: kguiaddons: FTBFS on non-linux

2020-12-26 Thread Samuel Thibault
Pino Toscano, le sam. 26 déc. 2020 22:04:14 +0100, a ecrit:
> Yes, I know. I already fixed it few days ago:
> https://salsa.debian.org/qt-kde-team/kde/kguiaddons/-/commit/1130cd0d8f0c95c9536a74034826fbb0ed5f0d8c

Cool, thanks!

Samuel



Processed: Re: Bug#978164: kguiaddons: FTBFS on non-linux

2020-12-26 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> tag 978164 + pending
Bug #978164 [src:kguiaddons] kguiaddons: FTBFS on non-linux
Added tag(s) pending.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
978164: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=978164
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Bug#978164: kguiaddons: FTBFS on non-linux

2020-12-26 Thread Pino Toscano
tag 978164 + pending
thanks

In data sabato 26 dicembre 2020 21:54:19 CET, Samuel Thibault ha scritto:
> Source: kguiaddons
> Version: 5.77.0-3
> Severity: important
> Tags: patch
> User: debian-h...@lists.debian.org
> Usertags: hurd
> 
> Hello,
> 
> kguiaddons currently doesn't build on non-Linux, where Wayland is not
> available. The attached patch fixes this.

Yes, I know. I already fixed it few days ago:
https://salsa.debian.org/qt-kde-team/kde/kguiaddons/-/commit/1130cd0d8f0c95c9536a74034826fbb0ed5f0d8c

-- 
Pino Toscano

signature.asc
Description: This is a digitally signed message part.


Bug#978164: kguiaddons: FTBFS on non-linux

2020-12-26 Thread Samuel Thibault
Source: kguiaddons
Version: 5.77.0-3
Severity: important
Tags: patch
User: debian-h...@lists.debian.org
Usertags: hurd

Hello,

kguiaddons currently doesn't build on non-Linux, where Wayland is not
available. The attached patch fixes this.

Samuel

-- System Information:
Debian Release: bullseye/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 
'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 
'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 
'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), 
(1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.10.0 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-- 
Samuel
 KK1 a 1 conseil de comment s'attaquer a du code java ou ya plus de 50 
classes ? par kel bout ?
 le troisième
 -+- #ens-mim en stage -+-
--- debian/control.original 2020-12-26 20:33:59.0 +
+++ debian/control  2020-12-26 20:34:21.0 +
@@ -10,9 +10,9 @@
extra-cmake-modules (>= 5.77.0~),
graphviz,
libqt5sql5-sqlite:native,
-   libqt5waylandclient5-dev (>= 5.13.0~),
+   libqt5waylandclient5-dev (>= 5.13.0~) [linux-any],
libqt5x11extras5-dev (>= 5.13.0~),
-   libwayland-dev (>= 1.9~),
+   libwayland-dev (>= 1.9~) [linux-any],
libx11-dev,
libxcb1-dev,
pkg-config,
@@ -21,7 +21,7 @@
qtbase5-private-dev,
qttools5-dev,
qttools5-dev-tools (>= 5.4),
-   qtwayland5-dev-tools (>= 5.13.0~),
+   qtwayland5-dev-tools (>= 5.13.0~) [linux-any],
 Standards-Version: 4.5.1
 Homepage: https://invent.kde.org/frameworks/kguiaddons
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kguiaddons
--- debian/rules.original   2020-12-26 20:42:47.0 +
+++ debian/rules2020-12-26 20:43:55.0 +
@@ -2,11 +2,15 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+ifneq ($(DEB_BUILD_ARCH_OS),linux)
+WAYLAND=-DWITH_WAYLAND=OFF
+endif
+
 %:
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without 
build_stamp
 
 override_dh_auto_configure:
-   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF
+   dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF $(WAYLAND)
 
 override_dh_auto_test:
# Disable auto tests at build time
--- debian/libkf5guiaddons5.symbols.original2020-12-26 20:49:28.0 
+
+++ debian/libkf5guiaddons5.symbols 2020-12-26 20:49:33.0 +
@@ -184,5 +184,5 @@
  _ZTV19KeySequenceRecorder@Base 5.77.0
  _ZTV24KModifierKeyInfoProvider@Base 5.61.0
  _ZTV30KLocalImageCacheImplementation@Base 4.96.0
- zwp_keyboard_shortcuts_inhibit_manager_v1_interface@Base 5.77.0
- zwp_keyboard_shortcuts_inhibitor_v1_interface@Base 5.77.0
+ (arch=linux-any)zwp_keyboard_shortcuts_inhibit_manager_v1_interface@Base 
5.77.0
+ (arch=linux-any)zwp_keyboard_shortcuts_inhibitor_v1_interface@Base 5.77.0