[neon/neon-packaging/falkon/Neon/release] debian/patches: Revert "backport upstream fix as per recommendation on distro's list"

Carlos De Maine null at kde.org
Mon May 19 09:39:38 BST 2025


Git commit 44e5d9d1ea349ffe7ea3862b5d5c7c8a3babf3e4 by Carlos De Maine.
Committed on 19/05/2025 at 08:39.
Pushed by carlosdem into branch 'Neon/release'.

Revert "backport upstream fix as per recommendation on distro's list"

This reverts commit eb7521eba67b8475c9f3f98d58adaf602c0574eb

D  +0    -37   debian/patches/bookmarks_fix.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/neon-packaging/falkon/-/commit/44e5d9d1ea349ffe7ea3862b5d5c7c8a3babf3e4

diff --git a/debian/patches/bookmarks_fix.diff b/debian/patches/bookmarks_fix.diff
deleted file mode 100644
index 49d3f0c..0000000
--- a/debian/patches/bookmarks_fix.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/lib/bookmarks/bookmarkstools.cpp b/src/lib/bookmarks/bookmarkstools.cpp
-index 0e8e25930a9fbd5b58d95ffb4b4da2b006067b10..66c27762935b0614fd3c8474cc5a0aac35f930b0 100644
---- a/src/lib/bookmarks/bookmarkstools.cpp
-+++ b/src/lib/bookmarks/bookmarkstools.cpp
-@@ -391,7 +391,9 @@ void BookmarksTools::addFolderToMenu(QObject* receiver, Menu* menu, BookmarkItem
-     m->setTitle(title);
-     m->setIcon(folder->icon());
- 
--    QObject::connect(m, &QMenu::aboutToHide, mApp->getWindow()->statusBar(), &StatusBar::clearMessage);
-+    QObject::connect(m, &QMenu::aboutToHide, [=]() {
-+        mApp->getWindow()->statusBar()->clearMessage();
-+    });
- 
-     addFolderContentsToMenu(receiver, m, folder);
- 
-@@ -399,7 +401,9 @@ void BookmarksTools::addFolderToMenu(QObject* receiver, Menu* menu, BookmarkItem
-     act->setData(QVariant::fromValue<void*>(static_cast<void*>(folder)));
-     act->setIconVisibleInMenu(true);
- 
--    QObject::connect(act, &QAction::hovered, mApp->getWindow()->statusBar(), &StatusBar::clearMessage);
-+    QObject::connect(act, &QAction::hovered, [=]() {
-+        mApp->getWindow()->statusBar()->clearMessage();
-+    });
- }
- 
- void BookmarksTools::addUrlToMenu(QObject* receiver, Menu* menu, BookmarkItem* bookmark)
-@@ -433,7 +437,9 @@ void BookmarksTools::addSeparatorToMenu(Menu* menu, BookmarkItem* separator)
-     Q_ASSERT(separator->isSeparator());
- 
-     auto* act = menu->addSeparator();
--    QObject::connect(act, &QAction::hovered, mApp->getWindow()->statusBar(), &StatusBar::clearMessage);
-+    QObject::connect(act, &QAction::hovered, [=]() {
-+        mApp->getWindow()->statusBar()->clearMessage();
-+    });
- }
- 
- void BookmarksTools::addFolderContentsToMenu(QObject *receiver, Menu *menu, BookmarkItem *folder)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 08d3405..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-bookmarks_fix.diff
\ No newline at end of file


More information about the Neon-commits mailing list