summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD31
-rw-r--r--qt5-mvvmcore.rule2
-rw-r--r--qt5-mvvmdatasynccore.rule2
-rw-r--r--qt5-mvvmquick.rule2
5 files changed, 26 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 320adf7a178..143ebba621e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qt5-mvvm
pkgdesc = A mvvm oriented library for Qt, to create Projects for Widgets and Quick in parallel
- pkgver = 1.1.4
+ pkgver = 1.1.5
pkgrel = 1
url = https://github.com/Skycoder42/QtMvvm
arch = i686
@@ -11,14 +11,14 @@ pkgbase = qt5-mvvm
makedepends = qt5-graphicaleffects
makedepends = qt5-datasync
makedepends = git
- makedepends = qpmx-qpmsource
+ makedepends = qdep
makedepends = python
makedepends = doxygen
makedepends = graphviz
depends = qt5-base
depends = qt5-svg
optdepends = repkg: Automatically rebuild the package on dependency updates
- source = qt5-mvvm-1.1.4::git+https://github.com/Skycoder42/QtMvvm.git#tag=1.1.4-2
+ source = qt5-mvvm-1.1.5::git+https://github.com/Skycoder42/QtMvvm.git#tag=1.1.5
source = qt5-mvvmcore.rule
source = qt5-mvvmwidgets.rule
source = qt5-mvvmquick.rule
@@ -26,10 +26,10 @@ pkgbase = qt5-mvvm
source = qt5-mvvmdatasyncwidgets.rule
source = qt5-mvvmdatasyncquick.rule
sha256sums = SKIP
- sha256sums = 2147916eaeebda7109b04f17e122a873388f42f2015e4b6b9fbf6f98e8e80d15
+ sha256sums = 1b52eef5216017cfb4b399df1775950db544550a68a542053efe00eb8ef34911
sha256sums = c69a4d6f324019d30a6f3d5dac00760af670c8f14b5064e6f4c08072a34ab5b8
- sha256sums = 1a1ad4f7468f0b78cbe64e4a25f6ecbba2e6d94c79c4aecc54ca23f45fc791d7
- sha256sums = 312675fe1ef88356119d62b9c4e4f481b21b189bc1d32954ecdeb88c73eba382
+ sha256sums = 8eff388f59e28e1246c3f4aff71c5405c0098651d66a705fae73d67f76a80e4c
+ sha256sums = 883fb2489da33b13827e5a44f6b56fddddcd18e9de96691db095ac5786a056c0
sha256sums = b974d9a7d88fcc9bde60ce6af3bac3c5f7374e07f635f8a90ef05e2791c99eae
sha256sums = 8a6d5cc54a0eae285296c11de1e1ea02583cf8271ba87219c4fcfdcdf9907786
diff --git a/PKGBUILD b/PKGBUILD
index 44d28800f50..ee7b8f5c4cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
pkgbase=qt5-mvvm
pkgname=(qt5-mvvmcore qt5-mvvmwidgets qt5-mvvmquick qt5-mvvmdatasynccore qt5-mvvmdatasyncwidgets qt5-mvvmdatasyncquick qt5-mvvm-doc)
group=qt5-mvvm
-pkgver=1.1.4
+pkgver=1.1.5
pkgrel=1
pkgdesc="A mvvm oriented library for Qt, to create Projects for Widgets and Quick in parallel"
arch=('i686' 'x86_64')
url="https://github.com/Skycoder42/QtMvvm"
license=('BSD')
depends=('qt5-base' 'qt5-svg')
-makedepends=('qt5-tools' 'qt5-quickcontrols2' 'qt5-graphicaleffects' 'qt5-datasync' 'git' 'qpmx-qpmsource' 'python' 'doxygen' 'graphviz')
+makedepends=('qt5-tools' 'qt5-quickcontrols2' 'qt5-graphicaleffects' 'qt5-datasync' 'git' 'qdep' 'python' 'doxygen' 'graphviz')
optdepends=("repkg: Automatically rebuild the package on dependency updates")
_pkgfqn=$pkgbase-$pkgver
-source=("$_pkgfqn::git+https://github.com/Skycoder42/QtMvvm.git#tag=${pkgver}-2" # TODO remove on next update
+source=("$_pkgfqn::git+https://github.com/Skycoder42/QtMvvm.git#tag=${pkgver}"
"${pkgbase}core.rule"
"${pkgbase}widgets.rule"
"${pkgbase}quick.rule"
@@ -20,10 +20,10 @@ source=("$_pkgfqn::git+https://github.com/Skycoder42/QtMvvm.git#tag=${pkgver}-2"
"${pkgbase}datasyncwidgets.rule"
"${pkgbase}datasyncquick.rule")
sha256sums=('SKIP'
- '2147916eaeebda7109b04f17e122a873388f42f2015e4b6b9fbf6f98e8e80d15'
+ '1b52eef5216017cfb4b399df1775950db544550a68a542053efe00eb8ef34911'
'c69a4d6f324019d30a6f3d5dac00760af670c8f14b5064e6f4c08072a34ab5b8'
- '1a1ad4f7468f0b78cbe64e4a25f6ecbba2e6d94c79c4aecc54ca23f45fc791d7'
- '312675fe1ef88356119d62b9c4e4f481b21b189bc1d32954ecdeb88c73eba382'
+ '8eff388f59e28e1246c3f4aff71c5405c0098651d66a705fae73d67f76a80e4c'
+ '883fb2489da33b13827e5a44f6b56fddddcd18e9de96691db095ac5786a056c0'
'b974d9a7d88fcc9bde60ce6af3bac3c5f7374e07f635f8a90ef05e2791c99eae'
'8a6d5cc54a0eae285296c11de1e1ea02583cf8271ba87219c4fcfdcdf9907786')
@@ -37,12 +37,15 @@ build() {
cd build
qmake "CONFIG+=no_auto_lupdate" "../$_pkgfqn/"
- make qmake_all
make
- make lrelease
make doxygen
}
+check() {
+ cd build
+ make run-tests
+}
+
package_qt5-mvvmcore() {
cd build
cd src/mvvmcore
@@ -59,7 +62,7 @@ package_qt5-mvvmcore() {
install -D -m644 "../$_pkgfqn/qbs/Qt/settingsgenerator/module.qbs" "$pkgdir/usr/share/qbs/modules/Qt/settingsgenerator/module.qbs"
install -D -m644 "../$_pkgfqn/LICENSE" "$pkgdir/usr/share/licenses/$pkgbase/LICENSE"
- install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+ install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
}
package_qt5-mvvmwidgets() {
@@ -75,7 +78,7 @@ package_qt5-mvvmwidgets() {
find "$pkgdir/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
- install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+ install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
}
package_qt5-mvvmquick() {
@@ -93,7 +96,7 @@ package_qt5-mvvmquick() {
find "$pkgdir/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
- install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+ install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
}
package_qt5-mvvmdatasynccore() {
@@ -111,7 +114,7 @@ package_qt5-mvvmdatasynccore() {
find "$pkgdir/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
- install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+ install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
# Install mimetype
install -D -m644 "../$_pkgfqn/src/mvvmdatasynccore/application-x-datasync-account-data.xml" "$pkgdir/usr/share/mime/packages/application-x-datasync-account-data.xml"
}
@@ -129,7 +132,7 @@ package_qt5-mvvmdatasyncwidgets() {
find "$pkgdir/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
- install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+ install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
}
package_qt5-mvvmdatasyncquick() {
@@ -147,7 +150,7 @@ package_qt5-mvvmdatasyncquick() {
find "$pkgdir/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
- install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+ install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
}
package_qt5-mvvm-doc() {
diff --git a/qt5-mvvmcore.rule b/qt5-mvvmcore.rule
index 5317ab13edb..6d9b85818c4 100644
--- a/qt5-mvvmcore.rule
+++ b/qt5-mvvmcore.rule
@@ -1 +1 @@
-qt5-base
+qt5-base=v
diff --git a/qt5-mvvmdatasynccore.rule b/qt5-mvvmdatasynccore.rule
index 75268d24f07..84b9e1ab1b5 100644
--- a/qt5-mvvmdatasynccore.rule
+++ b/qt5-mvvmdatasynccore.rule
@@ -1 +1 @@
-qt5-mvvmcore qt5-datasync
+qt5-mvvmcore qt5-datasync=v
diff --git a/qt5-mvvmquick.rule b/qt5-mvvmquick.rule
index f0eb68bd17a..2308333a82e 100644
--- a/qt5-mvvmquick.rule
+++ b/qt5-mvvmquick.rule
@@ -1 +1 @@
-qt5-mvvmcore qt5-declarative qt5-quickcontrols2 qt5-graphicaleffects
+qt5-mvvmcore qt5-declarative=v qt5-quickcontrols2=v qt5-graphicaleffects=v