From c16968d4179be76966c262f854c9e1fb827dc3ec Mon Sep 17 00:00:00 2001 From: root Date: Tue, 26 Mar 2013 00:06:16 -0700 Subject: Tue Mar 26 00:06:15 PDT 2013 --- extra/qt4/PKGBUILD | 24 ++++++++++++------------ extra/qt4/assistant-qt4.desktop | 9 +++++++++ extra/qt4/designer-qt4.desktop | 11 +++++++++++ extra/qt4/linguist-qt4.desktop | 10 ++++++++++ extra/qt4/qt4.profile | 1 - extra/qt4/qtconfig-qt4.desktop | 9 +++++++++ extra/qt4/qtconfig.desktop | 9 --------- 7 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 extra/qt4/assistant-qt4.desktop create mode 100644 extra/qt4/designer-qt4.desktop create mode 100644 extra/qt4/linguist-qt4.desktop delete mode 100644 extra/qt4/qt4.profile create mode 100644 extra/qt4/qtconfig-qt4.desktop delete mode 100644 extra/qt4/qtconfig.desktop (limited to 'extra/qt4') diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 2efcd355f..5ba2885b6 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $ +# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=qt4 pkgver=4.8.4 -pkgrel=13 +pkgrel=16 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -12,10 +12,10 @@ pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient' +makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient' 'mesa-libgl') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' + 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver' 'libxinerama: Xinerama support' @@ -28,11 +28,13 @@ replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" - 'qtconfig.desktop' 'qt4.profile' + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'improve-cups-support.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' - '20ca06ef59775d749b9451ce7437fa9a' - '4ed0bd79a310e2b5d34fc71760b99139' + 'a16638f4781e56e7887ff8212a322ecc' + '4f0152ba6d645e81218b23ba8beeb42d' + '283a00ff7f662dca481b70d6daa826e0' + '027683880235708d4bc270a7ef961183' 'c439c7731c25387352d8453ca7574971') build() { @@ -86,11 +88,9 @@ package() { # install missing icons and desktop files install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" - install -Dm644 "${srcdir}"/qtconfig.desktop \ - "${pkgdir}/usr/share/applications/qtconfig4.desktop" - - # install the profile - install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh + install -d "${pkgdir}"/usr/share/applications + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \ + "${pkgdir}/usr/share/applications/" # Useful symlinks for cmake and configure scripts install -d "${pkgdir}"/usr/bin diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop new file mode 100644 index 000000000..d2904beb2 --- /dev/null +++ b/extra/qt4/assistant-qt4.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt4 Assistant +Comment=Shows Qt4 documentation and examples +Exec=assistant-qt4 +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop new file mode 100644 index 000000000..514146e78 --- /dev/null +++ b/extra/qt4/designer-qt4.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt4 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt4 applications +Exec=designer-qt4 +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop new file mode 100644 index 000000000..61036b307 --- /dev/null +++ b/extra/qt4/linguist-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 Linguist +Comment=Add translations to Qt4 applications +Exec=linguist-qt4 +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/extra/qt4/qt4.profile b/extra/qt4/qt4.profile deleted file mode 100644 index 3129ddce5..000000000 --- a/extra/qt4/qt4.profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/usr/lib/qt4/bin diff --git a/extra/qt4/qtconfig-qt4.desktop b/extra/qt4/qtconfig-qt4.desktop new file mode 100644 index 000000000..578963124 --- /dev/null +++ b/extra/qt4/qtconfig-qt4.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt4 Config +Comment=Configure Qt4 behavior, styles, fonts +Exec=qtconfig-qt4 +Icon=qt4logo +Terminal=false +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/extra/qt4/qtconfig.desktop b/extra/qt4/qtconfig.desktop deleted file mode 100644 index 1573ef461..000000000 --- a/extra/qt4/qtconfig.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt4 Config -Comment=Configure Qt4 behavior, styles, fonts -Exec=/usr/lib/qt4/bin/qtconfig -Icon=qt4logo -Terminal=false -Type=Application -Categories=Qt;Settings; -NoDisplay=true -- cgit v1.2.3-54-g00ecf