diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
| commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
| tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /community/qtcreator | |
| parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
| parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community/qtcreator')
| -rw-r--r-- | community/qtcreator/PKGBUILD | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 04f9d6f6c..3d99a92f1 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55263 2011-09-08 02:07:36Z svenstaro $ +# $Id: PKGBUILD 56042 2011-09-29 16:07:37Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,8 +7,8 @@ # Contributor: delor <bartekpiech gmail com> pkgname="qtcreator" -pkgver=2.3.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64' 'mips64el') url='http://qt.nokia.com/products/developer-tools' @@ -18,7 +18,7 @@ makedepends=('qt-private-headers>=4.7.4' 'git') options=('docs') source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" 'qtcreator.desktop') -md5sums=('b7ee1b779f9afe9190c5c72fb207650c' +md5sums=('8aa296ed9034f847bd53ee0424e5ef08' 'f1f4680b9838ff0b8f4cf11eb850d662') build() { @@ -43,15 +43,6 @@ package() { make INSTALL_ROOT="${pkgdir}/usr/" install - # qt already fixed this as well - if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then - echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)" - exit 1 - fi - mkdir "$pkgdir/usr/lib/qmldesigner" - cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/" - # remove it soon - install -Dm644 ${srcdir}/qtcreator.desktop \ ${pkgdir}/usr/share/applications/qtcreator.desktop install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ |