[arch-commits] Commit in (10 files)
Andrea Scarpino
andrea at archlinux.org
Fri Jan 11 15:09:39 UTC 2013
Date: Friday, January 11, 2013 @ 10:09:38
Author: andrea
Revision: 175014
Qt4 package
Added:
qt4/
qt4/kde-unstable/
qt4/kde-unstable/qt4.install
(from rev 175013, qt/trunk/qt.install)
qt4/repos/
Modified:
qt4/kde-unstable/PKGBUILD
qt4/kde-unstable/qtconfig.desktop
Deleted:
qt4/kde-unstable/assistant.desktop
qt4/kde-unstable/designer.desktop
qt4/kde-unstable/linguist.desktop
qt4/kde-unstable/qt.install
------------------------------+
PKGBUILD | 40 +++++++++++++++-------------------------
assistant.desktop | 8 --------
designer.desktop | 10 ----------
linguist.desktop | 9 ---------
qt.install | 12 ------------
qt4/kde-unstable/qt4.install | 12 ++++++++++++
qtconfig.desktop | 6 +++---
7 files changed, 30 insertions(+), 67 deletions(-)
Modified: qt4/kde-unstable/PKGBUILD
===================================================================
--- qt/trunk/PKGBUILD 2013-01-11 11:01:54 UTC (rev 175013)
+++ qt4/kde-unstable/PKGBUILD 2013-01-11 15:09:38 UTC (rev 175014)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Pierre Schmitz <pierre at archlinux.de>
-pkgbase=qt
+pkgbase=qt4
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.4
pkgrel=1
@@ -14,9 +14,8 @@
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
- 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'improve-cups-support.patch'
'fix-crash-in-assistant.patch')
@@ -46,14 +45,16 @@
./configure -confirm-license -opensource \
-prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
+ -bindir /usr/lib/qt4/bin \
+ -headerdir /usr/include/qt4 \
+ -docdir /usr/share/doc/qt4 \
+ -plugindir /usr/lib/qt4/plugins \
+ -importdir /usr/lib/qt4/imports \
+ -datadir /usr/share/qt4 \
+ -translationdir /usr/share/qt4/translations \
-sysconfdir /etc/xdg \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
+ -examplesdir /usr/share/doc/qt4/examples \
+ -demosdir /usr/share/doc/qt4/demos \
-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-system-sqlite \
-no-phonon \
@@ -86,32 +87,21 @@
'libxcursor: Xcursor support'
'libxfixes: Xfixes support'
'icu: Unicode support')
- install='qt.install'
+ install='qt4.install'
cd ${_pkgfqn}
make INSTALL_ROOT="${pkgdir}" install
# install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -D -m644 ${icon} \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
- done
install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
- "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
- install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
- "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
- install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
- "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
- install -D -m644 tools/designer/src/designer/images/designer.png \
- "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
+ "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
install -d "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
+ install -m644 "${srcdir}"/qtconfig.desktop \
"${pkgdir}/usr/share/applications/"
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
+ ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
# Fix wrong path in pkgconfig files
find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
Deleted: qt4/kde-unstable/assistant.desktop
===================================================================
--- qt/trunk/assistant.desktop 2013-01-11 11:01:54 UTC (rev 175013)
+++ qt4/kde-unstable/assistant.desktop 2013-01-11 15:09:38 UTC (rev 175014)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation;
Deleted: qt4/kde-unstable/designer.desktop
===================================================================
--- qt/trunk/designer.desktop 2013-01-11 11:01:54 UTC (rev 175013)
+++ qt4/kde-unstable/designer.desktop 2013-01-11 15:09:38 UTC (rev 175014)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
Deleted: qt4/kde-unstable/linguist.desktop
===================================================================
--- qt/trunk/linguist.desktop 2013-01-11 11:01:54 UTC (rev 175013)
+++ qt4/kde-unstable/linguist.desktop 2013-01-11 15:09:38 UTC (rev 175014)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
Deleted: qt4/kde-unstable/qt.install
===================================================================
--- qt/trunk/qt.install 2013-01-11 11:01:54 UTC (rev 175013)
+++ qt4/kde-unstable/qt.install 2013-01-11 15:09:38 UTC (rev 175014)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: qt4/kde-unstable/qt4.install (from rev 175013, qt/trunk/qt.install)
===================================================================
--- qt4/kde-unstable/qt4.install (rev 0)
+++ qt4/kde-unstable/qt4.install 2013-01-11 15:09:38 UTC (rev 175014)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Modified: qt4/kde-unstable/qtconfig.desktop
===================================================================
--- qt/trunk/qtconfig.desktop 2013-01-11 11:01:54 UTC (rev 175013)
+++ qt4/kde-unstable/qtconfig.desktop 2013-01-11 15:09:38 UTC (rev 175014)
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
+Name=Qt4 Config
+Comment=Configure Qt4 behavior, styles, fonts
Exec=/usr/bin/qtconfig
-Icon=qtlogo
+Icon=qt4logo
Terminal=false
Type=Application
Categories=Qt;Settings;
More information about the arch-commits
mailing list