Bug#1033555: unblock: fraqtive/0.4.8.1-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package fraqtive
This is just a short maintainance release from upstream after many
years, mainly just merged already in Debian applied patches, so that
fraqtive still builds in modern environments.
As described in my mlt unblock request I thought it will migrate after
20 days and it looks cleaner for me to have the new upstream release, why
I had done this upload for targeting bookworm
[ Reason ]
New upstream release, which just covers already applied patches.
[ Impact ]
No impact here
[ Tests ]
Tested if it still starts, manual
[ Risks ]
I do not see any risk
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock fraqtive/0.4.8.1-1
diff -Nru fraqtive-0.4.8/configure fraqtive-0.4.8.1/configure
--- fraqtive-0.4.8/configure 2008-03-21 11:49:25.783540000 +0100
+++ fraqtive-0.4.8.1/configure 2023-03-06 09:30:22.000000000 +0100
@@ -81,7 +81,7 @@
if test "$version" != "**Unknown**"; then
major=`echo $version | sed -e "s/\([0-9][0-9]*\).*/\1/"`
minor=`echo $version | sed -e "s/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/"`
- if test $major -eq 4 -a $minor -ge 3; then
+ if test $major -eq 5; then
QMAKE=$i
break
fi
@@ -89,7 +89,7 @@
done
if test -z "$QMAKE"; then
- echo "*** ERROR: Cannot find 'qmake' from Qt 4.3 or newer." >&2
+ echo "*** ERROR: Cannot find 'qmake' from Qt 5." >&2
exit 1
fi
diff -Nru fraqtive-0.4.8/debian/changelog fraqtive-0.4.8.1/debian/changelog
--- fraqtive-0.4.8/debian/changelog 2023-01-12 11:07:55.000000000 +0100
+++ fraqtive-0.4.8.1/debian/changelog 2023-03-13 12:00:59.000000000 +0100
@@ -1,3 +1,11 @@
+fraqtive (0.4.8.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Remove merged patch 03-use-qt5.
+ - Remove merged patch 04-fix-includes.
+
+ -- Patrick Matthäi <pmatthaei@debian.org> Mon, 13 Mar 2023 12:00:59 +0100
+
fraqtive (0.4.8-17) unstable; urgency=medium
* Adjust debian/watch to work again with GitHub.
diff -Nru fraqtive-0.4.8/debian/patches/03-use-qt5.diff fraqtive-0.4.8.1/debian/patches/03-use-qt5.diff
--- fraqtive-0.4.8/debian/patches/03-use-qt5.diff 2023-01-12 11:07:55.000000000 +0100
+++ fraqtive-0.4.8.1/debian/patches/03-use-qt5.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Description: Fix build system to use Qt5 instead of Qt4
-Author: Sune Vuorela <sune@kde.org>
-Forwarded: yes
-
----
-Origin: other
-Last-Update: 2018-08-15
-
---- fraqtive-0.4.8.orig/configure
-+++ fraqtive-0.4.8/configure
-@@ -81,7 +81,7 @@ for i in $paths; do
- if test "$version" != "**Unknown**"; then
- major=`echo $version | sed -e "s/\([0-9][0-9]*\).*/\1/"`
- minor=`echo $version | sed -e "s/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/"`
-- if test $major -eq 4 -a $minor -ge 3; then
-+ if test $major -eq 5 -a $minor -ge 3; then
- QMAKE=$i
- break
- fi
diff -Nru fraqtive-0.4.8/debian/patches/04-fix-includes.diff fraqtive-0.4.8.1/debian/patches/04-fix-includes.diff
--- fraqtive-0.4.8/debian/patches/04-fix-includes.diff 2023-01-12 11:07:55.000000000 +0100
+++ fraqtive-0.4.8.1/debian/patches/04-fix-includes.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-Description: Add missing includes
- Qt5 has had a bit of includes cleanups. Apply those.
-Author: Sune Vuorela <sune@kde.org>
-Forwarded: yes
-
----
-Origin: other
-Forwarded: no
-Last-Update: 2018-08-15
-
---- fraqtive-0.4.8.orig/src/configurationdata.cpp
-+++ fraqtive-0.4.8/src/configurationdata.cpp
-@@ -27,6 +27,7 @@
-
- #include <QDir>
- #include <cstdlib>
-+#include <QDataStream>
-
- ConfigurationData::ConfigurationData()
- {
---- fraqtive-0.4.8.orig/src/fractalgenerator.h
-+++ fraqtive-0.4.8/src/fractalgenerator.h
-@@ -22,6 +22,7 @@
- #include <QEvent>
- #include <QMutex>
- #include <QWaitCondition>
-+#include <QObject>
-
- #include "abstractjobprovider.h"
- #include "datastructures.h"
diff -Nru fraqtive-0.4.8/debian/patches/series fraqtive-0.4.8.1/debian/patches/series
--- fraqtive-0.4.8/debian/patches/series 2023-01-12 11:07:55.000000000 +0100
+++ fraqtive-0.4.8.1/debian/patches/series 2023-03-13 12:00:59.000000000 +0100
@@ -1,5 +1,3 @@
01-desktop-keywords.diff
02-spelling-error.diff
-03-use-qt5.diff
-04-fix-includes.diff
05-fix-ftbfs.diff
diff -Nru fraqtive-0.4.8/.gitignore fraqtive-0.4.8.1/.gitignore
--- fraqtive-0.4.8/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ fraqtive-0.4.8.1/.gitignore 2023-03-06 09:30:22.000000000 +0100
@@ -0,0 +1,12 @@
+debug
+release
+src/fraqtive_pch.h.cpp
+src/fraqtive.vcxproj
+src/fraqtive.vcxproj.filters
+src/fraqtive.vcxproj.user
+tmp
+.qmake.stash
+config.pri
+configure-msvc.bat
+fraqtive.sln
+fraqtive.v12.suo
diff -Nru fraqtive-0.4.8/src/configurationdata.cpp fraqtive-0.4.8.1/src/configurationdata.cpp
--- fraqtive-0.4.8/src/configurationdata.cpp 2015-01-24 15:43:13.643143000 +0100
+++ fraqtive-0.4.8.1/src/configurationdata.cpp 2023-03-06 09:30:22.000000000 +0100
@@ -25,6 +25,7 @@
#include <shlobj.h>
#endif
+#include <QDataStream>
#include <QDir>
#include <cstdlib>
diff -Nru fraqtive-0.4.8/src/datafunctions.cpp fraqtive-0.4.8.1/src/datafunctions.cpp
--- fraqtive-0.4.8/src/datafunctions.cpp 2012-12-03 23:37:51.093563000 +0100
+++ fraqtive-0.4.8.1/src/datafunctions.cpp 2023-03-06 09:30:22.000000000 +0100
@@ -19,6 +19,8 @@
#include "datafunctions.h"
#include "fractaldata.h"
+#include <QPainterPath>
+
namespace DataFunctions
{
diff -Nru fraqtive-0.4.8/src/fractalgenerator.h fraqtive-0.4.8.1/src/fractalgenerator.h
--- fraqtive-0.4.8/src/fractalgenerator.h 2012-12-03 23:37:51.093563000 +0100
+++ fraqtive-0.4.8.1/src/fractalgenerator.h 2023-03-06 09:30:22.000000000 +0100
@@ -21,6 +21,7 @@
#include <QEvent>
#include <QMutex>
+#include <QObject>
#include <QWaitCondition>
#include "abstractjobprovider.h"
diff -Nru fraqtive-0.4.8/src/fraqtive.1 fraqtive-0.4.8.1/src/fraqtive.1
--- fraqtive-0.4.8/src/fraqtive.1 1970-01-01 01:00:00.000000000 +0100
+++ fraqtive-0.4.8.1/src/fraqtive.1 2023-03-06 09:30:22.000000000 +0100
@@ -0,0 +1,19 @@
+.TH "FRAQTIVE" "1"
+.SH NAME
+fraqtive \- draws Mandelbrot and Julia fractals
+.SH DESCRIPTION
+Fraqtive is a program for drawing Mandelbrot and Julia fractals.
+It uses a very fast algorithm and generates high quality, smooth
+images. It is fully interactive, allowing for real\-time mouse
+navigation and dynamic generation of the Julia fractal preview.
+OpenGL\-rendered 3D view of the fractals is also supported.
+.SH OPTIONS
+Since version 0.4.0 fraqtive does not provide anymore any
+command line options.
+You can just start it with \"fraqtive\".
+.SH AUTHOR
+This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
+for fraqtive.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
diff -Nru fraqtive-0.4.8/src/fraqtivemainwindow.cpp fraqtive-0.4.8.1/src/fraqtivemainwindow.cpp
--- fraqtive-0.4.8/src/fraqtivemainwindow.cpp 2015-01-29 20:48:08.703694000 +0100
+++ fraqtive-0.4.8.1/src/fraqtivemainwindow.cpp 2023-03-06 09:30:22.000000000 +0100
@@ -284,7 +284,7 @@
bool FraqtiveMainWindow::isFullScreenMode() const
{
- return m_ui.mainContainer->windowState() & Qt::WindowFullScreen;
+ return m_ui.mainContainer->isFullScreen();
}
void FraqtiveMainWindow::enterFullScreenMode()
@@ -298,8 +298,8 @@
void FraqtiveMainWindow::leaveFullScreenMode()
{
- m_ui.mainContainer->setParent( m_ui.centralWidget );
m_ui.vboxLayout->addWidget( m_ui.mainContainer );
+ m_ui.mainContainer->showNormal();
QList<QAction*> actions = XmlUi::Client::actions();
for ( int i = 0; i < actions.count(); i++ )
m_ui.mainContainer->removeAction( actions.at( i ) );
diff -Nru fraqtive-0.4.8/src/main.cpp fraqtive-0.4.8.1/src/main.cpp
--- fraqtive-0.4.8/src/main.cpp 2012-12-03 23:37:51.093563000 +0100
+++ fraqtive-0.4.8.1/src/main.cpp 2023-03-06 09:30:22.000000000 +0100
@@ -18,6 +18,8 @@
#include "fraqtiveapplication.h"
+#include <QVector>
+
#ifdef HAVE_STATIC_JPEG
Q_IMPORT_PLUGIN( qjpeg )
#endif
@@ -27,6 +29,8 @@
int main( int argc, char* argv[] )
{
+ qRegisterMetaType<QVector<int> >();
+
FraqtiveApplication application( argc, argv );
return application.exec();
}
diff -Nru fraqtive-0.4.8/src/presetmodel.cpp fraqtive-0.4.8.1/src/presetmodel.cpp
--- fraqtive-0.4.8/src/presetmodel.cpp 2015-01-20 17:40:29.372199000 +0100
+++ fraqtive-0.4.8.1/src/presetmodel.cpp 2023-03-06 09:30:22.000000000 +0100
@@ -81,7 +81,7 @@
bool reversed = preset.colorMapping().isReversed();
bool mirrored = preset.colorMapping().isMirrored();
- if ( !mirrored && !reversed || mirrored && reversed ) {
+ if ( ( !mirrored && !reversed ) || ( mirrored && reversed ) ) {
for ( int i = 0; i < stops.count() / 2; i++ ) {
QGradientStop stop1 = stops.at( i );
QGradientStop stop2 = stops.at( stops.count() - i - 1 );
diff -Nru fraqtive-0.4.8/src/shadewidget.cpp fraqtive-0.4.8.1/src/shadewidget.cpp
--- fraqtive-0.4.8/src/shadewidget.cpp 2012-12-03 23:37:51.093563000 +0100
+++ fraqtive-0.4.8.1/src/shadewidget.cpp 2023-03-06 09:30:22.000000000 +0100
@@ -19,6 +19,7 @@
#include "shadewidget.h"
#include <QPainter>
+#include <QPainterPath>
#include <QPaintEvent>
#include <QToolTip>
diff -Nru fraqtive-0.4.8/src/src.pro fraqtive-0.4.8.1/src/src.pro
--- fraqtive-0.4.8/src/src.pro 2012-12-03 22:31:33.428245000 +0100
+++ fraqtive-0.4.8.1/src/src.pro 2023-03-06 09:30:22.000000000 +0100
@@ -183,7 +183,7 @@
target.path = $${DESTINATION}$$PREFIX/bin
INSTALLS += target
-unix {
+unix:!mac {
desktop.files = fraqtive.desktop
desktop.path = $${DESTINATION}$$PREFIX/share/applications
INSTALLS += desktop
@@ -197,4 +197,8 @@
eval( icon-$${size}.uninstall = -$(DEL_FILE) $$file )
INSTALLS += icon-$${size}
}
+
+ man.files = fraqtive.1
+ man.path = $${DESTINATION}$$PREFIX/share/man/man1
+ INSTALLS += man
}
Reply to: