[neon/neon-packaging/selenium-webdriver-at-spi/Neon/unstable_jammy] debian/patches: refine

[Carlos De Maine]

Git commit 810e26209cbe0e9a09ab4e9bed1b570b32c323a2 by Carlos De Maine.
Committed on 10/06/2024 at 13:27.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

refine

M  +6    -23   debian/patches/virtenv.diff

https://invent.kde.org/neon/neon-packaging/selenium-webdriver-at-spi/-/commit/810e26209cbe0e9a09ab4e9bed1b570b32c323a2

diff --git a/debian/patches/virtenv.diff b/debian/patches/virtenv.diff
index 5a138c6..975192b 100644
--- a/debian/patches/virtenv.diff
+++ b/debian/patches/virtenv.diff
@@ -19,29 +19,12 @@ index 94f640aca700b10360a6fec237e6bad5a88383a1..1d6fa9cb252c70abec7995175ddec67c
      COMPONENT Devel
  )
 diff --git a/run.rb b/run.rb
-index 2e6137802fc992d5ef0cd91fd5074b9f73ebce0f..69d1adde7be093e06ebf87b6c5164b82520bb64f 100755
+index 2e6137802fc992d5ef0cd91fd5074b9f73ebce0f..4aec7e655d4be460a2eb620ed95430598b2d5b61 100755
 --- a/run.rb
 +++ b/run.rb
-@@ -205,26 +205,48 @@ PORT = '4723'
- $stdout.sync = true # force immediate flushing without internal caching
- logger = Logger.new($stdout)
+@@ -207,24 +207,31 @@ logger = Logger.new($stdout)
  
-+# Tweak the CIs logging rules. They are way too verbose for our purposes
-+if ENV['KDECI_BUILD'] == 'TRUE'
-+  ENV['QT_LOGGING_RULES'] = <<-RULES.gsub(/\s/, '')
-+    default=true;*.debug=true;kf.globalaccel.kglobalacceld=false;kf.wayland.client=false;
-+    qt.scenegraph.*=false;qt.qml.diskcache=false;
-+    qt.qml.*=false;qt.qpa.wayland.*=false;qt.quick.dirty=false;qt.accessibility.cache=false;qt.v4.asm=false;
-+    qt.opengl.diskcache=false;qt.qpa.fonts=false;kf.kio.workers.http=false;
-+    qt.quick.*=false;qt.text.*=false;qt.qpa.input.methods=false;
-+    qt.qpa.backingstore=false;qt.gui.*=false;qt.core.plugin.loader=false;
-+  RULES
-+  ENV['QT_LOGGING_RULES'] = ENV['QT_LOGGING_RULES_OVERRIDE'] if ENV.include?('QT_LOGGING_RULES_OVERRIDE')
-+end
-+
  logger.info 'Installing dependencies'
-+logger.info "Virtenv Name is #{ENV['VIRTUAL_ENV_PROMPT']}"
-+
  datadir = File.absolute_path("#{__dir__}/../share/selenium-webdriver-at-spi/")
 -requirements_installed_marker = "#{Dir.tmpdir}/selenium-requirements-installed"
 -if !File.exist?(requirements_installed_marker) && File.exist?("#{datadir}/requirements.txt")
@@ -57,9 +40,9 @@ index 2e6137802fc992d5ef0cd91fd5074b9f73ebce0f..69d1adde7be093e06ebf87b6c5164b82
 -      # create an empty file so tests in the same CI container can skip the process
 -    end
 -  end
-+if ENV.include?('VIRTUAL_ENV_PROMPT') #== 'selenium-webdriver-at-spi'
++if ENV.include?('VIRTUAL_ENV') 
++  logger.info "path of virtenv is #{ENV['VIRTUAL_ENV']}"
 +	logger.info 'We are in a virtenv, no pip upgrades and set appropriate PATH'
-+	#	system('pip3', 'install', '--user', '-r', 'requirements.txt', chdir: datadir)
 +	ENV['PATH'] = "#{ENV['VIRTUAL_ENV']}:#{ENV.fetch('PATH')}"
 +	logger.info "path is now #{ENV['PATH']}"
 +else
@@ -104,5 +87,5 @@ index 0000000000000000000000000000000000000000..1136c8455ff6ae930586325e471db571
 +        packages=find_packages(),
 +        python_requires=">=3.8",
 +        scripts=['app_roles.py', 'selenium-webdriver-at-spi.py'],
-+		 install_requires=["flask", "lxml", "numpy", "Appium_Python_Client", "selenium"]
-+	)
++		 install_requires=["pycairo", "pygobject", "flask", "lxml", "Appium_Python_Client", "selenium"]
++	)
\ No newline at end of file