patch: fix qml-related messages for tethys, metro skins

3 files changed, 80 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d72c2398cd58..e3fab5de19ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bomi-git
 	pkgdesc = Powerful and easy-to-use GUI multimedia player based on mpv (git version)
 	pkgver = 0.9.11.r39.g5f0cc0a7
-	pkgrel = 3
+	pkgrel = 4
 	url = http://bomi-player.github.io
 	arch = i686
 	arch = x86_64
@@ -44,9 +44,11 @@ pkgbase = bomi-git
 	source = git+https://github.com/d-s-x/bomi.git
 	source = add_sup_subext.patch
 	source = upgrade_waf.patch
+	source = qml_fix.patch
 	md5sums = SKIP
 	md5sums = dacb0df199eea0f6e3d5c037c8c5429d
 	md5sums = fbcd3b66086bb2f7c94c07c63c335fb3
+	md5sums = 154bd1a299aeb4ede9317c1ae8ac4a13
 
 pkgname = bomi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b8c0545954a0..dfb6f93e6f29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=bomi
 
 pkgname=$_pkgbase-git
 pkgver=0.9.11.r39.g5f0cc0a7
-pkgrel=3
+pkgrel=4
 pkgdesc="Powerful and easy-to-use GUI multimedia player based on mpv (git version)"
 arch=('i686' 'x86_64')
 url="http://bomi-player.github.io"
@@ -27,10 +27,12 @@ provides=('bomi')
 conflicts=('cmplayer' 'bomi')
 source=(git+https://github.com/d-s-x/${_pkgbase}.git
         add_sup_subext.patch
-        upgrade_waf.patch)
+        upgrade_waf.patch
+        qml_fix.patch)
 md5sums=('SKIP'
          'dacb0df199eea0f6e3d5c037c8c5429d'
-         'fbcd3b66086bb2f7c94c07c63c335fb3')
+         'fbcd3b66086bb2f7c94c07c63c335fb3'
+         '154bd1a299aeb4ede9317c1ae8ac4a13')
 #options=(debug !strip)
 
 pkgver() {
@@ -42,6 +44,7 @@ prepare() {
     cd "$srcdir/$_pkgbase"
 
     patch -Np1 -i $srcdir/add_sup_subext.patch
+    patch -Np1 -i $srcdir/qml_fix.patch
 
     # While compiling mpv, an error occurs in waf python code.
     # Upgrading waf version fixes it.
diff --git a/qml_fix.patch b/qml_fix.patch
new file mode 100644
index 000000000000..557319175269
--- /dev/null
+++ b/qml_fix.patch
@@ -0,0 +1,71 @@
+diff --git a/src/bomi/imports/bomi/MessageBox.qml b/src/bomi/imports/bomi/MessageBox.qml
+index 96ef2500..6c7df178 100644
+--- a/src/bomi/imports/bomi/MessageBox.qml
++++ b/src/bomi/imports/bomi/MessageBox.qml
+@@ -84,7 +84,7 @@ Rectangle {
+             buttons: [B.ButtonBox.Cancel, B.ButtonBox.Ok]
+             visible: buttons.length > 0
+             width: 150; height: 25
+-            anchors.horizontalCenter: parent.horizontalCenter
++            Layout.alignment: Qt.AlignHCenter
+             source: Rectangle {
+                 color: mouseArea.pressed ? Qt.rgba(1.0, 1.0, 1.0, 1.0)
+                                          : Qt.rgba(0.3, 0.3, 0.3, 1.0)
+diff --git a/src/bomi/skins/Tethys/bomi.qml b/src/bomi/skins/Tethys/bomi.qml
+index 5afdd641..8c34ed90 100644
+--- a/src/bomi/skins/Tethys/bomi.qml
++++ b/src/bomi/skins/Tethys/bomi.qml
+@@ -259,13 +259,13 @@ B.AppWithDock {
+                 anchors.rightMargin: anchors.leftMargin
+                 Loader {
+                     readonly property int bigSize: 32
+-                    anchors.verticalCenter: parent.verticalCenter
++                    Layout.alignment: Qt.AlignVCenter
+                     sourceComponent: mediaButtonComponent
+                 }
+                 B.TimeDuration {
+                     id: td; spacing: 2
+                     height: parent.height; width: contentWidth
+-                    anchors.verticalCenter: parent.verticalCenter
++                    Layout.alignment: Qt.AlignVCenter
+                     textStyle {
+                         color: "white"; style: Text.Raised; styleColor: "black"
+                         font.pixelSize: 9;
+@@ -277,7 +277,7 @@ B.AppWithDock {
+ 
+                 Loader {
+                     readonly property var timeDuration: td
+-                    anchors.verticalCenter: parent.verticalCenter
++                    Layout.alignment: Qt.AlignVCenter
+                     width: 100; height: 14
+                     sourceComponent: timeslider
+                     Layout.fillWidth: true
+@@ -285,13 +285,13 @@ B.AppWithDock {
+ 
+                 Loader {
+                     sourceComponent: volumeIcon
+-                    anchors.verticalCenter: parent.verticalCenter
++                    Layout.alignment: Qt.AlignVCenter
+                 }
+ 
+                 B.VolumeSlider {
+                     id: volumeCompact; style: sliders
+                     width: 70; height: 14
+-                    anchors.verticalCenter: parent.verticalCenter
++                    Layout.alignment: Qt.AlignVCenter
+                     visible: app.width > 500
+                 }
+ 
+diff --git a/src/bomi/skins/metro/bomi.qml b/src/bomi/skins/metro/bomi.qml
+index bdafb308..d364f7b9 100644
+--- a/src/bomi/skins/metro/bomi.qml
++++ b/src/bomi/skins/metro/bomi.qml
+@@ -137,7 +137,7 @@ B.AppWithDock {
+                 MetroButton { prefix: "next"; action: "play/next" }
+                 Item {
+                     height: 30; Layout.fillWidth: true
+-                    anchors.verticalCenter: parent.verticalCenter
++                    Layout.alignment: Qt.AlignVCenter
+                     MouseArea {
+                         id: volumeArea
+                         width: volume.width; height: 30