dbmodel: 0.3.r129.6045f9a-2 -> 0.3.r138.c78245d-1

2 files changed, 6 insertions, 71 deletions

diff --git a/dbmodel/PKGBUILD b/dbmodel/PKGBUILD
index c2270256f..860305739 100755
--- a/dbmodel/PKGBUILD
+++ b/dbmodel/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 pkgname=dbmodel
-pkgver=0.3.r129.6045f9a
-pkgrel=2
+pkgver=0.3.r138.c78245d
+pkgrel=1
 _pkgver=${pkgver%.*.*}
 _commit=${pkgver##*.}
 pkgdesc='visualize a database'
@@ -9,7 +9,7 @@ arch=('i686' 'pentium4' 'x86_64')
 url='https://oxygene.sk/projects/dbmodel/'
 license=('GPL2')
 groups=()
-depends=('qt4')
+depends=('qt5-base' 'qt5-svg' 'qt5-tools')
 makedepends=('git')
 checkdepends=()
 optdepends=()
@@ -19,11 +19,9 @@ replaces=()
 backup=()
 options=()
 source=(
-    "${pkgname}::git+https://bitbucket.org/lalinsky/dbmodel.git#commit=${_commit}"
-    'pfeile-entwirren.patch'
+    "${pkgname}::git+https://git.eckner.net/Erich/dbmodel#commit=${_commit}"
 )
-sha512sums=('SKIP'
-            '3b618b9497b3d6213700e6c5f8996903b37acd1b0d7949e6fc59a35e4f838dece5e9edef666fe0cd6dc409e982d9dec9aea362d2fd8274ea37371c37bcf0b7f1')
+sha512sums=('SKIP')
 
 pkgver(){
   cd "${pkgname}"
@@ -48,20 +46,10 @@ pkgver(){
     )"
 }
 
-prepare() {
-
-    cd "${srcdir}/${pkgname}"
-    sed -i '
-      s|/usr/local|/usr|g
-    ' src/src.pro
-    patch -p1 -i "${srcdir}/pfeile-entwirren.patch"
-
-}
-
 build() {
 
     cd "${srcdir}/${pkgname}"
-    qmake-qt4
+    qmake PREFIX=/usr
     make
 
 }
diff --git a/dbmodel/pfeile-entwirren.patch b/dbmodel/pfeile-entwirren.patch
deleted file mode 100644
index 977b0ad14..000000000
--- a/dbmodel/pfeile-entwirren.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/boxsidehub.cpp b/src/boxsidehub.cpp
-index 4dfb460..b4cbf0d 100644
---- a/src/boxsidehub.cpp
-+++ b/src/boxsidehub.cpp
-@@ -51,10 +51,15 @@ static bool
- itemLessThan(const ConnectorRealPair &a, const ConnectorRealPair &b)
- {
- 	int r = cmpAngle(a.second, b.second);
--	if (r == 0) {
-+	if (r != 0)
-+		return r < 0;
-+	r = a.first->isStart() - b.first->isStart();
-+	if (r != 0)
-+		return r > 0;
-+	if (a.first->isStart())
- 		return a.first->owner() < b.first->owner();
--	}
--	return r < 0;
-+	else
-+		return a.first->owner() > b.first->owner();
- }
- 
- //              |
-diff --git a/src/connector.cpp b/src/connector.cpp
-index bbd7580..bf85ed0 100644
---- a/src/connector.cpp
-+++ b/src/connector.cpp
-@@ -82,6 +82,12 @@ Connector::isConnected() const
- 	return m_hub;
- }
- 
-+bool
-+Connector::isStart()
-+{
-+	return this==owner()->connector(0);
-+}
-+
- DiagramObject *
- Connector::connectedObject() const
- {
-diff --git a/src/connector.h b/src/connector.h
-index 66e2b1a..ee2ecb6 100644
---- a/src/connector.h
-+++ b/src/connector.h
-@@ -37,6 +37,8 @@ public:
- 	bool isConnected() const;
- 	DiagramObject *connectedObject() const;
- 
-+	bool isStart();
-+
- 	Connector *otherEnd() const;
- 	
- 	Hub *hub() const;