summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Baumann2024-01-28 12:12:55 +0100
committerAndreas Baumann2024-01-28 12:12:55 +0100
commit7d60c4193b5c0ee9237061f77a6e5f2d35ec09a1 (patch)
treec40e5ce2ecaf66182417fa3bee51da864f1c636e
parent1f12b30802d415946882fd6dab2525e96d08948c (diff)
downloadaur-dbmodel.tar.gz
updated to use qt5
-rw-r--r--.SRCINFO18
-rw-r--r--0001-quick-and-dirty-adaption-to-Qt5.patch367
-rw-r--r--0002-removed-duplicate-edit-delete.png.patch24
-rw-r--r--PKGBUILD22
-rw-r--r--dbmodel-0.3-qt-4.6.patch15
5 files changed, 416 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4c3adda03e4..f11583cd9e19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
-# Generated by mksrcinfo v8
-# Fri May 20 22:04:59 UTC 2016
pkgbase = dbmodel
pkgdesc = A qt tool for drawing entity-relationship diagrams.
pkgver = 0.3
- pkgrel = 6
+ pkgrel = 7
url = http://oxygene.sk/lukas/dbmodel/
- arch = i686
arch = x86_64
+ arch = pentium4
+ arch = i686
license = GPL
- depends = qt4>=4.0
+ depends = qt5-base
+ depends = qt5-svg
+ depends = qt5-tools
source = http://launchpad.net/dbmodel/trunk/0.3/+download/dbmodel-0.3.tar.gz
- source = dbmodel-0.3-qt-4.6.patch
+ source = 0001-quick-and-dirty-adaption-to-Qt5.patch
+ source = 0002-removed-duplicate-edit-delete.png.patch
md5sums = 1b8e34a92d61d3819f4d7850e2bb5311
- md5sums = d6efa801e99d8531a08769829def0be8
+ md5sums = 254050ab48b6b751cbfe246ac5bca0df
+ md5sums = e6b32edef244e1366dfaa3c21063947f
pkgname = dbmodel
-
diff --git a/0001-quick-and-dirty-adaption-to-Qt5.patch b/0001-quick-and-dirty-adaption-to-Qt5.patch
new file mode 100644
index 000000000000..aad3eacb88bc
--- /dev/null
+++ b/0001-quick-and-dirty-adaption-to-Qt5.patch
@@ -0,0 +1,367 @@
+From 0a924b262deaf16306e16a895cea259d7a4e46bf Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail@andreasbaumann.cc>
+Date: Sun, 14 Nov 2021 21:05:42 +0100
+Subject: [PATCH 1/2] quick and dirty adaption to Qt5
+
+---
+ src/diagram/diagram.pri | 2 ++
+ src/diagramdocument.cpp | 5 +++--
+ src/diagramitem.cpp | 4 ++--
+ src/export/export.pri | 2 ++
+ src/items/base/base.pri | 2 ++
+ src/items/database/columnlistmodel.cpp | 3 ++-
+ src/items/database/database.pri | 2 ++
+ .../databaserelationshipproperties.cpp | 5 +++--
+ src/items/database/databasetableproperties.cpp | 2 +-
+ src/line.cpp | 2 +-
+ src/main.cpp | 1 +
+ src/mainwindow.cpp | 1 +
+ src/src.pri | 2 ++
+ src/src.pro | 2 +-
+ src/utils/colorpicker/colorpicker.pri | 2 ++
+ src/utils/colorpicker/qtcolorpicker.cpp | 18 +++++++++---------
+ src/utils/colorpicker/qtcolorpicker.h | 6 +++---
+ src/utils/iconloader/iconloader.pri | 2 ++
+ src/utils/iconloader/qticonloader.cpp | 12 ++++++------
+ src/utils/utils.pri | 2 ++
+ 20 files changed, 49 insertions(+), 28 deletions(-)
+
+diff --git a/src/diagram/diagram.pri b/src/diagram/diagram.pri
+index b98b4dd..8d4fa94 100644
+--- a/src/diagram/diagram.pri
++++ b/src/diagram/diagram.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ SOURCES += \
+ linelayouter.cpp
+diff --git a/src/diagramdocument.cpp b/src/diagramdocument.cpp
+index a1aad5d..f741c06 100644
+--- a/src/diagramdocument.cpp
++++ b/src/diagramdocument.cpp
+@@ -333,8 +333,9 @@ DiagramDocument::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+ {
+ if (m_line) {
+ removeItem(m_line);
+- DatabaseTable *source = qgraphicsitem_cast<DatabaseTable *>(itemAt(m_line->line().p1()));
+- DatabaseTable *target = qgraphicsitem_cast<DatabaseTable *>(itemAt(m_line->line().p2()));
++ QTransform transform;
++ DatabaseTable *source = qgraphicsitem_cast<DatabaseTable *>(itemAt(m_line->line().p1(),transform));
++ DatabaseTable *target = qgraphicsitem_cast<DatabaseTable *>(itemAt(m_line->line().p2(),transform));
+ if (source && target && source != target) {
+ Line *line = new DatabaseRelationship();
+ line->createId();
+diff --git a/src/diagramitem.cpp b/src/diagramitem.cpp
+index cd591ec..23cd83b 100644
+--- a/src/diagramitem.cpp
++++ b/src/diagramitem.cpp
+@@ -40,7 +40,7 @@ DiagramItem::document() const
+ void
+ DiagramItem::loadFromXml(QDomElement element, DiagramDocument *)
+ {
+- setId(element.attribute("id", QUuid()));
++ setId(element.attribute("id", QUuid().toString()));
+ setPos(readPointElement(element, "position"));
+ }
+
+@@ -48,7 +48,7 @@ void
+ DiagramItem::saveToXml(QDomDocument doc, QDomElement element)
+ {
+ element.setAttribute("type", typeName());
+- element.setAttribute("id", id());
++ element.setAttribute("id", id().toString());
+ appendPointElement(doc, element, "position", pos());
+ }
+
+diff --git a/src/export/export.pri b/src/export/export.pri
+index ae7d15f..ea63030 100644
+--- a/src/export/export.pri
++++ b/src/export/export.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ SOURCES += \
+ exporter.cpp \
+diff --git a/src/items/base/base.pri b/src/items/base/base.pri
+index 88086e5..faaf1e8 100644
+--- a/src/items/base/base.pri
++++ b/src/items/base/base.pri
+@@ -1 +1,3 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+diff --git a/src/items/database/columnlistmodel.cpp b/src/items/database/columnlistmodel.cpp
+index 84ba804..8ae00b5 100644
+--- a/src/items/database/columnlistmodel.cpp
++++ b/src/items/database/columnlistmodel.cpp
+@@ -44,7 +44,8 @@ ColumnListModel::setColumnList(ColumnList *columnList)
+ connect(m_columnList, SIGNAL(columnRemoved(int)), this, SLOT(_columnRemoved()));
+ connect(m_columnList, SIGNAL(columnChanged(int)), this, SLOT(_columnChanged(int)));
+ }
+- reset();
++ beginResetModel();
++ endResetModel();
+ }
+
+ int
+diff --git a/src/items/database/database.pri b/src/items/database/database.pri
+index c65f9e9..f3f9813 100644
+--- a/src/items/database/database.pri
++++ b/src/items/database/database.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ SOURCES += \
+ databasecommands.cpp \
+diff --git a/src/items/database/databaserelationshipproperties.cpp b/src/items/database/databaserelationshipproperties.cpp
+index f34d045..49f42b7 100644
+--- a/src/items/database/databaserelationshipproperties.cpp
++++ b/src/items/database/databaserelationshipproperties.cpp
+@@ -21,6 +21,7 @@
+ #include <QGridLayout>
+ #include <QLabel>
+ #include <QLineEdit>
++#include <QButtonGroup>
+ #include "commands.h"
+ #include "diagramdocument.h"
+ #include "column.h"
+@@ -217,7 +218,7 @@ DatabaseRelationshipProperties::setChildColumn(int index)
+ DatabaseRelationship *relationship = currentRelationship();
+ Column *column = index > 0 ? relationship->childTable()->columnList()->column(index - 1) : NULL;
+ relationship->document()->undoStack()->push(
+- new SetObjectPropertyCommand(relationship, "childColumn", qVariantFromValue(column)));
++ new SetObjectPropertyCommand(relationship, "childColumn", QVariant::fromValue(column)));
+ }
+
+ void
+@@ -228,5 +229,5 @@ DatabaseRelationshipProperties::setParentColumn(int index)
+ DatabaseRelationship *relationship = currentRelationship();
+ Column *column = index > 0 ? relationship->parentTable()->columnList()->column(index - 1) : NULL;
+ relationship->document()->undoStack()->push(
+- new SetObjectPropertyCommand(relationship, "parentColumn", qVariantFromValue(column)));
++ new SetObjectPropertyCommand(relationship, "parentColumn", QVariant::fromValue(column)));
+ }
+diff --git a/src/items/database/databasetableproperties.cpp b/src/items/database/databasetableproperties.cpp
+index 779b4bc..14c1fe9 100644
+--- a/src/items/database/databasetableproperties.cpp
++++ b/src/items/database/databasetableproperties.cpp
+@@ -151,7 +151,7 @@ DatabaseTableProperties::updateProperty(const QString &name, const QVariant &val
+ d->nameEdit->setText(value.toString());
+ }
+ else if (name == "color") {
+- d->colorPicker->setCurrentColor(qVariantValue<QColor>(value));
++ d->colorPicker->setCurrentColor(value.value<QColor>());
+ }
+ }
+
+diff --git a/src/line.cpp b/src/line.cpp
+index 527fab3..bb58e1e 100644
+--- a/src/line.cpp
++++ b/src/line.cpp
+@@ -94,7 +94,7 @@ Line::saveToXml(QDomDocument doc, QDomElement element)
+ if (connector->hub()) {
+ QDomElement hubElement = doc.createElement("hub");
+ connectorElement.appendChild(hubElement);
+- hubElement.setAttribute("owner", connector->hub()->owner()->id());
++ hubElement.setAttribute("owner", connector->hub()->owner()->id().toString());
+ }
+ }
+ }
+diff --git a/src/main.cpp b/src/main.cpp
+index a76a90c..3b761eb 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -19,6 +19,7 @@
+ #include <QTranslator>
+ #include <QApplication>
+ #include "mainwindow.h"
++#include "items/database/column.h"
+
+ class Column;
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index 0ff84f8..2e23dfa 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -34,6 +34,7 @@
+ #include <QDockWidget>
+ #include <QUndoView>
+ #include <QStackedWidget>
++#include <QMimeData>
+ #include "utils/iconloader/qticonloader.h"
+ #include "diagramitem.h"
+ #include "diagramobject.h"
+diff --git a/src/src.pri b/src/src.pri
+index 3bfa7fd..640d47d 100644
+--- a/src/src.pri
++++ b/src/src.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ RESOURCES = ../dbmodel.qrc
+
+diff --git a/src/src.pro b/src/src.pro
+index 7d3f7da..31d1bb1 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -3,7 +3,7 @@ VERSION = 0.3
+
+ DESTDIR = ../
+
+-QT += xml svg
++QT += xml svg printsupport widgets
+ #CONFIG += debug
+
+ DEFINES += VERSION=\\\"$$VERSION\\\"
+diff --git a/src/utils/colorpicker/colorpicker.pri b/src/utils/colorpicker/colorpicker.pri
+index ffed503..83ff8bb 100644
+--- a/src/utils/colorpicker/colorpicker.pri
++++ b/src/utils/colorpicker/colorpicker.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ SOURCES += \
+ qtcolorpicker.cpp
+diff --git a/src/utils/colorpicker/qtcolorpicker.cpp b/src/utils/colorpicker/qtcolorpicker.cpp
+index 2a4fff1..92cc6c1 100644
+--- a/src/utils/colorpicker/qtcolorpicker.cpp
++++ b/src/utils/colorpicker/qtcolorpicker.cpp
+@@ -44,20 +44,20 @@
+ **
+ ****************************************************************************/
+
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
+ #include <QtGui/QPainter>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QColorDialog>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QColorDialog>
+ #include <QtCore/QMap>
+-#include <QtGui/QLayout>
+-#include <QtGui/QStyle>
+-#include <QtGui/QLabel>
+-#include <QtGui/QToolTip>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QStyle>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QToolTip>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QFocusEvent>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QGridLayout>
++#include <QtWidgets/QGridLayout>
+ #include <QtGui/QHideEvent>
+ #include <QtGui/QKeyEvent>
+ #include <QtGui/QShowEvent>
+diff --git a/src/utils/colorpicker/qtcolorpicker.h b/src/utils/colorpicker/qtcolorpicker.h
+index 8fcfadb..c86a657 100644
+--- a/src/utils/colorpicker/qtcolorpicker.h
++++ b/src/utils/colorpicker/qtcolorpicker.h
+@@ -46,15 +46,15 @@
+
+ #ifndef QTCOLORPICKER_H
+ #define QTCOLORPICKER_H
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QPushButton>
+ #include <QtCore/QString>
+ #include <QtGui/QColor>
+
+-#include <QtGui/QLabel>
++#include <QtWidgets/QLabel>
+ #include <QtCore/QEvent>
+ #include <QtGui/QFocusEvent>
+
+-#if defined(Q_WS_WIN)
++#if defined(Q_OS_WIN)
+ # if !defined(QT_QTCOLORPICKER_EXPORT) && !defined(QT_QTCOLORPICKER_IMPORT)
+ # define QT_QTCOLORPICKER_EXPORT
+ # elif defined(QT_QTCOLORPICKER_IMPORT)
+diff --git a/src/utils/iconloader/iconloader.pri b/src/utils/iconloader/iconloader.pri
+index 33093ee..53e0ee5 100644
+--- a/src/utils/iconloader/iconloader.pri
++++ b/src/utils/iconloader/iconloader.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ SOURCES += \
+ qticonloader.cpp
+diff --git a/src/utils/iconloader/qticonloader.cpp b/src/utils/iconloader/qticonloader.cpp
+index 78e62b8..62c80ab 100644
+--- a/src/utils/iconloader/qticonloader.cpp
++++ b/src/utils/iconloader/qticonloader.cpp
+@@ -38,7 +38,7 @@
+ #include <QtCore/QSettings>
+ #include <QtCore/QTextStream>
+
+-#ifdef Q_WS_X11
++#ifdef Q_OS_X11
+
+ class QIconTheme
+ {
+@@ -91,7 +91,7 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoaderInstance)
+ QIcon QtIconLoader::icon(const QString &name, const QIcon &fallback)
+ {
+ QIcon icon;
+-#ifdef Q_WS_X11
++#ifdef Q_OS_X11
+ QString pngExtension(QLatin1String(".png"));
+ QList<int> iconSizes;
+ iconSizes << 16 << 24 << 32 << 48 << 64;
+@@ -103,11 +103,11 @@ QIcon QtIconLoader::icon(const QString &name, const QIcon &fallback)
+ icon = fallback;
+ Q_UNUSED(name);
+ Q_UNUSED(fallback);
+-#endif // Q_WS_X11
++#endif // Q_OS_X11
+ return icon;
+ }
+
+-#ifdef Q_WS_X11
++#ifdef Q_OS_X11
+
+ QtIconLoaderImplementation::QtIconLoaderImplementation()
+ {
+@@ -160,7 +160,7 @@ static QString kdeHome()
+ void QtIconLoaderImplementation::lookupIconTheme() const
+ {
+
+-#ifdef Q_WS_X11
++#ifdef Q_OS_X11
+ QString dataDirs = QLatin1String(getenv("XDG_DATA_DIRS"));
+ if (dataDirs.isEmpty())
+ dataDirs = QLatin1String("/usr/local/share/:/usr/share/");
+@@ -347,4 +347,4 @@ QPixmap QtIconLoaderImplementation::findIcon(int size, const QString &name) cons
+ QPixmapCache::insert(pixmapName, pixmap);
+ return pixmap;
+ }
+-#endif //Q_WS_X11
++#endif //Q_OS_X11
+diff --git a/src/utils/utils.pri b/src/utils/utils.pri
+index aa68f2e..52e0615 100644
+--- a/src/utils/utils.pri
++++ b/src/utils/utils.pri
+@@ -1,4 +1,6 @@
+ DEPENDPATH += $$PWD
++VPATH += $$PWD
++INCLUDE += $$PWD
+
+ include(colorpicker/colorpicker.pri)
+ include(iconloader/iconloader.pri)
+--
+2.43.0
+
diff --git a/0002-removed-duplicate-edit-delete.png.patch b/0002-removed-duplicate-edit-delete.png.patch
new file mode 100644
index 000000000000..f429ed6f7dc7
--- /dev/null
+++ b/0002-removed-duplicate-edit-delete.png.patch
@@ -0,0 +1,24 @@
+From 337f9dfed9bb7589453d5d3bc5a36cc2869a863b Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail@andreasbaumann.cc>
+Date: Fri, 28 Jan 2022 08:27:01 +0100
+Subject: [PATCH 2/2] removed duplicate edit-delete.png
+
+---
+ dbmodel.qrc | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/dbmodel.qrc b/dbmodel.qrc
+index 57f203a..017d78b 100644
+--- a/dbmodel.qrc
++++ b/dbmodel.qrc
+@@ -16,7 +16,6 @@
+ <file>icons/16x16/edit-cut.png</file>
+ <file>icons/16x16/edit-copy.png</file>
+ <file>icons/16x16/edit-paste.png</file>
+- <file>icons/16x16/edit-delete.png</file>
+ <file>icons/16x16/item-table.png</file>
+ <file>icons/16x16/item-relationship.png</file>
+ <file>icons/32x32/item-table.png</file>
+--
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index dddbc1723800..adbda477819d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,29 @@
pkgname=dbmodel
pkgver=0.3
-pkgrel=6
+pkgrel=7
pkgdesc="A qt tool for drawing entity-relationship diagrams."
-arch=('i686' 'x86_64')
+arch=('x86_64' 'pentium4' 'i686')
url="http://oxygene.sk/lukas/dbmodel/"
license=('GPL')
-depends=('qt4>=4.0')
+depends=('qt5-base' 'qt5-svg' 'qt5-tools')
source=(http://launchpad.net/dbmodel/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
- dbmodel-0.3-qt-4.6.patch)
+ 0001-quick-and-dirty-adaption-to-Qt5.patch
+ 0002-removed-duplicate-edit-delete.png.patch)
md5sums=('1b8e34a92d61d3819f4d7850e2bb5311'
- 'd6efa801e99d8531a08769829def0be8')
+ '254050ab48b6b751cbfe246ac5bca0df'
+ 'e6b32edef244e1366dfaa3c21063947f')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ # patches from https://git.andreasbaumann.cc/cgit/dbmodel/?h=qt5
+ patch -Np1 -i "$srcdir/0001-quick-and-dirty-adaption-to-Qt5.patch"
+ patch -Np1 -i "$srcdir/0002-removed-duplicate-edit-delete.png.patch"
+}
build() {
cd $srcdir/$pkgname-$pkgver
- patch -Np1 -i "$srcdir/dbmodel-0.3-qt-4.6.patch"
- qmake-qt4
+ qmake-qt5
make
}
diff --git a/dbmodel-0.3-qt-4.6.patch b/dbmodel-0.3-qt-4.6.patch
deleted file mode 100644
index 3f969fbd96ae..000000000000
--- a/dbmodel-0.3-qt-4.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur -x dbmodel.pro.user dbmodel-0.3.orig/src/items/database/databasetable.cpp dbmodel-0.3/src/items/database/databasetable.cpp
---- dbmodel-0.3.orig/src/items/database/databasetable.cpp 2010-01-24 18:34:48.000000000 +1000
-+++ dbmodel-0.3/src/items/database/databasetable.cpp 2010-02-20 02:27:25.203332050 +1000
-@@ -30,6 +30,11 @@
- {
- setFlag(ItemIsMovable);
- setFlag(ItemIsSelectable);
-+#if QT_VERSION >= 0x040600
-+ // This flag was introduced in Qt 4.6.0
-+ // see Assistant for additional info
-+ setFlag(ItemSendsGeometryChanges);
-+#endif
- setHub(new BoxSideHub(this));
- m_color = Qt::white;
- m_columnList = new ColumnList(this);