[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian/patches: new attempt at 0001_qt.diff

[Carlos De Maine]

Git commit 8d2c0a83c9d56913896930b0d233a0573472c0f5 by Carlos De Maine.
Committed on 01/10/2023 at 02:52.
Pushed by carlosdem into branch 'Neon/unstable'.

new attempt at 0001_qt.diff

M  +42   -9    debian/patches/0001_qt.diff

https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/8d2c0a83c9d56913896930b0d233a0573472c0f5

diff --git a/debian/patches/0001_qt.diff b/debian/patches/0001_qt.diff
index 3a948ae..b4b9f2b 100644
--- a/debian/patches/0001_qt.diff
+++ b/debian/patches/0001_qt.diff
@@ -1,18 +1,51 @@
 diff --git a/qt/component-box.cpp b/qt/component-box.cpp
-index 06ad5dfd..75824ca7 100644
+index 06ad5dfd..866c22e1 100644
 --- a/qt/component-box.cpp
 +++ b/qt/component-box.cpp
-@@ -19,7 +19,7 @@
+@@ -30,7 +30,7 @@ class AppStream::ComponentBoxData : public QSharedData
+ public:
+     ComponentBoxData(ComponentBox::Flags flags)
+     {
+-        m_cbox = as_component_box_new(static_cast<AsComponentBoxFlags>(flags.toInt()));
++        m_cbox = as_component_box_new(static_cast<AsComponentBoxFlags>(flags==int()));
+     }
  
- #include "appstream.h"
- #include "component-box.h"
--
-+#include <optional>
- #include <QSharedData>
- #include <QDebug>
+     ComponentBoxData(AsComponentBox *cbox)
+diff --git a/qt/pool.cpp b/qt/pool.cpp
+index ec56a109..6f0da4b0 100644
+--- a/qt/pool.cpp
++++ b/qt/pool.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QStringList>
+ #include <QUrl>
++#include <QVariant>
+ #include <QLoggingCategory>
+ #include "chelpers.h"
+ 
+@@ -212,17 +213,17 @@ Pool::Flags Pool::flags() const
+ 
+ void Pool::setFlags(Pool::Flags flags)
+ {
+-    as_pool_set_flags(d->pool, (AsPoolFlags) flags.toInt());
++    as_pool_set_flags(d->pool, (AsPoolFlags) (flags==int()));
+ }
+ 
+ void Pool::addFlags(Pool::Flags flags)
+ {
+-    as_pool_add_flags(d->pool, (AsPoolFlags) flags.toInt());
++    as_pool_add_flags(d->pool, (AsPoolFlags) (flags==int()));
+ }
+ 
+ void Pool::removeFlags(Pool::Flags flags)
+ {
+-    as_pool_remove_flags(d->pool, (AsPoolFlags) flags.toInt());
++    as_pool_remove_flags(d->pool, (AsPoolFlags) (flags==int()));
+ }
  
+ void Pool::resetExtraDataLocations()
 diff --git a/qt/relation.h b/qt/relation.h
-index f36ec833..825d873f 100644
+index 6b95777c..87f98087 100644
 --- a/qt/relation.h
 +++ b/qt/relation.h
 @@ -22,7 +22,7 @@