Bug#960678: Bug#887534: plume-creator FTBFS with libquazip5-headers 0.7.3-3
On Sat, May 23, 2020 at 07:51:52PM +0300, Adrian Bunk wrote:
> Control: tags 960678 moreinfo
> Control: tags 887534 - patch
>
> On Fri, Apr 24, 2020 at 08:31:31PM +0100, Sudip Mukherjee wrote:
> > This error is not reproducible any more
> >...
>
> It is still there, both for me locally and in reproducible:
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/plume-creator.html
Thats odd. It was not there when I made the last package.
Anyways, I have now uploaded new package to mentors. And attached the new diff.
--
Regards
Sudip
diff -Nru plume-creator-0.66+dfsg1/debian/changelog plume-creator-0.66+dfsg1/debian/changelog
--- plume-creator-0.66+dfsg1/debian/changelog 2016-01-13 20:53:03.000000000 +0000
+++ plume-creator-0.66+dfsg1/debian/changelog 2020-05-23 18:58:23.000000000 +0100
@@ -1,3 +1,13 @@
+plume-creator (0.66+dfsg1-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS. (Closes: #887534)
+ - Include header file.
+ - Adjust remove-external.patch to quazip5.
+ * Add debug symbols. (Closes: #889273)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com> Sat, 23 May 2020 18:58:23 +0100
+
plume-creator (0.66+dfsg1-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru plume-creator-0.66+dfsg1/debian/patches/fix_ftbfs.patch plume-creator-0.66+dfsg1/debian/patches/fix_ftbfs.patch
--- plume-creator-0.66+dfsg1/debian/patches/fix_ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
+++ plume-creator-0.66+dfsg1/debian/patches/fix_ftbfs.patch 2020-05-23 18:58:23.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Fix FTBFS
+ Include the file as done by upstream.
+
+ Origin: https://github.com/jacquetc/plume-creator-legacy/blob/develop/src/newProjectWizard/selectpage.cpp#L3
+
+---
+
+--- plume-creator-0.66+dfsg1.orig/src/newProjectWizard/selectpage.cpp
++++ plume-creator-0.66+dfsg1/src/newProjectWizard/selectpage.cpp
+@@ -1,5 +1,6 @@
+ #include "selectpage.h"
+ #include "ui_selectpage.h"
++#include <QRegExpValidator>
+
+ SelectPage::SelectPage(QWidget *parent) :
+ QWizardPage(parent),
diff -Nru plume-creator-0.66+dfsg1/debian/patches/remove-external.patch plume-creator-0.66+dfsg1/debian/patches/remove-external.patch
--- plume-creator-0.66+dfsg1/debian/patches/remove-external.patch 2016-01-13 20:53:03.000000000 +0000
+++ plume-creator-0.66+dfsg1/debian/patches/remove-external.patch 2020-05-23 18:58:23.000000000 +0100
@@ -54,7 +54,7 @@
#include <QString>
#include <QDomDocument>
-#include "../../externals/quazip/JlCompress.h"
-+#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
#include "../fileupdater.h"
class Utils
@@ -67,7 +67,7 @@
#include "changestests.h"
#include "fileupdater.h"
-#include "JlCompress.h"
-+#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
#include "common/utils.h"
#include "maintextdocument.h"
#include "wordcountenginethread.h"
@@ -78,7 +78,7 @@
@@ -1,5 +1,5 @@
#include "fileupdater.h"
-#include "JlCompress.h"
-+#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
FileUpdater::FileUpdater(QWidget *parent) :
QWidget(parent), attendVersion("0.6"), treeVersion("0.5"), infoVersion("0.3")
@@ -89,7 +89,7 @@
@@ -1,5 +1,5 @@
#include "zipper.h"
-#include "JlCompress.h"
-+#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
Zipper::Zipper(QObject *parent) :
currentJob("extract"), oneTime(true)
@@ -115,7 +115,7 @@
#include "ui_importuserdictdialog.h"
#include "common/utils.h"
-#include "JlCompress.h"
-+#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
ImportUserDictDialog::ImportUserDictDialog(QWidget *parent) :
QDialog(parent),
@@ -128,7 +128,7 @@
#include "themes.h"
#include "common/utils.h"
-#include "JlCompress.h"
-+#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
#include "zipper/zipchecker.h"
Themes::Themes(QObject *parent) :
diff -Nru plume-creator-0.66+dfsg1/debian/patches/series plume-creator-0.66+dfsg1/debian/patches/series
--- plume-creator-0.66+dfsg1/debian/patches/series 2016-01-13 20:53:03.000000000 +0000
+++ plume-creator-0.66+dfsg1/debian/patches/series 2020-05-23 18:58:23.000000000 +0100
@@ -3,5 +3,5 @@
remove-SlimUpdater.patch
translations-es.patch
built-in-Qt5.patch
-
desktop.patch
+fix_ftbfs.patch
diff -Nru plume-creator-0.66+dfsg1/debian/rules plume-creator-0.66+dfsg1/debian/rules
--- plume-creator-0.66+dfsg1/debian/rules 2016-01-13 20:53:03.000000000 +0000
+++ plume-creator-0.66+dfsg1/debian/rules 2020-05-23 18:58:23.000000000 +0100
@@ -16,7 +16,7 @@
CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
LFLAGS="$(LDFLAGS) $(LDFLAGS2)" \
- qmake -makefile plume-creator.pro
+ qmake -makefile "CONFIG+=debug" plume-creator.pro
touch $@
build-stamp: config
Reply to: