[neon/neon-packaging/plasma-bigscreen/Neon/unstable] debian/patches: rebase patch

Carlos De Maine null at kde.org
Fri Jul 25 15:27:50 BST 2025 

Git commit 532e7f05dc6752d6b23975d79beada62a95b7736 by Carlos De Maine.
Committed on 25/07/2025 at 14:27.
Pushed by carlosdem into branch 'Neon/unstable'.

rebase patch

M  +34   -49   debian/patches/work_devinlin_webviewer.diff

https://invent.kde.org/neon/neon-packaging/plasma-bigscreen/-/commit/532e7f05dc6752d6b23975d79beada62a95b7736

diff --git a/debian/patches/work_devinlin_webviewer.diff b/debian/patches/work_devinlin_webviewer.diff
index 28cd72c..ed22d48 100644
--- a/debian/patches/work_devinlin_webviewer.diff
+++ b/debian/patches/work_devinlin_webviewer.diff
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 74c5e801a93b6113d321cbf14e894f9ca02de6a3..5ad27c1f3914313c085e5bdb08e3f1a95f8b85ec 100644
+index 899dcd6..7575aaf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -10,6 +10,7 @@ set(PROJECT_VERSION "6.4.80")
@@ -10,7 +10,7 @@ index 74c5e801a93b6113d321cbf14e894f9ca02de6a3..5ad27c1f3914313c085e5bdb08e3f1a9
  
  set(CMAKE_CXX_STANDARD 20)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-@@ -61,7 +62,14 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+@@ -62,7 +63,14 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
      DBus
      Network
      Multimedia
@@ -25,7 +25,7 @@ index 74c5e801a93b6113d321cbf14e894f9ca02de6a3..5ad27c1f3914313c085e5bdb08e3f1a9
  
  ecm_find_qmlmodule(org.kde.plasma.core 2.0)
  
-@@ -76,6 +84,7 @@ add_subdirectory(components)
+@@ -77,6 +85,7 @@ add_subdirectory(components)
  add_subdirectory(sounds)
  add_subdirectory(envmanager)
  add_subdirectory(uvcviewer)
@@ -34,10 +34,10 @@ index 74c5e801a93b6113d321cbf14e894f9ca02de6a3..5ad27c1f3914313c085e5bdb08e3f1a9
  plasma_install_package(shell org.kde.plasma.bigscreen shells)
  plasma_install_package(lookandfeel org.kde.plasma.bigscreen look-and-feel lookandfeel)
 diff --git a/README.md b/README.md
-index 7d7db87d911d6d3aa5f739e9d30e100f539891c9..0bdb853b267ba2deed02f5c808d2e13c0a663f00 100644
+index e723c28..65b7ce5 100644
 --- a/README.md
 +++ b/README.md
-@@ -63,6 +63,10 @@ Note that `kdesrc-build` doesn't automatically build `plasma-nano` and `plasma-s
+@@ -65,6 +65,10 @@ See [this page](https://community.kde.org/Get_Involved/development) in order to
  - DBus
  - Network
  
@@ -49,7 +49,7 @@ index 7d7db87d911d6d3aa5f739e9d30e100f539891c9..0bdb853b267ba2deed02f5c808d2e13c
  
  To start the Bigscreen homescreen in a window, use the following script:
 diff --git a/components/bigscreenplugin/qml/AbstractDelegate.qml b/components/bigscreenplugin/qml/AbstractDelegate.qml
-index ee3108a5752da45b643e9e0d034c674d8a5a95a2..8b3c0fc79ea82ffdce25de3043d7e07da159c167 100644
+index ee3108a..8b3c0fc 100644
 --- a/components/bigscreenplugin/qml/AbstractDelegate.qml
 +++ b/components/bigscreenplugin/qml/AbstractDelegate.qml
 @@ -39,8 +39,10 @@ QQC2.ItemDelegate {
@@ -65,37 +65,22 @@ index ee3108a5752da45b643e9e0d034c674d8a5a95a2..8b3c0fc79ea82ffdce25de3043d7e07d
      }
  
      leftPadding: Kirigami.Units.gridUnit
-diff --git a/components/bigscreenplugin/qml/KCMAbstractDelegate.qml b/components/bigscreenplugin/qml/KCMAbstractDelegate.qml
-index d3286eaa6c000d32360f3cb6b157bc3df45611f8..efd81148753971ce2d16a568d26e9839a164d083 100644
---- a/components/bigscreenplugin/qml/KCMAbstractDelegate.qml
-+++ b/components/bigscreenplugin/qml/KCMAbstractDelegate.qml
-@@ -42,11 +42,7 @@ AbstractDelegate {
-     }
- 
-     Keys.onLeftPressed: (event)=> {
--        if(listView && listView.currentIndex == 0){
--            settingMenuItemFocus()
--        } else {
--            event.accepted = false
--        }
-+        event.accepted = false
-     }
- 
-     contentItem: Item {
 diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
-index b44038555c491aaeaa6b12e09a62cc960244a1c8..3adf474945f63870a0982ba3fae2df04195083c6 100644
+index 32d4360..a639b61 100644
 --- a/kcms/CMakeLists.txt
 +++ b/kcms/CMakeLists.txt
-@@ -6,4 +6,5 @@
+@@ -6,4 +6,5 @@ add_subdirectory(audio-device-chooser)
  add_subdirectory(wifi)
  add_subdirectory(kdeconnect)
  add_subdirectory(bigscreen-settings)
+-add_subdirectory(display)
+\ No newline at end of file
++add_subdirectory(display)
 +add_subdirectory(webapps)
- add_subdirectory(display)
 \ No newline at end of file
 diff --git a/kcms/webapps/CMakeLists.txt b/kcms/webapps/CMakeLists.txt
 new file mode 100644
-index 0000000000000000000000000000000000000000..75d761eff40a0b8d1568b18d337160222ad6236b
+index 0000000..75d761e
 --- /dev/null
 +++ b/kcms/webapps/CMakeLists.txt
 @@ -0,0 +1,27 @@
@@ -128,7 +113,7 @@ index 0000000000000000000000000000000000000000..75d761eff40a0b8d1568b18d33716022
 +)
 diff --git a/kcms/webapps/kcm_mediacenter_webapps.json b/kcms/webapps/kcm_mediacenter_webapps.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..9b354c2726f15abedada53d5284a4479fc877037
+index 0000000..9b354c2
 --- /dev/null
 +++ b/kcms/webapps/kcm_mediacenter_webapps.json
 @@ -0,0 +1,12 @@
@@ -146,7 +131,7 @@ index 0000000000000000000000000000000000000000..9b354c2726f15abedada53d5284a4479
 +}
 diff --git a/kcms/webapps/ui/WebAppInfoSidebar.qml b/kcms/webapps/ui/WebAppInfoSidebar.qml
 new file mode 100644
-index 0000000000000000000000000000000000000000..27f414c00a0ac6284fa691b375654fa8c2910416
+index 0000000..27f414c
 --- /dev/null
 +++ b/kcms/webapps/ui/WebAppInfoSidebar.qml
 @@ -0,0 +1,100 @@
@@ -253,7 +238,7 @@ index 0000000000000000000000000000000000000000..27f414c00a0ac6284fa691b375654fa8
 \ No newline at end of file
 diff --git a/kcms/webapps/ui/main.qml b/kcms/webapps/ui/main.qml
 new file mode 100644
-index 0000000000000000000000000000000000000000..5a2d2898b3acce2018da1f8767ab4b3669dfc0bb
+index 0000000..5a2d289
 --- /dev/null
 +++ b/kcms/webapps/ui/main.qml
 @@ -0,0 +1,138 @@
@@ -397,7 +382,7 @@ index 0000000000000000000000000000000000000000..5a2d2898b3acce2018da1f8767ab4b36
 +}
 diff --git a/kcms/webapps/webappcreator.cpp b/kcms/webapps/webappcreator.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..e95ad104af6373a69dcf29c8494ff1ff8c4c2989
+index 0000000..e95ad10
 --- /dev/null
 +++ b/kcms/webapps/webappcreator.cpp
 @@ -0,0 +1,102 @@
@@ -505,7 +490,7 @@ index 0000000000000000000000000000000000000000..e95ad104af6373a69dcf29c8494ff1ff
 +}
 diff --git a/kcms/webapps/webappcreator.h b/kcms/webapps/webappcreator.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..3057d28e0d0d8eb20546b213af9c4c753d3b5006
+index 0000000..3057d28
 --- /dev/null
 +++ b/kcms/webapps/webappcreator.h
 @@ -0,0 +1,40 @@
