diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/ibus/PKGBUILD | 4 | ||||
| -rw-r--r-- | extra/ibus/ibus.install | 8 | ||||
| -rw-r--r-- | extra/pygobject/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/qt5/PKGBUILD | 152 | ||||
| -rw-r--r-- | extra/qt5/assistant.desktop | 2 | ||||
| -rw-r--r-- | extra/qt5/designer.desktop | 2 | ||||
| -rw-r--r-- | extra/qt5/linguist.desktop | 2 | ||||
| -rw-r--r-- | extra/qt5/qdbusviewer.desktop | 9 | ||||
| -rw-r--r-- | extra/qt5/qt5-base.install | 11 | ||||
| -rw-r--r-- | extra/qt5/use-python2.patch | 11 | ||||
| -rw-r--r-- | extra/xterm/PKGBUILD | 6 |
11 files changed, 123 insertions, 90 deletions
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 97d6589dd..cddfdd852 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183196 2013-04-18 19:51:15Z eric $ +# $Id: PKGBUILD 189729 2013-07-06 17:47:53Z schiv $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ pkgname=ibus pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" diff --git a/extra/ibus/ibus.install b/extra/ibus/ibus.install index e4e446693..0b5ce0196 100644 --- a/extra/ibus/ibus.install +++ b/extra/ibus/ibus.install @@ -1,6 +1,6 @@ post_install() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-query-immodules-3.0 --update-cache + gtk-query-immodules-2.0 --update-cache + gtk-query-immodules-3.0 --update-cache gtk-update-icon-cache -fq -t usr/share/icons/hicolor @@ -8,8 +8,8 @@ post_install() { } post_remove() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-query-immodules-3.0 --update-cache + gtk-query-immodules-2.0 --update-cache + gtk-query-immodules-3.0 --update-cache gtk-update-icon-cache -fq -t usr/share/icons/hicolor diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 3bed882b1..14a48e8cb 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185354 2013-05-13 17:22:22Z heftig $ +# $Id: PKGBUILD 189725 2013-07-06 02:03:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 arch=(i686 x86_64) url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('caa6507edb8cca56e781bf927d88ce99581e1df9978b59a3360cfb74bd9c15f5') +sha256sums=('384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index fa646d382..2e123b391 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 184428 2013-05-06 19:39:31Z foutrelis $ +# $Id: PKGBUILD 189742 2013-07-06 18:49:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 pkgname=('qt5-base' 'qt5-declarative' - 'qt5-doc' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-jsbackend' 'qt5-multimedia' 'qt5-quick1' + 'qt5-quickcontrols' 'qt5-script' + 'qt5-sensors' + 'qt5-serialport' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webkit' + 'qt5-x11extras' 'qt5-xmlpatterns') -pkgver=5.0.2 -pkgrel=2 +pkgver=5.1.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -26,26 +29,23 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' - 'libmng' 'openal' 'gtk2') + 'libmng' 'openal' 'gtk2' 'libxkbcommon') groups=('qt' 'qt5') options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'use-python2.patch' 'gcc48.patch') -md5sums=('2cab3518d86fe8f0638c7faea8b46397' - 'f1837a03fd0ebbd2da58975845f278e3' - '480fea1ed076992b688373c8db274be0' - '5595c24d5bb942c21e3a4d299e6d0bf1' - 'd6ab43fb371be494e3bfd9b210c40bf1' - '7927028e2374321c78a76df858e723d6') - -build() { +source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' + 'use-python2.patch') +md5sums=('44a507beebef73eb364b5a2ec7bbe090' + 'b2897dd6a2967bccf8f10e397aafee55' + '9638a78e502719ef8fe5f8d10d0361a9' + '188da8f4c87316e730ebf1c6217bf5a0' + '322b419b16c75d4de0ee7ad0a246caa1' + '92831f79144d5cb8121915423ba47575') + +prepare() { cd ${_pkgfqn} - export QTDIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf @@ -55,13 +55,15 @@ build() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') +} - # GCC 4.8 fixes - cd qtbase - patch -p1 -i "${srcdir}"/gcc48.patch - cd ../ +build() { + cd ${_pkgfqn} - ./configure -confirm-license -opensource \ + export QTDIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + + PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \ -prefix /usr \ -bindir /usr/lib/qt/bin \ -docdir /usr/share/doc/qt \ @@ -82,30 +84,17 @@ build() { -reduce-relocations make - - # build docs - make docs - - # build examples - for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ - qtwebkit-examples-and-demos qtxmlpatterns; do - cd ${m}/examples - ${QTDIR}/qtbase/bin/qmake - make - cd ../../ - done } package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser') + 'icu' 'qtchooser' 'libxkbcommon') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver') - install='qt5-base.install' conflicts=('qt') cd ${_pkgfqn}/qtbase @@ -149,26 +138,6 @@ package_qt5-declarative() { done } -package_qt5-doc() { - pkgdesc='A cross-platform application and UI framework (Documentation and Examples)' - depends=('qt5-base') - conflicts=('qt-doc') - replaces=('qt-doc') - provides=('qt-doc') - options=('docs') - groups=() - - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install_docs - - for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ - qtwebkit-examples-and-demos qtxmlpatterns; do - cd ${m}/examples - make INSTALL_ROOT="${pkgdir}" install - cd ../../ - done -} - package_qt5-jsbackend() { pkgdesc='A cross-platform application and UI framework (QtV8)' depends=('qt5-base') @@ -250,6 +219,20 @@ package_qt5-quick1() { # 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/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-quickcontrols() { + pkgdesc='A cross-platform application and UI framework (QtQuick)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtquickcontrols + make INSTALL_ROOT="${pkgdir}" install } package_qt5-script() { @@ -265,6 +248,30 @@ package_qt5-script() { -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } +package_qt5-sensors() { + pkgdesc='A cross-platform application and UI framework (QtSensors)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtsensors + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-serialport() { + pkgdesc='A cross-platform application and UI framework (QtSerialPort)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtserialport + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + package_qt5-svg() { pkgdesc='A cross-platform application and UI framework (QtSvg)' depends=('qt5-base') @@ -280,7 +287,8 @@ package_qt5-svg() { package_qt5-tools() { pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' - depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations') + depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme' + 'xdg-utils') optdepends=('qt5-doc: documentation') install='qt5-tools.install' conflicts=('qt') @@ -295,14 +303,18 @@ package_qt5-tools() { "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" done - install -p -D -m644 src/assistant/assistant/images/assistant.png \ + install -D -m644 src/assistant/assistant/images/assistant.png \ "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" - install -p -D -m644 src/assistant/assistant/images/assistant-128.png \ + install -D -m644 src/assistant/assistant/images/assistant-128.png \ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" - install -p -D -m644 src/designer/src/designer/images/designer.png \ + install -D -m644 src/designer/src/designer/images/designer.png \ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png" install -d "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}"/{linguist,designer,assistant}.desktop \ + install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \ "${pkgdir}/usr/share/applications/" # Fix wrong path in prl files @@ -318,7 +330,7 @@ package_qt5-tools() { package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite' 'qt5-sensors') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install @@ -330,3 +342,15 @@ package_qt5-webkit() { # Fix wrong path in pc file perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc } + +package_qt5-x11extras() { + pkgdesc='A cross-platform application and UI framework (QtX11Extras)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtx11extras + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} diff --git a/extra/qt5/assistant.desktop b/extra/qt5/assistant.desktop index 37ff84b44..9d6100438 100644 --- a/extra/qt5/assistant.desktop +++ b/extra/qt5/assistant.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Qt Assistant Comment=Shows Qt documentation and examples -Exec=/usr/bin/assistant +Exec=/usr/lib/qt/bin/assistant Icon=assistant Terminal=false Type=Application diff --git a/extra/qt5/designer.desktop b/extra/qt5/designer.desktop index f0b381d02..86aefe020 100644 --- a/extra/qt5/designer.desktop +++ b/extra/qt5/designer.desktop @@ -2,7 +2,7 @@ Name=Qt Designer GenericName=Interface Designer Comment=Design GUIs for Qt applications -Exec=/usr/bin/designer +Exec=/usr/lib/qt/bin/designer Icon=designer MimeType=application/x-designer; Terminal=false diff --git a/extra/qt5/linguist.desktop b/extra/qt5/linguist.desktop index 3b203e0bd..c6d1aa4ba 100644 --- a/extra/qt5/linguist.desktop +++ b/extra/qt5/linguist.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Qt Linguist Comment=Add translations to Qt applications -Exec=/usr/bin/linguist +Exec=/usr/lib/qt/bin/linguist Icon=linguist MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false diff --git a/extra/qt5/qdbusviewer.desktop b/extra/qt5/qdbusviewer.desktop new file mode 100644 index 000000000..9165b6feb --- /dev/null +++ b/extra/qt5/qdbusviewer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=/usr/lib/qt/bin/qdbusviewer +Icon=qdbusviewer +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; diff --git a/extra/qt5/qt5-base.install b/extra/qt5/qt5-base.install deleted file mode 100644 index c0797237a..000000000 --- a/extra/qt5/qt5-base.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch index eb53b10f6..57487b996 100644 --- a/extra/qt5/use-python2.patch +++ b/extra/qt5/use-python2.patch @@ -105,3 +105,14 @@ for(program, requiredPrograms): \ !programExistsInPath($$program): \ addReasonForSkippingBuild("Missing $$program from PATH") +--- qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp.old 2013-07-03 19:22:34.536705691 +0000 ++++ qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp 2013-07-03 19:22:25.606770334 +0000 +@@ -99,7 +99,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', + ], + 'action': [ +- 'python', ++ 'python2', + '../tools/js2c.py', + '<@(_outputs)', + 'D8', diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 1e0a601f9..d96bef997 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $ +# $Id: PKGBUILD 189727 2013-07-06 09:34:39Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=293 +pkgver=294 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439' +md5sums=('9e62f812f0560e446f9d0908662677f9' '10ecc3f8ee91e3189863a172f68282d2') build() { |