Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit sudoku-sensei for openSUSE:Factory
Hello community,

here is the log from the commit of package sudoku-sensei for openSUSE:Factory
checked in at 2019-04-14 12:23:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sudoku-sensei (Old)
and /work/SRC/openSUSE:Factory/.sudoku-sensei.new.27019 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sudoku-sensei"

Sun Apr 14 12:23:56 2019 rev:2 rq:693937 version:02_00

Changes:
--------
--- /work/SRC/openSUSE:Factory/sudoku-sensei/sudoku-sensei.changes
2015-07-08 06:58:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sudoku-sensei.new.27019/sudoku-sensei.changes
2019-04-14 12:23:57.483860878 +0200
@@ -1,0 +2,6 @@
+Sat Apr 13 11:54:46 UTC 2019 - Christophe Giboudeaux <christophe@xxxxxxx>
+
+- Add 0001-Basic-port-to-Qt5.patch to remove the Qt4 dependencies
+- Run spec-cleaner
+
+-------------------------------------------------------------------

New:
----
0001-Basic-port-to-Qt5.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sudoku-sensei.spec ++++++
--- /var/tmp/diff_new_pack.QxGPY1/_old 2019-04-14 12:23:58.419861750 +0200
+++ /var/tmp/diff_new_pack.QxGPY1/_new 2019-04-14 12:23:58.427861758 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sudoku-sensei
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,31 +12,35 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+

%define oversion 02-00
%define oname SudokuSensei
-
Name: sudoku-sensei
Version: 02_00
Release: 0
Summary: Enjoy playing with Sudoku boards designed by yourself
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Amusements/Games/Logic
URL: http://sudoku-sensei.sourceforge.net/
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-for-linux/Source%20and%20exe%20files%20for%20linux%2C%20ver.%202.00/%{name}-src-%{oversion}.tar.gz
Source1: %{name}.sh
Source2: %{name}.png
Source3: %{name}.desktop
+# PATCH-FIX-OPENSUSE 0001-Basic-port-to-Qt5.patch
+Patch0: 0001-Basic-port-to-Qt5.patch
+BuildRequires: dos2unix
+BuildRequires: pkgconfig
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5PrintSupport)
+BuildRequires: cmake(Qt5Widgets)
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: update-desktop-files
%endif
-BuildRequires: dos2unix
-BuildRequires: pkgconfig
-BuildRequires: pkgconfig(QtCore)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
The engine solves sudokus by applying complex logical rules a few times,
@@ -46,17 +50,18 @@

%prep
%setup -q -n %{oname}Sources
+%patch0 -p1

# Convert to unix line end
find -name "*.txt" -print0 -or -name "*.h" -print0 -or -name "*.cpp" -print0
-or -name "*.html" -print0 | xargs -0 dos2unix

%build
-qmake QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags"
QMAKE_STRIP="/bin/true";
+qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}"
QMAKE_STRIP="/bin/true";
make %{?_smp_mflags}

%install
# install wrapper
-install -Dm 0755 %{S:1} %{buildroot}%{_bindir}/%{name}
+install -Dm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}

# install executable
install -Dm 0755 %{oname} %{buildroot}%{_libexecdir}/%{name}/%{oname}
@@ -73,10 +78,10 @@
done