@@ -551,7 +536,7 @@ index 0000000000000000000000000000000000000000..3057d28e0d0d8eb20546b213af9c4c75
 +};
 diff --git a/kcms/webapps/webappmanager.cpp b/kcms/webapps/webappmanager.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..6377cd5f3c958b007eca7c206e930c14200dfbfd
+index 0000000..6377cd5
 --- /dev/null
 +++ b/kcms/webapps/webappmanager.cpp
 @@ -0,0 +1,166 @@
@@ -723,7 +708,7 @@ index 0000000000000000000000000000000000000000..6377cd5f3c958b007eca7c206e930c14
 +#include "moc_webappmanager.cpp"
 diff --git a/kcms/webapps/webappmanager.h b/kcms/webapps/webappmanager.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..764ebe5563d513dd5171cccc70b33222cddb0b0a
+index 0000000..764ebe5
 --- /dev/null
 +++ b/kcms/webapps/webappmanager.h
 @@ -0,0 +1,48 @@
@@ -777,7 +762,7 @@ index 0000000000000000000000000000000000000000..764ebe5563d513dd5171cccc70b33222
 +};
 diff --git a/kcms/webapps/webappmanagermodel.cpp b/kcms/webapps/webappmanagermodel.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..3799ebaad5991d969add2fc6610397e237f35d81
+index 0000000..3799eba
 --- /dev/null
 +++ b/kcms/webapps/webappmanagermodel.cpp
 @@ -0,0 +1,58 @@
@@ -841,7 +826,7 @@ index 0000000000000000000000000000000000000000..3799ebaad5991d969add2fc6610397e2
 +#include "moc_webappmanagermodel.cpp"
 diff --git a/kcms/webapps/webappmanagermodel.h b/kcms/webapps/webappmanagermodel.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..5f350d461076d3854d826b8782495d09cb43eb2d
+index 0000000..5f350d4
 --- /dev/null
 +++ b/kcms/webapps/webappmanagermodel.h
 @@ -0,0 +1,37 @@
@@ -884,7 +869,7 @@ index 0000000000000000000000000000000000000000..5f350d461076d3854d826b8782495d09
 +};
 diff --git a/kcms/webapps/webappskcm.cpp b/kcms/webapps/webappskcm.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..be7c55b66f73ce7d946c0d3785278a9686de751e
+index 0000000..be7c55b
 --- /dev/null
 +++ b/kcms/webapps/webappskcm.cpp
 @@ -0,0 +1,32 @@
@@ -922,7 +907,7 @@ index 0000000000000000000000000000000000000000..be7c55b66f73ce7d946c0d3785278a96
 +#include "webappskcm.moc"
 diff --git a/kcms/webapps/webappskcm.h b/kcms/webapps/webappskcm.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..45768eb7899cf1b69e5d1c2979d89cecc882db7e
+index 0000000..45768eb
 --- /dev/null
 +++ b/kcms/webapps/webappskcm.h
 @@ -0,0 +1,23 @@
@@ -951,7 +936,7 @@ index 0000000000000000000000000000000000000000..45768eb7899cf1b69e5d1c2979d89cec
 +};
 diff --git a/webapp-viewer/CMakeLists.txt b/webapp-viewer/CMakeLists.txt
 new file mode 100644
-index 0000000000000000000000000000000000000000..24c75d95678084ebac7d71967380a7b0aaf531f4
+index 0000000..24c75d9
 --- /dev/null
 +++ b/webapp-viewer/CMakeLists.txt
 @@ -0,0 +1,43 @@
@@ -1000,7 +985,7 @@ index 0000000000000000000000000000000000000000..24c75d95678084ebac7d71967380a7b0
 +
 diff --git a/webapp-viewer/browsermanager.cpp b/webapp-viewer/browsermanager.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..b866ef2c4ecc18d20de943d01d3f72e04b25d518
+index 0000000..b866ef2
 --- /dev/null
 +++ b/webapp-viewer/browsermanager.cpp
 @@ -0,0 +1,77 @@
@@ -1083,7 +1068,7 @@ index 0000000000000000000000000000000000000000..b866ef2c4ecc18d20de943d01d3f72e0
 +#include "moc_browsermanager.cpp"
 diff --git a/webapp-viewer/browsermanager.h b/webapp-viewer/browsermanager.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..696275cb70497d82b9b67f2241047849d4243e4e
