[arch-commits] Commit in gambas3/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Wednesday, February 6, 2019 @ 09:31:45
  Author: lcarlier
Revision: 429722

upgpkg: gambas3 3.12.2-1

upstream update 3.12.2

Modified:
  gambas3/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-06 08:58:05 UTC (rev 429721)
+++ PKGBUILD	2019-02-06 09:31:45 UTC (rev 429722)
@@ -26,8 +26,8 @@
          'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml'
          'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web'
          'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
-pkgver=3.11.4
-pkgrel=6
+pkgver=3.12.2
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('x86_64')
 url="http://gambas.sourceforge.net/"
@@ -42,17 +42,9 @@
 	 'gmime3')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-        0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
-        gambas-poppler-0.71.patch
-        gambas-poppler-0.72.patch
-        gambas-poppler-0.73.patch
-        gambas-postgresql.patch::"https://gitlab.com/gambas/gambas/commit/75c0cafe.diff")
-sha512sums=('1b5a22b13a69e43831e2348b6c89a6ddd38f3a98cf70176322f360a75616d8b15a189353e9a5637be194960875c1fe775c5f2b11a9919aa552d572e409e7f767'
-            '51daba92877e52f578c74f0c46f58151a9ee7cdd32993845f269d598cca7c0068880a47a3ec3f9e3e862032be5b2b37c4c35e2ee50f72f117ba627f337ef26d7'
-            '57c450ff4f42d41a10d305a4784d647001601a3efdf37cda936dc456d15f0a65ff23f1dc3fd3e710651a0a0648c6d720345d93dfa61f1955e98258494360d462'
-            '029e9fb410b3194c84b663d493d3ba2b4b80116369bd3514083b8d01e2cabf39f4a2fd6e1c5f916126c815369bfb784695a1d47b839c9ba5fa8902dabb7e5762'
-            'de829f45c874958dc0f60649b13605d67d9173c8676a2accb518131520e366aaf724fd7a817ee69be0c9280f27bef339df6d973e718580754737c3c4640fa37d'
-            '42f41cd01ded21f7ddf614de975c09979f0b30f170429570ab71b64d9d7d169fbe7efae9222a266a928b1eefc761c49170c7d27b458e7336688b46caaba643a0')
+        gambas-poppler-0.73.patch)
+sha512sums=('b6c7cae4b953b4303bf4b7856fd17611c1b2ea0d3253f3d2c19c04cb7836a08da49b50f1d0412353e5fc869935b8a24c4b9a93b1893ecd290bfa54774ad01270'
+            'de829f45c874958dc0f60649b13605d67d9173c8676a2accb518131520e366aaf724fd7a817ee69be0c9280f27bef339df6d973e718580754737c3c4640fa37d')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -62,10 +54,7 @@
 prepare() {
   cd ${srcdir}/gambas-${pkgver}
 
-  patch -p1 -i ../gambas-poppler-0.71.patch # Fix build with poppler 0.71
-  patch -p1 -i ../gambas-poppler-0.72.patch # Fix build with poppler 0.72
-  patch -p1 -i ../gambas-poppler-0.73.patch # Fix build with poppler 0.73
-  patch -p1 -i ../gambas-postgresql.patch # Fix build of postgresql module
+ patch -Np1 -i ../gambas-poppler-0.73.patch
   ./reconf-all
 }
 
@@ -1114,9 +1103,9 @@
 package_gambas3-runtime() {
   depends=('libffi' 'xdg-utils')
   pkgdesc="Runtime environment"
-  conflicts=('gambas3-gb-gui' 'gambas3-gb-jit')
-  replaces=('gambas3-gb-gui' 'gambas3-gb-jit')
-  provides=("gambas3-gb-gui=${pkgver}")
+  conflicts=('gambas3-gb-gui')
+  replaces=('gambas3-gb-gui')
+  provides=("gambas3-gb-gui=${pkgver}" 'gambas3-gb-jit')
 
   cd ${srcdir}/fakeinstall