From 76902dc5bf214632e86283bb144b7f35e9b0c987 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sat, 1 Apr 2017 12:23:42 -0300
Subject: qtcreator-4.2.1-4.parabola1: remove obsolete workaround that causes
 other issues - FS#53131 -> https://bugs.archlinux.org/task/53131 - FS#53149
 -> https://bugs.archlinux.org/task/53149

---
 libre/qtcreator/PKGBUILD          | 15 +++++----------
 libre/qtcreator/qtcreator.desktop | 10 ----------
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 libre/qtcreator/qtcreator.desktop

diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD
index 6432e5cf7..80785c704 100644
--- a/libre/qtcreator/PKGBUILD
+++ b/libre/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 289773 2017-03-01 21:35:05Z svenstaro $
+# $Id: PKGBUILD 291844 2017-03-30 10:00:44Z arojas $
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -10,7 +10,7 @@
 pkgname=qtcreator
 pkgver=4.2.1
 _pkgver=v4.2.1
-pkgrel=3.parabola1.1
+pkgrel=4.parabola1
 pkgdesc='Lightweight, cross-platform integrated development environment, without nonfree qt5-webengine support'
 arch=('i686' 'x86_64' 'armv7h')
 url='http://qt-project.org'
@@ -23,7 +23,7 @@ optdepends=('qt5-doc: integrated Qt documentation'
             'qt5-translations: for other languages'
             'gdb: debugger'
             'cmake: cmake project support'
-            'openssh-askpass: ssh support'
+            'x11-ssh-askpass: ssh support'
             'git: git support'
             'mercurial: mercurial support'
             'bzr: bazaar support'
@@ -49,7 +49,8 @@ build() {
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
+  LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I \
+    CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
   make
   make docs -j1
 }
@@ -60,11 +61,5 @@ package() {
   make INSTALL_ROOT="${pkgdir}/usr/" install
   make INSTALL_ROOT="${pkgdir}/usr/" install_docs
 
-  # Workaround for FS#40583
-  mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin
-  echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator
-  echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator
-  chmod +x "${pkgdir}"/usr/bin/qtcreator
-
   install -Dm644 ${srcdir}/qt-creator-opensource-src-${pkgver}/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
 }
diff --git a/libre/qtcreator/qtcreator.desktop b/libre/qtcreator/qtcreator.desktop
deleted file mode 100644
index a8fbbb4d1..000000000
--- a/libre/qtcreator/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=qtcreator %F
-Name=Qt Creator
-GenericName=C++ IDE for developing Qt applications
-X-KDE-StartupNotify=true
-Icon=QtProject-qtcreator
-Terminal=false
-Categories=Development;IDE;Qt;
-MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;
-- 
cgit v1.2.3