[neon/neon-packaging/selenium-webdriver-at-spi/Neon/unstable] debian: use our own stripped down kwin

[Carlos De Maine]

Git commit 9cc2bcd39f2dea3b7f76ea032c7a551b45bb66cc by Carlos De Maine.
Committed on 29/09/2024 at 03:24.
Pushed by carlosdem into branch 'Neon/unstable'.

use our own stripped down kwin

M  +1    -1    debian/control
M  +19   -3    debian/patches/virtenv.diff
M  +1    -1    debian/rules
M  +0    -1    debian/selenium-webdriver-at-spi.links

https://invent.kde.org/neon/neon-packaging/selenium-webdriver-at-spi/-/commit/9cc2bcd39f2dea3b7f76ea032c7a551b45bb66cc

diff --git a/debian/control b/debian/control
index 4c7a956..ad77760 100644
--- a/debian/control
+++ b/debian/control
@@ -34,11 +34,11 @@ Architecture: any
 Depends: accessibility-inspector,
          at-spi2-core,
          gobject-introspection,
-         libgirepository-1.0-1 ,
          kf6-kcoreaddons,
          kf6-kwindowsystem,
          libcairo2,
          libkpipewire6,
+#         kwin-selenium-tester,
          kwayland6,
          plasma-wayland-protocols,
          python3-pyatspi,
diff --git a/debian/patches/virtenv.diff b/debian/patches/virtenv.diff
index 43fe88d..8a0edbf 100644
--- a/debian/patches/virtenv.diff
+++ b/debian/patches/virtenv.diff
@@ -19,10 +19,26 @@ index 94f640aca700b10360a6fec237e6bad5a88383a1..1d6fa9cb252c70abec7995175ddec67c
      COMPONENT Devel
  )
 diff --git a/run.rb b/run.rb
-index 2e6137802fc992d5ef0cd91fd5074b9f73ebce0f..4aec7e655d4be460a2eb620ed95430598b2d5b61 100755
+index ba1d29455fd4728fc6feceeff44c8a9766aa982b..b79c014d56dddd5e17ba24b2e02f2c43476fb21e 100755
 --- a/run.rb
 +++ b/run.rb
-@@ -207,24 +207,31 @@ logger = Logger.new($stdout)
+@@ -111,8 +111,14 @@ def kwin_reexec!
+     # A bit awkward because of how argument parsing works on the kwin side: we must rely on shell word merging for
+     # the __FILE__ ARGV bit, separate ARGVs to kwin_wayland would be distinct subprocesses to start but we want
+     # one processes with a bunch of arguments.
+-    exec('kwin_wayland', '--no-lockscreen', *extra_args,
++
++    if ENV.include?('VIRTUAL_ENV')
++      exec('selenium-webdriver-at-spi-kwin', *extra_args,
++         '--exit-with-session', "#{__FILE__} #{ARGV.shelljoin}")
++    else
++      exec('kwin_wayland', '--no-lockscreen', *extra_args,
+          '--exit-with-session', "#{__FILE__} #{ARGV.shelljoin}")
++    end
+   end
+   _pid, status = Process.waitpid2(kwin_pid)
+   status.success? ? exit : abort
+@@ -207,24 +213,31 @@ logger = Logger.new($stdout)
  
  logger.info 'Installing dependencies'
  datadir = File.absolute_path("#{__dir__}/../share/selenium-webdriver-at-spi/")
@@ -87,5 +103,5 @@ index 0000000000000000000000000000000000000000..1136c8455ff6ae930586325e471db571
 +        packages=find_packages(),
 +        python_requires=">=3.8",
 +        scripts=['app_roles.py', 'selenium-webdriver-at-spi.py'],
-+		 install_requires=["Appium_Python_Client", "flask", "lxml", "numpy", "pycairo", "pygobject", "selenium"]
++		 install_requires=["pycairo", "pygobject", "flask", "lxml", "Appium_Python_Client", "selenium"]
 +	)
diff --git a/debian/rules b/debian/rules
index e299f56..4ed2015 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ DH_VENV_DIR=debian/$(PACKAGE)$(DH_VIRTUALENV_INSTALL_ROOT)/$(PACKAGE)
 	dh $@ --buildsystem=pybuild --with python-virtualenv --with kf6 --buildsystem kf6
 
 override_dh_virtualenv:
-	dh_virtualenv --python=python3 --no-package pycairo
+	dh_virtualenv --python=python3 --no-package pycairo --system-site-packages
 	$(DH_VENV_DIR)/bin/python $(DH_VENV_DIR)/bin/pip install -U --upgrade-strategy eager -r requirements.txt
 	. $(DH_VENV_DIR)/bin/activate \
 	&& ls -ls && dh_auto_configure -- -DQT_MAJOR_VERSION=6 -DBUILD_WITH_QT6=ON \
diff --git a/debian/selenium-webdriver-at-spi.links b/debian/selenium-webdriver-at-spi.links
index 7a7490b..fc2359a 100644
--- a/debian/selenium-webdriver-at-spi.links
+++ b/debian/selenium-webdriver-at-spi.links
@@ -1,3 +1,2 @@
 opt/selenium-webdriver-at-spi/bin/app_roles.py /usr/share/selenium-webdriver-at-spi/app_roles.py
 opt/selenium-webdriver-at-spi/bin/selenium-webdriver-at-spi.py /usr/share/selenium-webdriver-at-spi/selenium-webdriver-at-spi.py
-usr/lib/python3/dist-packages/pyatspi /opt/selenium-webdriver-at-spi/lib/python3.10/site-packages/pyatspi
\ No newline at end of file