[neon/mobile/plasma-samegame/Neon/unstable] debian/patches: add temp patches for kf6

Carlos De Maine null at kde.org
Mon Jun 19 02:33:57 BST 2023


Git commit fdb0c2b0b56e978ebd0571a508ba869485b6d482 by Carlos De Maine.
Committed on 19/06/2023 at 01:33.
Pushed by carlosdem into branch 'Neon/unstable'.

add temp patches for kf6

A  +11   -0    debian/patches/0001_fix_kf6_includes
A  +15   -0    debian/patches/0002_fix_kf6_includes
A  +2    -0    debian/patches/series

https://invent.kde.org/neon/mobile/plasma-samegame/-/commit/fdb0c2b0b56e978ebd0571a508ba869485b6d482

diff --git a/debian/patches/0001_fix_kf6_includes b/debian/patches/0001_fix_kf6_includes
new file mode 100644
index 0000000..c8c2bfa
--- /dev/null
+++ b/debian/patches/0001_fix_kf6_includes
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ 
+ ################# Find dependencies #################
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql Widgets)
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Declarative)
++find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Declarative)
+ 
+ ################# build and install #################
+ add_subdirectory(src)
diff --git a/debian/patches/0002_fix_kf6_includes b/debian/patches/0002_fix_kf6_includes
new file mode 100644
index 0000000..85f4243
--- /dev/null
+++ b/debian/patches/0002_fix_kf6_includes
@@ -0,0 +1,15 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 28536083688170ad31df25457c43d00bf0d82458..58f02f61b5df2f208f99f5b02dc6814766884872 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -12,7 +12,7 @@ target_link_libraries(samegame
+     Qt::QuickControls2
+     Qt::Svg
+     Qt::Sql
+-    KF5::I18n
+-    KF5::CoreAddons)
++    KF${QT_MAJOR_VERSION}::I18n
++    KF${QT_MAJOR_VERSION}::CoreAddons)
+     
+-install(TARGETS samegame ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS samegame ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7754518
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001_fix_kf6_includes
+0002_fix_kf6_includes


More information about the Neon-commits mailing list