Try to fix the window position issue

3 files changed, 26 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 507c50cbbdb9..696be86a0a30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vokoscreen-git
 	pkgdesc = An easy to use screencast creator. Development version.
-	pkgver = 2.9.3.beta.35.gb763020
-	pkgrel = 1
+	pkgver = 2.9.4.beta.1.g8a76b38
+	pkgrel = 2
 	url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
 	arch = i686
 	arch = x86_64
@@ -14,13 +14,15 @@ pkgbase = vokoscreen-git
 	depends = qt-gstreamer
 	depends = gst-plugins-good
 	depends = gst-plugins-bad
-	depends = pulseaudio-alsa
+	depends = pulseaudio
 	optdepends = gst-plugins-ugly: for x264 video codec
-	provides = vokoscreen=2.9.3.beta.35.gb763020
+	provides = vokoscreen=2.9.4.beta.1.g8a76b38
 	conflicts = vokoscreen
 	source = git+https://github.com/vkohaupt/vokoscreenNG.git
+	source = fix_window_position.patch
 	source = install.pri
 	sha512sums = SKIP
+	sha512sums = a8a99aeec85baca43649bae8af3683814f5d7bdbde7705539b98ed85bf1ec7d1feaab9359175659b4529c5a138c3f8b5b811202cafc4f6d96f0d6e8edc21664e
 	sha512sums = 0a5e0523adaa9e7f9b46cbbc8f7d8d0167787b67f11cfb7895785e3f93ab8836526c1b0891f4bf3362f4e8bc44885ffcf99670b86558aa667bd4f4ac7df56f11
 
 pkgname = vokoscreen-git
diff --git a/PKGBUILD b/PKGBUILD
index 0f46be266455..0fc3b6542317 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=vokoscreen
 pkgname=${_pkgname}-git
-pkgver=2.9.3.beta.35.gb763020
-pkgrel=1
+pkgver=2.9.4.beta.1.g8a76b38
+pkgrel=2
 pkgdesc='An easy to use screencast creator. Development version.'
 arch=('i686' 'x86_64')
 url='http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html'
@@ -13,7 +13,7 @@ license=('GPL2')
 
 depends=(
 	'qt5-x11extras' 'qt5-multimedia' 'qt-gstreamer'
-	'gst-plugins-good' 'gst-plugins-bad' 'pulseaudio-alsa'
+	'gst-plugins-good' 'gst-plugins-bad' 'pulseaudio'
 )
 makedepends=('git' 'qt5-tools' 'libxrandr')
 optdepends=('gst-plugins-ugly: for x264 video codec')
@@ -22,10 +22,12 @@ conflicts=("${_pkgname}")
 
 source=(
 	"git+https://github.com/vkohaupt/${_pkgname}NG.git"
+	'fix_window_position.patch'
 	'install.pri'
 )
 sha512sums=(
 	'SKIP'
+	'a8a99aeec85baca43649bae8af3683814f5d7bdbde7705539b98ed85bf1ec7d1feaab9359175659b4529c5a138c3f8b5b811202cafc4f6d96f0d6e8edc21664e'
 	'0a5e0523adaa9e7f9b46cbbc8f7d8d0167787b67f11cfb7895785e3f93ab8836526c1b0891f4bf3362f4e8bc44885ffcf99670b86558aa667bd4f4ac7df56f11'
 )
 
@@ -38,6 +40,9 @@ pkgver() {
 prepare() {
 	cd "${srcdir}"/${_pkgname}NG
 
+	# Fix window position
+	patch -Np1 < ../fix_window_position.patch
+
 	# Add install instructions
 	cp ../install.pri src/
 	echo 'include(install.pri)' >> src/vokoscreen.pro
diff --git a/fix_window_position.patch b/fix_window_position.patch
new file mode 100644
index 000000000000..512ffa0f6d4d
--- /dev/null
+++ b/fix_window_position.patch
@@ -0,0 +1,12 @@
+diff -uprNEBZ --suppress-blank-empty a/src/mainwindow.cpp b/src/mainwindow.cpp
+--- a/src/mainwindow.cpp	2018-12-21 17:01:47.452059818 -0600
++++ b/src/mainwindow.cpp	2018-12-21 17:02:54.862133874 -0600
+@@ -122,7 +122,7 @@ MainWindow::MainWindow(QWidget *parent)
+     vk_setCornerWidget( ui->tabWidgetScreencast );
+
+     // need a move
+-    move( 0, 0 );
++    //move( 0, 0 );
+
+     makeAndSetValidIconForSideBar( ui->tabWidgetSideBar->indexOf( ui->tabSidebarScreencast ), QIcon::fromTheme( "video-display", QIcon( ":/pictures/video-display.svg" ) ) );
+     makeAndSetValidIconForSideBar( ui->tabWidgetSideBar->indexOf( ui->tabSidebarScreenshot ), QIcon::fromTheme( "computer",      QIcon( ":/pictures/computer.svg" ) ) );