+index 0000000..696275c
 --- /dev/null
 +++ b/webapp-viewer/browsermanager.h
 @@ -0,0 +1,47 @@
@@ -1136,7 +1121,7 @@ index 0000000000000000000000000000000000000000..696275cb70497d82b9b67f2241047849
 +};
 diff --git a/webapp-viewer/main.cpp b/webapp-viewer/main.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..ce1fda6d1350138390702d83830b7081844a9f44
+index 0000000..ce1fda6
 --- /dev/null
 +++ b/webapp-viewer/main.cpp
 @@ -0,0 +1,81 @@
@@ -1223,7 +1208,7 @@ index 0000000000000000000000000000000000000000..ce1fda6d1350138390702d83830b7081
 +}
 diff --git a/webapp-viewer/qml/WebApp.qml b/webapp-viewer/qml/WebApp.qml
 new file mode 100644
-index 0000000000000000000000000000000000000000..7b4a42ee0f079b290e386324e39444d66991ab27
+index 0000000..7b4a42e
 --- /dev/null
 +++ b/webapp-viewer/qml/WebApp.qml
 @@ -0,0 +1,79 @@
@@ -1308,7 +1293,7 @@ index 0000000000000000000000000000000000000000..7b4a42ee0f079b290e386324e39444d6
 +
 diff --git a/webapp-viewer/qml/WebAppView.qml b/webapp-viewer/qml/WebAppView.qml
 new file mode 100644
-index 0000000000000000000000000000000000000000..6f851d41741cd83a947d59dbacb57d5f9dfb571b
+index 0000000..6f851d4
 --- /dev/null
 +++ b/webapp-viewer/qml/WebAppView.qml
 @@ -0,0 +1,31 @@
@@ -1345,7 +1330,7 @@ index 0000000000000000000000000000000000000000..6f851d41741cd83a947d59dbacb57d5f
 +}
 diff --git a/webapp-viewer/qml/WebView.qml b/webapp-viewer/qml/WebView.qml
 new file mode 100644
-index 0000000000000000000000000000000000000000..2c5ab8d9da5a3019e6643403d1721fdcb1451990
+index 0000000..2c5ab8d
 --- /dev/null
 +++ b/webapp-viewer/qml/WebView.qml
 @@ -0,0 +1,461 @@
@@ -1812,7 +1797,7 @@ index 0000000000000000000000000000000000000000..2c5ab8d9da5a3019e6643403d1721fdc
 +}
 diff --git a/webapp-viewer/useragent.cpp b/webapp-viewer/useragent.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..3908499b4f4204d450d4bd2264e1252aae5614f4
+index 0000000..3908499
 --- /dev/null
 +++ b/webapp-viewer/useragent.cpp
 @@ -0,0 +1,59 @@
@@ -1877,7 +1862,7 @@ index 0000000000000000000000000000000000000000..3908499b4f4204d450d4bd2264e1252a
 +#include "moc_useragent.cpp"
 diff --git a/webapp-viewer/useragent.h b/webapp-viewer/useragent.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..6fe88ea07bc2182def8b44d09b3a9d3993347cf8
+index 0000000..6fe88ea
 --- /dev/null
 +++ b/webapp-viewer/useragent.h
 @@ -0,0 +1,47 @@
@@ -1930,7 +1915,7 @@ index 0000000000000000000000000000000000000000..6fe88ea07bc2182def8b44d09b3a9d39
 +};
 diff --git a/webapp-viewer/webprofile.cpp b/webapp-viewer/webprofile.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..d44a658ea0701b25c56bfb78b3054ec1fac69fe2
+index 0000000..d44a658
 --- /dev/null
 +++ b/webapp-viewer/webprofile.cpp
 @@ -0,0 +1,66 @@
@@ -2002,7 +1987,7 @@ index 0000000000000000000000000000000000000000..d44a658ea0701b25c56bfb78b3054ec1
 +#include "moc_webprofile.cpp"
 diff --git a/webapp-viewer/webprofile.h b/webapp-viewer/webprofile.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..066d277f82e2d1e299e915e93d5ce02a95a85c28
+index 0000000..066d277
 --- /dev/null
 +++ b/webapp-viewer/webprofile.h
 @@ -0,0 +1,44 @@

More information about the Neon-commits mailing list