# install icon
-install -Dm 0644 %{S:2}
%{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -Dm 0644 %{SOURCE2}
%{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png

# install Desktop file
-install -Dm 0644 %{S:3} %{buildroot}%{_datadir}/applications/%{name}.desktop
+install -Dm 0644 %{SOURCE3}
%{buildroot}%{_datadir}/applications/%{name}.desktop

%if 0%{?suse_version}
%suse_update_desktop_file %{name}
@@ -84,8 +89,8 @@
%endif

%files
-%defattr(-,root,root,-)
-%doc doc/* license.txt
+%license license.txt
+%doc doc/*
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png

++++++ 0001-Basic-port-to-Qt5.patch ++++++
From e75514cd1d17ea024f66717585d9947dcfa1698a Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@xxxxxxx>
Date: Sat, 13 Apr 2019 13:45:19 +0200
Subject: [PATCH] Basic port to Qt5.

---
Dshowabout.cpp | 2 +-
Dshowmanual.cpp | 2 +-
Dshowsolution.cpp | 3 ++-
Dshowtutorial.cpp | 2 +-
SudokuSensei.pro | 3 ++-
SudokuView.cpp | 2 +-
SudokuView.h | 2 +-
diagrules.cpp | 18 ++++++++++--------
editor.cpp | 3 ++-
editor.h | 2 +-
graphics.cpp | 6 +++---
graphics.h | 4 ++--
mainwindow.cpp | 2 ++
mask.cpp | 2 +-
newgame.cpp | 10 +++++-----
newtable.cpp | 2 +-
16 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/Dshowabout.cpp b/Dshowabout.cpp
index a719de8..2d0bba4 100644
--- a/Dshowabout.cpp
+++ b/Dshowabout.cpp
@@ -39,7 +39,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/*
*/

/************************************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
#include "Dshowabout.h"
#include <QProcess>

diff --git a/Dshowmanual.cpp b/Dshowmanual.cpp
index 2a7d11c..d7d97d2 100644
--- a/Dshowmanual.cpp
+++ b/Dshowmanual.cpp
@@ -39,7 +39,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/*
*/

/************************************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
#include "Dshowmanual.h"
#include <QProcess>

diff --git a/Dshowsolution.cpp b/Dshowsolution.cpp
index c866852..42f592a 100644
--- a/Dshowsolution.cpp
+++ b/Dshowsolution.cpp
@@ -38,8 +38,9 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei

/************************************************************************************************/


-#include <QtGui>
+#include <QtWidgets>
#include "Dshowsolution.h"
+#include <QLabel>
#include <QProcess>
#include "dmem.h"

diff --git a/Dshowtutorial.cpp b/Dshowtutorial.cpp
index 1c77436..58565cc 100644
--- a/Dshowtutorial.cpp
+++ b/Dshowtutorial.cpp
@@ -39,7 +39,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/*
*/

/************************************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
#include "Dshowtutorial.h"
#include <QProcess>

diff --git a/SudokuSensei.pro b/SudokuSensei.pro
index 1b2d90c..67a38d8 100644
--- a/SudokuSensei.pro
+++ b/SudokuSensei.pro
@@ -1,9 +1,10 @@
######################################################################
# Automatically generated by qmake (2.01a) lun jul 2 16:19:58 2007
######################################################################
+QT += core printsupport widgets

TEMPLATE = app
-TARGET =
+#TARGET =
DEPENDPATH += . language
INCLUDEPATH += .+
RC_FILE = SudokuSensei.rc
diff --git a/SudokuView.cpp b/SudokuView.cpp
index d9cb77c..8c231c0 100644
--- a/SudokuView.cpp
+++ b/SudokuView.cpp
@@ -41,7 +41,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
#include "mask.h"
#include <math.h>

-#include <QtGui>
+#include <QtWidgets>
//#include <QtOpenGL>
#include <QPainter>
#include <QColor>
diff --git a/SudokuView.h b/SudokuView.h
index 0532444..2a2104c 100644
--- a/SudokuView.h
+++ b/SudokuView.h
@@ -59,7 +59,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
#include <QHBoxLayout>
#include <QListWidget>
#include <QMutex>
-#include <QtGui>
+#include <QtWidgets>

#include "ui_Denlargewindow.h"
#include "thread-sensei.h"
diff --git a/diagrules.cpp b/diagrules.cpp
index 2af30c8..3ef44e4 100644
--- a/diagrules.cpp
+++ b/diagrules.cpp
@@ -44,6 +44,8 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
#include "dmem.h"
#include "myassert.h"

+#include <QMessageBox>
+
#define MAX_RULES 100
//#define _DEBUG

@@ -1414,13 +1416,13 @@ void RulesDialog::AddNameOfGroup( s_rule rule, QString
*a, SudokuView * mSudoku,
/********************************************************/
void RulesDialog::retranslateUi(QDialog *Rules)
{
- Rules->setWindowTitle(QApplication::translate("Rules", "Rules", 0,
QApplication::UnicodeUTF8));
- label->setText(QApplication::translate("Rules", "&Simple Rules", 0,
QApplication::UnicodeUTF8));
- label_2->setText(QApplication::translate("Rules", "A&dvanced Rules", 0,
QApplication::UnicodeUTF8));
- label_3->setText(QApplication::translate("Rules", "&Expert Rules", 0,
QApplication::UnicodeUTF8));
- label_4->setText(QApplication::translate("Rules", "&Redundant Rules", 0,
QApplication::UnicodeUTF8));
- But_Apply_Rule->setText(QApplication::translate("Rules", "Apply Rule", 0,
QApplication::UnicodeUTF8));
- But_Apply_All->setText(QApplication::translate("Rules", "Apply All Rules",
0, QApplication::UnicodeUTF8));
- But_Show_Rules->setText(QApplication::translate("Rules","Show Redundant
Rules", 0, QApplication::UnicodeUTF8));
+ Rules->setWindowTitle(QApplication::translate("Rules", "Rules", 0));
+ label->setText(QApplication::translate("Rules", "&Simple Rules", 0));
+ label_2->setText(QApplication::translate("Rules", "A&dvanced Rules", 0));
+ label_3->setText(QApplication::translate("Rules", "&Expert Rules", 0));
+ label_4->setText(QApplication::translate("Rules", "&Redundant Rules", 0));
+ But_Apply_Rule->setText(QApplication::translate("Rules", "Apply Rule", 0));
+ But_Apply_All->setText(QApplication::translate("Rules", "Apply All Rules",
0));
+ But_Show_Rules->setText(QApplication::translate("Rules","Show Redundant
Rules", 0));
Q_UNUSED(Rules);
}
diff --git a/editor.cpp b/editor.cpp
index 3190947..9cc52c6 100644
--- a/editor.cpp
+++ b/editor.cpp
@@ -35,7 +35,8 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/*
*/

/************************************************************************************************/

-#include <QtGui>
+#include <QMessageBox>
+#include <QtWidgets>
#include <QPointF>
#include "editor.h"
#include "SudokuView.h"
diff --git a/editor.h b/editor.h
index a8e6973..83b3234 100644
--- a/editor.h
+++ b/editor.h
@@ -85,7 +85,7 @@ class EditorCell : public QGraphicsRectItem
{

public:
- EditorCell ( QGraphicsItem * parent=0, QGraphicsScene * scene=0 ) :
QGraphicsRectItem::QGraphicsRectItem ( parent , scene ) {}
+ EditorCell ( QGraphicsItem * parent=0 ) :
QGraphicsRectItem::QGraphicsRectItem ( parent ) {}

int x,y;

diff --git a/graphics.cpp b/graphics.cpp
index 414cb92..0d34070 100644
--- a/graphics.cpp
+++ b/graphics.cpp
@@ -43,7 +43,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
//#define _DEBUG
#include "graphics.h"
#include <QSettings>
-#include <QtGui>
+#include <QtWidgets>
#include "sudoku-pub.h"
#include "mask.h"
#include "SudokuView.h"
@@ -58,8 +58,8 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/***************/
/* Constructor */
/***************/
-GraphCell::GraphCell ( QGraphicsItem * parent, QGraphicsScene * scene )
- : QGraphicsRectItem (parent, scene),
+GraphCell::GraphCell ( QGraphicsItem * parent )
+ : QGraphicsRectItem (parent),
pTextPoss (NULL ), // Fast varibables initialization
nTextPoss ( 0 ),
mTextPoss ( 0 ),
diff --git a/graphics.h b/graphics.h
index c47a00f..13c7ea9 100644
--- a/graphics.h
+++ b/graphics.h
@@ -38,7 +38,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
#ifndef GRAPHICS_H
#define GRAPHICS_H

-#include <QtGui>
+#include <QtWidgets>
#include "sudoku-pub.h"

// Include that to compile faster
@@ -95,7 +95,7 @@ class GraphCell : public QGraphicsRectItem

// TODO: More funcionality

- GraphCell ( QGraphicsItem * parent=0, QGraphicsScene * scene = 0);
+ GraphCell ( QGraphicsItem * parent=0 );
// GraphCell ( const QRectF & rect, QGraphicsItem * parent=0,
QGraphicsScene * scene = 0);
// GraphCell ( qreal x, qreal y, qreal width, qreal height, QGraphicsItem
* parent=0, QGraphicsScene * scene = 0);

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 94fa2e6..4e0b750 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -37,6 +37,8 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
#include <QProcess>
#include <QSettings>
#include <QFileDialog>
+#include <QPrinter>
+#include <QPrintDialog>

#include "mainwindow.h"
#include "newgame.h"
diff --git a/mask.cpp b/mask.cpp
index f013e57..d49a7a5 100644
--- a/mask.cpp
+++ b/mask.cpp
@@ -33,7 +33,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/*
*/

/************************************************************************************************/
#include "mask.h"
-#include <QtGui>
+#include <QtWidgets>

// mask() and simbols() moved to the header file

diff --git a/newgame.cpp b/newgame.cpp
index eb7daa1..4fbbb10 100644
--- a/newgame.cpp
+++ b/newgame.cpp
@@ -37,7 +37,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/*
*/

/************************************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
#include "newgame.h"
#include <QProcess>
#include "dmem.h"
@@ -143,17 +143,17 @@ NewGame::NewGame(QWidget *parent)
}
void NewGame::aceptClicked()
{
- if (BoardEmpty->isChecked()==TRUE)
+ if (BoardEmpty->isChecked())
{
setOutput(-3);
}
- else if (BoardWrited ->isChecked()==TRUE)
+ else if (BoardWrited ->isChecked())
{
setOutput(-2);// TODO: GenerateBoard(TextBoard);
}
- else if (BoardGenerate->isChecked()==TRUE)
+ else if (BoardGenerate->isChecked())
{
- if (highdif->isChecked()==TRUE)
+ if (highdif->isChecked())
setOutput(-1);
else
setOutput ( level->value() );
diff --git a/newtable.cpp b/newtable.cpp
index 154ae34..935dd86 100644
--- a/newtable.cpp
+++ b/newtable.cpp
@@ -39,7 +39,7 @@ Latest versions: http://sourceforge.net/projects/sudoku-sensei
/* It calls MyEditor class defined in editor.cpp, editor.h, Deditor.ui
and */
/* SudokuWidget class defined in SudokuWidget.cpp, SudokuWidget.h
*/

/************************************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "newtable.h"
#include "SudokuView.h"
#include "SudokuBoard.h"
--
2.21.0



< Previous Next >
This Thread
  • No further messages