[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator.desktop)

2017-03-30 Thread Antonio Rojas 
Date: Thursday, March 30, 2017 @ 10:00:44
  Author: arojas
Revision: 291844

Remove obsolete workaround that causes other issues (FS#53131,FS#53149)

Modified:
  qtcreator/trunk/PKGBUILD
Deleted:
  qtcreator/trunk/qtcreator.desktop

---+
 PKGBUILD  |   13 -
 qtcreator.desktop |   10 --
 2 files changed, 4 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-30 09:37:56 UTC (rev 291843)
+++ PKGBUILD2017-03-30 10:00:44 UTC (rev 291844)
@@ -9,7 +9,7 @@
 pkgname=qtcreator
 pkgver=4.2.1
 _pkgver=v4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -22,7 +22,7 @@
 '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'
@@ -34,7 +34,8 @@
   [[ -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
 }
@@ -45,11 +46,5 @@
   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
 }

Deleted: qtcreator.desktop
===
--- qtcreator.desktop   2017-03-30 09:37:56 UTC (rev 291843)
+++ qtcreator.desktop   2017-03-30 10:00:44 UTC (rev 291844)
@@ -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;

[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator.desktop)

2015-04-25 Thread Sven-Hendrik Haase 
Date: Saturday, April 25, 2015 @ 22:51:20
  Author: svenstaro
Revision: 238041

upgpkg: qtcreator 3.4.0-2

Fix .desktop file

Modified:
  qtcreator/trunk/PKGBUILD
  qtcreator/trunk/qtcreator.desktop

---+
 PKGBUILD  |4 ++--
 qtcreator.desktop |9 +
 2 files changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-25 19:32:15 UTC (rev 238040)
+++ PKGBUILD2015-04-25 20:51:20 UTC (rev 238041)
@@ -9,7 +9,7 @@
 pkgname=qtcreator
 pkgver=3.4.0
 _pkgver=v3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -32,7 +32,7 @@
 'qtcreator.desktop')
 md5sums=('SKIP'
  'SKIP'
- 'aab59d7e8b8527b18a41ec310bd6e543')
+ '800c94165c547b64012a207d9830250a')
 
 prepare() {
   cd qt-creator

Modified: qtcreator.desktop
===
--- qtcreator.desktop   2015-04-25 19:32:15 UTC (rev 238040)
+++ qtcreator.desktop   2015-04-25 20:51:20 UTC (rev 238041)
@@ -1,9 +1,10 @@
 [Desktop Entry]
-Exec=/usr/bin/qtcreator
+Type=Application
+Exec=qtcreator %F
 Name=Qt Creator
-GenericName=C++ IDE
+GenericName=C++ IDE for developing Qt applications
 X-KDE-StartupNotify=true
 Icon=QtProject-qtcreator
 Terminal=false
-Type=Application
-Categories=Qt;Development;
+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;

[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator.desktop)

2015-03-26 Thread Sven-Hendrik Haase 
Date: Thursday, March 26, 2015 @ 15:49:26
  Author: svenstaro
Revision: 234971

upgpkg: qtcreator 3.3.2-2

Fix icon path

Modified:
  qtcreator/trunk/PKGBUILD
  qtcreator/trunk/qtcreator.desktop

---+
 PKGBUILD  |4 ++--
 qtcreator.desktop |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-26 14:21:56 UTC (rev 234970)
+++ PKGBUILD2015-03-26 14:49:26 UTC (rev 234971)
@@ -9,7 +9,7 @@
 pkgname=qtcreator
 pkgver=3.3.2
 _pkgver=v3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -32,7 +32,7 @@
 'qtcreator.desktop')
 md5sums=('SKIP'
  'SKIP'
- '50880836fd62ccd87550940feb995f06')
+ 'aab59d7e8b8527b18a41ec310bd6e543')
 
 prepare() {
   cd qt-creator

Modified: qtcreator.desktop
===
--- qtcreator.desktop   2015-03-26 14:21:56 UTC (rev 234970)
+++ qtcreator.desktop   2015-03-26 14:49:26 UTC (rev 234971)
@@ -3,7 +3,7 @@
 Name=Qt Creator
 GenericName=C++ IDE
 X-KDE-StartupNotify=true
-Icon=QtProject-qtcreator.png
+Icon=QtProject-qtcreator
 Terminal=false
 Type=Application
 Categories=Qt;Development;