[arch-commits] Commit in gambas3/trunk (3 files)
Laurent Carlier <lcar at archlinux.org
Laurent Carlier <lcar at archlinux.org
Mon Aug 1 18:19:03 UTC 2016
Date: Monday, August 1, 2016 @ 18:19:03
Author: lcarlier
Revision: 184763
upgpkg: gambas3 3.8.4-4
use hooks, remove jit component as it doesn't build anymore, fix FS#48029
Modified:
gambas3/trunk/PKGBUILD
Deleted:
gambas3/trunk/gambas3-runtime.install
gambas3/trunk/gambas3-script.install
-------------------------+
PKGBUILD | 29 +++++++++--------------------
gambas3-runtime.install | 10 ----------
gambas3-script.install | 15 ---------------
3 files changed, 9 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-01 18:16:58 UTC (rev 184762)
+++ PKGBUILD 2016-08-01 18:19:03 UTC (rev 184763)
@@ -7,7 +7,7 @@
'gambas3-gb-data' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-db'
'gambas3-gb-desktop-gnome' 'gambas3-gb-desktop-x11' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-httpd' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
'gambas3-gb-form-stock' 'gambas3-gb-form-editor' 'gambas3-gb-form' 'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-gtk3' 'gambas3-gb-image-effect'
- 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-inotify' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-logging' 'gambas3-gb-map' 'gambas3-gb-markdown'
+ 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-inotify' 'gambas3-gb-libxml' 'gambas3-gb-logging' 'gambas3-gb-map' 'gambas3-gb-markdown'
'gambas3-gb-media-form' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-mysql' 'gambas3-gb-ncurses' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-openal' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl-sge' 'gambas3-gb-opengl'
'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
@@ -16,7 +16,7 @@
'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web'
'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
pkgver=3.8.4
-pkgrel=3
+pkgrel=4
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64')
url="http://gambas.sourceforge.net/"
@@ -28,7 +28,7 @@
'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'libxtst'
'pcre' 'qtwebkit' 'qt5-webkit' 'qt5-x11extras' 'qt5-svg' 'libxcursor' 'libsm' 'dbus' 'libxml2'
'libxslt' 'libgnome-keyring' 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses'
- 'gmime' 'llvm35')
+ 'gmime')
options=('!emptydirs' 'libtool')
source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
'gambas3-gcc-fix.patch')
@@ -502,18 +502,6 @@
mv -v usr/share/gambas3/info/gb.inotify.* ${pkgdir}/usr/share/gambas3/info/
}
-package_gambas3-gb-jit() {
- depends=('gambas3-runtime' 'llvm35-libs')
- pkgdesc="Just-in-time compiler component"
-
- cd ${srcdir}/fakeinstall
-
- create_dirs
-
- mv -v usr/lib/gambas3/gb.jit.* ${pkgdir}/usr/lib/gambas3/
- mv -v usr/share/gambas3/info/gb.jit.* ${pkgdir}/usr/share/gambas3/info/
-}
-
package_gambas3-gb-libxml() {
depends=('gambas3-runtime' 'libxml2')
pkgdesc="libxml2 component"
@@ -1082,10 +1070,9 @@
package_gambas3-runtime() {
depends=('libffi' 'xdg-utils')
pkgdesc="Runtime environment"
- conflicts=('gambas3-gb-gui')
- replaces=('gambas3-gb-gui')
+ conflicts=('gambas3-gb-gui' 'gambas3-gb-jit')
+ replaces=('gambas3-gb-gui' 'gambas3-gb-jit')
provides=("gambas3-gb-gui=${pkgver}")
- install=gambas3-runtime.install
cd ${srcdir}/fakeinstall
@@ -1123,9 +1110,12 @@
cd ${srcdir}/fakeinstall
- install -dm755 ${pkgdir}/usr/{bin,share/{applications,pixmaps}}
+ install -dm755 ${pkgdir}/usr/{bin,share/{applications,gambas3,pixmaps}}
mv -v usr/bin/gambas3* ${pkgdir}/usr/bin/
+ mv -v usr/share/appdata ${pkgdir}/usr/share/
+ mv -v usr/share/gambas3/template ${pkgdir}/usr/share/gambas3/
+
install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop ${pkgdir}/usr/share/applications/
install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png ${pkgdir}/usr/share/pixmaps/
@@ -1134,7 +1124,6 @@
package_gambas3-script() {
depends=('gambas3-devel')
pkgdesc="Scripter and server programs support"
- install=gambas3-script.install
cd ${srcdir}/fakeinstall
Deleted: gambas3-runtime.install
===================================================================
--- gambas3-runtime.install 2016-08-01 18:16:58 UTC (rev 184762)
+++ gambas3-runtime.install 2016-08-01 18:19:03 UTC (rev 184763)
@@ -1,10 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambas3.png application-x-gambas3
- xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
Deleted: gambas3-script.install
===================================================================
--- gambas3-script.install 2016-08-01 18:16:58 UTC (rev 184762)
+++ gambas3-script.install 2016-08-01 18:19:03 UTC (rev 184763)
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
More information about the arch-commits
mailing list