Version bump, patch merged to upstream

4 files changed, 6 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1fdf180ea97..c6707edf4474 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = orion-git
 	pkgdesc = QML/C++-written desktop client for Twitch.tv
-	pkgver = 1.6.6.r18.gbaeaf01
-	pkgrel = 2
+	pkgver = 1.6.6.r19.g33fc3e8
+	pkgrel = 1
 	url = https://github.com/alamminsalo/orion/
 	install = orion.install
 	arch = x86_64
@@ -14,9 +14,7 @@ pkgbase = orion-git
 	provides = orion
 	conflicts = orion
 	source = orion-git::git+https://github.com/alamminsalo/orion.git
-	source = hidpi-autoscale-fix.patch
 	sha256sums = SKIP
-	sha256sums = 8aca3e719e4d95ae0d970472b809d93ee117b7f6e8e08ae15a0a924715ab2220
 
 pkgname = orion-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0d465bd00bdf..7584b8950966 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Tony Lambiris <tony@criticalstack.com>
 
 pkgname=orion-git
-pkgver=1.6.6.r18.gbaeaf01
-pkgrel=2
+pkgver=1.6.6.r19.g33fc3e8
+pkgrel=1
 pkgdesc="QML/C++-written desktop client for Twitch.tv"
 arch=('x86_64')
 url="https://github.com/alamminsalo/orion/"
@@ -11,10 +11,8 @@ depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphical
 provides=('orion')
 conflicts=('orion')
 install=orion.install
-source=("${pkgname}::git+https://github.com/alamminsalo/orion.git"
-        "hidpi-autoscale-fix.patch")
-sha256sums=('SKIP'
-            '8aca3e719e4d95ae0d970472b809d93ee117b7f6e8e08ae15a0a924715ab2220')
+source=("${pkgname}::git+https://github.com/alamminsalo/orion.git")
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "${pkgname}"
@@ -22,12 +20,6 @@ pkgver() {
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname}"
-
-    patch -Np0 -i "$srcdir/hidpi-autoscale-fix.patch"
-}
-
 build() {
 	cd "${srcdir}/${pkgname}"
 
diff --git a/hidpi-autoscale-fix.patch b/hidpi-autoscale-fix.patch
deleted file mode 100644
index d4318fdd7a14..000000000000
--- a/hidpi-autoscale-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/main.cpp.orig	2018-12-26 04:02:11.608116989 -0500
-+++ src/main.cpp	2018-12-26 04:02:35.714393752 -0500
-@@ -78,7 +78,9 @@
-     //Override QT_QUICK_CONTROLS_STYLE environment variable
-     qputenv("QT_QUICK_CONTROLS_STYLE", "material");
- 
--    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+    if (!qEnvironmentVariableIsEmpty("QT_AUTO_SCREEN_SCALE_FACTOR")) {
-+        QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+    }
- 
-     // Load app settings
-     SettingsManager::getInstance()->load();
diff --git a/orion.install b/orion.install
index a3f73c5f690c..533752ba7a61 100644
--- a/orion.install
+++ b/orion.install
@@ -1,11 +1,6 @@
 display_message () {
 	cat <<-EOF
 
-	By default HiDPI autoscaling for Orion has been disabled.
-	To enable it set QT_AUTO_SCREEN_SCALE_FACTOR=1 before running:
-
-	$ QT_AUTO_SCREEN_SCALE_FACTOR=1 /usr/bin/orion
-
 	To enlarge the UI and font size, set QT_SCALE_FACTOR before running:
 
 	$ QT_SCALE_FACTOR=1.5 /usr/bin/orion