diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-27 20:23:53 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-27 20:23:53 -0300 |
commit | 3a3f329b736af639fdd3c9621816bad627b96903 (patch) | |
tree | a0935f38e21136a3b7eeb93d0ec5c449c12de5b0 /community/gambas3 | |
parent | 4d788e769855cbef2539d7cf7049dc2b4d9ac2e0 (diff) | |
parent | 2c30604c9ff749660a4b8507eec99e679cf19508 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kdenlive/PKGBUILD
community-staging/openscenegraph/PKGBUILD
community-staging/schroot/PKGBUILD
community-staging/wt/PKGBUILD
community-testing/cdfs/PKGBUILD
community-testing/pingus/PKGBUILD
community-testing/tagpy/PKGBUILD
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
community/surf/PKGBUILD
community/unpaper/PKGBUILD
core/flex/PKGBUILD
core/gcc/PKGBUILD
extra/boost/PKGBUILD
extra/cups/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtk2/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/qt/PKGBUILD
kde-unstable/akonadi/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
libre/virtualbox-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/bind/PKGBUILD
testing/dnsutils/PKGBUILD
testing/iptables/PKGBUILD
testing/nouveau-dri/PKGBUILD
Diffstat (limited to 'community/gambas3')
-rw-r--r-- | community/gambas3/PKGBUILD | 20 | ||||
-rw-r--r-- | community/gambas3/gambas3-runtime.install | 2 |
2 files changed, 7 insertions, 15 deletions
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 205266d43..5420497c6 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73734 2012-07-14 22:35:52Z lcarlier $ +# $Id: PKGBUILD 74141 2012-07-22 09:16:14Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -14,8 +14,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -29,18 +29,14 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install' 'fix-typedef-structure.patch') -md5sums=('3d1ee5bc2e1500a9b612be4c06d3d6a5' + 'gambas3-script.install' 'gambas3-runtime.install') +md5sums=('e7aed820300ff8599e9f74029984f793' 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29' - 'e4853f8aaeefefbabe714dc2e763dab6') + '6d9e080b66443e7246387b1716d24e31') build() { cd ${srcdir}/${pkgbase}-${pkgver} - # fix redefinition of siginfo_t (merged upstream) - patch -Np3 -i ${srcdir}/fix-typedef-structure.patch - ./reconf-all ./configure --prefix=/usr -C @@ -1174,10 +1170,8 @@ package_gambas3-gb-xml-rpc() { ## - # BUG: rpc component need the xml gambas3 component to be built/installed before! cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml make XDG_UTILS='' DESTDIR="${pkgdir}" install - make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.net @@ -1186,12 +1180,10 @@ package_gambas3-gb-xml-rpc() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # BUG: rpc component need the xml gambas3 component to be built/installed before! rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]* rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]* rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]* rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.* - # BUG ## } diff --git a/community/gambas3/gambas3-runtime.install b/community/gambas3/gambas3-runtime.install index 6c8201a6a..cfb5812fe 100644 --- a/community/gambas3/gambas3-runtime.install +++ b/community/gambas3/gambas3-runtime.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 + /usr/share/gambas3/mime/application-x-gambas3.png application-x-gambas3 xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml } |