summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2020-03-31 21:49:46 -0700
committerStephen Martin2020-03-31 21:50:54 -0700
commita2b8dbf840191acc450f92258af83a58a1f54009 (patch)
treee2fbbbb69d084bef4e369c55a871ebd92e31d153
parent869a6a4cb768ca6d065e60ad053b71b3ee233f23 (diff)
downloadaur-a2b8dbf840191acc450f92258af83a58a1f54009.tar.gz
qt5-webengine fixed.
- Added a qt.conf file. - Temporary fix until the underlying cause is found.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
-rw-r--r--qt.conf8
3 files changed, 16 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2325e5a00f87..9459e891c38a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,12 +45,14 @@ pkgbase = rstudio-desktop-git
source = https://nodejs.org/dist/v10.19.0/node-v10.19.0-linux-x64.tar.gz
source = soci.patch
source = rstudio_boost.patch
+ source = qt.conf
sha256sums = SKIP
sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
sha256sums = 970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b
sha256sums = 36d90bc58f0418f31dceda5b18eb260019fcc91e59b0820ffa66700772a8804b
sha256sums = b12cb64ec72b0e2c45f832908b9e1fb3550c70edc7da7733f8d5e07d4ab6bf77
sha256sums = e0500613ca427af1dae9418559589cf4fdd646aa30cb02563476184cb32b58cb
+ sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921
pkgname = rstudio-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 6764d1c973ac..086f260ef04b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,13 +25,15 @@ source=("git+https://github.com/rstudio/rstudio.git"
"https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
"soci.patch"
"rstudio_boost.patch"
+ "qt.conf"
)
sha256sums=('SKIP'
'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
'970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b'
'36d90bc58f0418f31dceda5b18eb260019fcc91e59b0820ffa66700772a8804b'
'b12cb64ec72b0e2c45f832908b9e1fb3550c70edc7da7733f8d5e07d4ab6bf77'
- 'e0500613ca427af1dae9418559589cf4fdd646aa30cb02563476184cb32b58cb')
+ 'e0500613ca427af1dae9418559589cf4fdd646aa30cb02563476184cb32b58cb'
+ '723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921')
noextract=("gin-${_ginver}.zip")
pkgver() {
@@ -97,4 +99,7 @@ package() {
# Symlink main binary
install -d "${pkgdir}/usr/bin"
ln -s "/usr/lib/${_gitname}/bin/${_gitname}" "${pkgdir}/usr/bin/${_gitname}"
+
+ # BUGFIX: qt5-webengine isn't init'ing properly. Likely an Rstudio bug.
+ install -D "${srcdir}/qt.conf" "${pkgdir}/usr/lib/qt/libexec/qt.conf"
}
diff --git a/qt.conf b/qt.conf
new file mode 100644
index 000000000000..840a682a802b
--- /dev/null
+++ b/qt.conf
@@ -0,0 +1,8 @@
+[Paths]
+Headers = /usr/include/qt/
+Data = /usr/share/qt/
+Libraries = /usr/lib/qt/
+LibraryExecutables = /usr/lib/qt/libexec/
+Plugins = /usr/lib/qt/plugins/
+Qml2Imports = /usr/lib/qt/qml/
+Translations = /usr/share/qt/translations/