[neon/extras/choqok/Neon/release] debian: update the patches

Pino Toscano null at kde.org
Wed Sep 4 11:41:47 BST 2024


Git commit 3af9d98aab6b962796b68c6db545d1d9f5817b95 by Pino Toscano.
Committed on 03/01/2024 at 22:07.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- fix_missing_qmap_includes.patch: drop, fixed upstream

M  +2    -0    debian/changelog
D  +0    -91   debian/patches/fix_missing_qmap_includes.patch
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/choqok/-/commit/3af9d98aab6b962796b68c6db545d1d9f5817b95

diff --git a/debian/changelog b/debian/changelog
index 63185b50..e5156c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ choqok (1.7.0-2) UNRELEASED; urgency=medium
     - add libkf5configwidgets-dev
     - drop unused: libkf5config-dev, libqoauth-dev
     - drop appstream, only needed by the AppStream test
+  * Update the patches:
+    - fix_missing_qmap_includes.patch: drop, fixed upstream
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 22 Nov 2020 21:55:15 -0300
 
diff --git a/debian/patches/fix_missing_qmap_includes.patch b/debian/patches/fix_missing_qmap_includes.patch
deleted file mode 100644
index 389fa3e2..00000000
--- a/debian/patches/fix_missing_qmap_includes.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Description: add missing includes for QMap
- It seems that these where previously added by some other header.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941155
-Forwarded: no
-
----
- plugins/betternotify/notify.h               |    1 +
- plugins/untiny/untiny.h                     |    1 +
- plugins/uploaders/flickr/flickr.h           |    2 ++
- plugins/uploaders/imageshack/imageshack.h   |    2 ++
- plugins/uploaders/mobypicture/mobypicture.h |    2 ++
- plugins/uploaders/posterous/posterous.h     |    2 ++
- plugins/uploaders/twitgoo/twitgoo.h         |    2 ++
- 7 files changed, 12 insertions(+)
-
---- a/plugins/betternotify/notify.h
-+++ b/plugins/betternotify/notify.h
-@@ -28,6 +28,7 @@
- #include <QPoint>
- #include <QPointer>
- #include <QTimer>
-+#include <QMap>
- 
- #include "plugin.h"
- 
---- a/plugins/untiny/untiny.h
-+++ b/plugins/untiny/untiny.h
-@@ -31,6 +31,7 @@
- #include <QQueue>
- #include <QUrl>
- #include <QPointer>
-+#include <QMap>
- 
- namespace KIO {
- class Job;
---- a/plugins/uploaders/imageshack/imageshack.h
-+++ b/plugins/uploaders/imageshack/imageshack.h
-@@ -24,6 +24,8 @@
- #ifndef IMAGESHACK_H
- #define IMAGESHACK_H
- 
-+#include <QMap>
-+
- #include "uploader.h"
- 
- #include <QMap>
---- a/plugins/uploaders/mobypicture/mobypicture.h
-+++ b/plugins/uploaders/mobypicture/mobypicture.h
-@@ -24,6 +24,8 @@
- #ifndef MOBYPICTURE_H
- #define MOBYPICTURE_H
- 
-+#include <QMap>
-+
- #include "uploader.h"
- 
- #include <QMap>
---- a/plugins/uploaders/posterous/posterous.h
-+++ b/plugins/uploaders/posterous/posterous.h
-@@ -24,6 +24,8 @@
- #ifndef POSTEROUS_H
- #define POSTEROUS_H
- 
-+#include <QMap>
-+
- #include "uploader.h"
- 
- #include <QMap>
---- a/plugins/uploaders/twitgoo/twitgoo.h
-+++ b/plugins/uploaders/twitgoo/twitgoo.h
-@@ -24,6 +24,8 @@
- #ifndef TWITGOO_H
- #define TWITGOO_H
- 
-+#include <QMap>
-+
- #include "uploader.h"
- 
- #include <QMap>
---- a/plugins/uploaders/flickr/flickr.h
-+++ b/plugins/uploaders/flickr/flickr.h
-@@ -24,6 +24,8 @@
- #ifndef FLICKR_H
- #define FLICKR_H
- 
-+#include <QMap>
-+
- #include "uploader.h"
- 
- #include <QMap>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3845fcdf..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_missing_qmap_includes.patch



More information about the Neon-commits mailing list