From 2a048d13c15d3b4dbb01494bebfaf2367d6c39b4 Mon Sep 17 00:00:00 2001 From: Drake Justice Date: Sun, 22 Aug 2010 23:35:12 +0000 Subject: [PATCH 1/2] dbus bump: bugfixs --- dbus-glib/PKGBUILD | 6 +++--- dbus/PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbus-glib/PKGBUILD b/dbus-glib/PKGBUILD index 4723bfd6f..334b63b51 100644 --- a/dbus-glib/PKGBUILD +++ b/dbus-glib/PKGBUILD @@ -2,17 +2,17 @@ # Maintainer: Jan de Groot pkgname=dbus-glib -pkgver=0.86 +pkgver=0.88 pkgrel=1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64) license=('GPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-core>=1.2.24' 'glib2>=2.24.1') +depends=('dbus-core>=1.3.1' 'glib2>=2.24.1') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cd0ab148fb0c786fc88be49d19971f50') +md5sums=('7c04ba01df6130c2c4e62f73bea0d0d5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/dbus/PKGBUILD b/dbus/PKGBUILD index 5759c519f..9dc12040c 100644 --- a/dbus/PKGBUILD +++ b/dbus/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Link Dupont # pkgname=dbus -pkgver=1.2.24 +pkgver=1.3.1 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -13,7 +13,7 @@ depends=("dbus-core>=${pkgver}" 'libx11') makedepends=('libsm' 'libice') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz 30-dbus) -md5sums=('565346cecd9cfecf1463540c6086cc2c' +md5sums=('1aab02bdcac4d662d3760896790f0ede' 'd14e59575f04e55d21a04907b6fd9f3c') build() { From b3e4a60ad830c87e4b9a8a9a88bc04a52c6c8946 Mon Sep 17 00:00:00 2001 From: Drake Justice Date: Sun, 22 Aug 2010 23:36:12 +0000 Subject: [PATCH 2/2] initial qt-git commit (move to -unstable) --- qt-git/PKGBUILD | 134 +++++++++++++++++++++++++++++++++++++++ qt-git/assistant.desktop | 9 +++ qt-git/designer.desktop | 10 +++ qt-git/linguist.desktop | 10 +++ qt-git/qtconfig.desktop | 9 +++ 5 files changed, 172 insertions(+) create mode 100755 qt-git/PKGBUILD create mode 100755 qt-git/assistant.desktop create mode 100755 qt-git/designer.desktop create mode 100755 qt-git/linguist.desktop create mode 100755 qt-git/qtconfig.desktop diff --git a/qt-git/PKGBUILD b/qt-git/PKGBUILD new file mode 100755 index 000000000..1dbc90147 --- /dev/null +++ b/qt-git/PKGBUILD @@ -0,0 +1,134 @@ +# $Id$ +# Contributor: friesoft +# This package provides the master-stable branch of Qt + +pkgname=qt-git +pkgver=20100814 +pkgrel=1 +pkgdesc="The C++ Qt GUI framework - current development snapshot (master-stable branch)" +arch=('i686' 'x86_64') +url="http://www.qtsoftware.com" +license=('GPL3' 'LGPL') + +depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender' 'ca-certificates') +optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc') +makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2') +provides=('qt' 'qt4' 'qt-doc' 'qt=4.7.0' 'qt4=4.7.0') +replaces=('qt' 'qt4' 'qt-doc' 'qt4-git' 'qt4-doc') +conflicts=('qt' 'qt4' 'qt-doc' 'qt4-git' 'qt4-doc') +options=('!libtool' 'docs') + +# desktop files and qdoc3 patch -- needed for qtdesigner-git build +source=('assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop') + +md5sums=('83d1fd8da6a350dc1f1459d0c8cd226b' + 'bb1afccb14bcad7e7dac826612f5dc9c' + '038d7083823c2600c97239fe088b2f4b' + '8618e4b1875143fab8ad244688b2aae7') + +_gitroot="git://gitorious.org/qt/qt.git" +_gitname="qt" + +build() { + msg "Connecting to git server...." + + if [ -d ${srcdir}/$_gitname ] ; then + cd $_gitname + git reset --hard HEAD + git pull origin + + msg "The local files have been updated to the current revision" + + cd $srcdir/$_gitname + else + git clone $_gitroot + + cd $srcdir/$_gitname + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf + sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf + fi + + unset QMAKESPEC + export QT4DIR=$srcdir/$_gitname + export PATH=${QT4DIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + ./configure -confirm-license -opensource -v \ + -prefix /usr \ + -sysconfdir /etc \ + -plugindir /usr/lib/qt/plugins \ + -translationdir /usr/share/qt/translations \ + -datadir /usr/share/qt \ + -docdir /usr/share/doc/qt \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -largefile \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -xmlpatterns \ + -no-phonon \ + -no-phonon-backend \ + -svg \ + -webkit \ + -scripttools \ + -system-zlib \ + -system-libtiff \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -openssl-linked \ + -dbus-linked \ + -no-rpath \ + -silent \ + -optimized-qmake \ + -dbus \ + -no-separate-debug-info \ + -reduce-relocations \ + -gtkstyle \ + -opengl \ + -glib \ + -cups \ + -iconv \ + -xinerama \ + -xcursor \ + -xfixes \ + -qdbus + + # build qt master + make || return 1 + make docs +} + +package() { + cd $srcdir/$_gitname + + #install everything + 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 -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png + install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png + install -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + # Fix wrong path in prl files + find ${pkgdir}/usr/lib -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # install doc + install -d ${pkgdir}/usr/share/doc/qt + cp -r doc/* ${pkgdir}/usr/share/doc/qt +} diff --git a/qt-git/assistant.desktop b/qt-git/assistant.desktop new file mode 100755 index 000000000..74332f525 --- /dev/null +++ b/qt-git/assistant.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Exec=/usr/bin/assistant +Name=Qt Master Stable - Assistant +GenericName=Qt Document Browser +Icon=/usr/share/pixmaps/assistant.png +Terminal=false +Type=Application +Categories=Qt;Development;Documentation diff --git a/qt-git/designer.desktop b/qt-git/designer.desktop new file mode 100755 index 000000000..3bca99fc2 --- /dev/null +++ b/qt-git/designer.desktop @@ -0,0 +1,10 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Exec=/usr/bin/designer +Name=Qt Master Stable - Designer +GenericName=Interface Designer +MimeType=application/x-designer +Icon=/usr/share/pixmaps/designer.png +Terminal=false +Type=Application +Categories=Qt;Development;GUIDesigner diff --git a/qt-git/linguist.desktop b/qt-git/linguist.desktop new file mode 100755 index 000000000..de15b089d --- /dev/null +++ b/qt-git/linguist.desktop @@ -0,0 +1,10 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Exec=/usr/bin/linguist +Name=Qt Master Stable - Linguist +GenericName=Translation Tool +MimeType=application/x-linguist +Terminal=false +Type=Application +Icon=/usr/share/pixmaps/linguist.png +Categories=Qt;Development;Translation diff --git a/qt-git/qtconfig.desktop b/qt-git/qtconfig.desktop new file mode 100755 index 000000000..3aacff382 --- /dev/null +++ b/qt-git/qtconfig.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Name=Qt Master Stable - Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=/usr/share/pixmaps/qtlogo +Terminal=false +Type=Application +Categories=Qt;Settings;