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

[Laurent Carlier]

    Date: Monday, July 6, 2020 @ 09:21:52
  Author: lcarlier
Revision: 657958

upgpkg: gambas3 3.15.0-1: upstream update 3.15.0

Modified:
  gambas3/trunk/PKGBUILD

----------+
 PKGBUILD |   50 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-06 08:13:56 UTC (rev 657957)
+++ PKGBUILD	2020-07-06 09:21:52 UTC (rev 657958)
@@ -15,7 +15,7 @@
          '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-pcre' 'gambas3-gb-pdf' 'gambas3-gb-poppler'
          'gambas3-gb-qt5-opengl' 'gambas3-gb-qt5-webkit' 'gambas3-gb-qt5'
          'gambas3-gb-openssl'
          'gambas3-gb-report'
@@ -24,10 +24,10 @@
          'gambas3-gb-util-web' 'gambas3-gb-util'
          'gambas3-gb-v4l' 'gambas3-gb-vb'
          '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-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web-gui' 'gambas3-gb-web'
          'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
-pkgver=3.14.3
-pkgrel=14
+pkgver=3.15.0
+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"
-        gambas-postgresql-12.patch
-        gambas-poppler-0.86.patch
-        0001-Fix-segfault-with-poppler-0.83.patch
-        0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch
-	0001-Packager-Fix-ArchLinux-packager.patch)
-sha512sums=('a32d01b4c1126364fb98d2780153c333aaf9d0baf82a9822dbe534d723808ed320bd07792ab38fd1561301c09091920332c406c2f9421f841e723c863c738479'
-            '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49'
-            '0f6fcafc50256949a580df38fda94a5c864fc72285ae8cecea2f357fb8484e606cb5fa3e9e62888d10811ae9391ae3d766ee7af274d5c6e108d7d0684999e93f'
-            '97aa2241a5faf7580bd0f627c36454b5a310a1265f0fc45e5e194dd4ab51d9b8815ee0ffe1ef7143066920395f484dd7b3a6b3c8ac35b46038218b7bf1355e3e'
-            '9221508ac0fa1447868ba630bf4885563524db0645d36d613416152a479f786a9443594b6ea2d3638544079b450727ee02fe1fd246498dcaa566fd98c8f0713f'
-            '7bd383a84a7e2337af0ee4672d488cd54256d3e4baee81933b2431239aea91408014d40d5b53aae9b8559dbac4eaac54e332973f7145c0a18d9b81406acd6df5')
+        gambas-postgresql-12.patch)
+sha512sums=('68f3ee8dc6b1323f6cdb8476dd5df736de7c8c0364a36aaf90e980fd413af3197ad977083d6db1901d5782ea0c3954446a24bc19e328dded4d80e61c62996637'
+            '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -63,10 +55,6 @@
   cd ${srcdir}/gambas-${pkgver}
 
   patch -p1 -i ../gambas-postgresql-12.patch # Workaround build failure with postgresql 12
-  patch -p1 -i ../0001-Fix-segfault-with-poppler-0.83.patch # merged upstream
-  patch -p1 -i ../0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch # merged upstream
-  patch -p1 -i ../0001-Packager-Fix-ArchLinux-packager.patch # merged upstream
-  patch -p1 -i ../gambas-poppler-0.86.patch # Fix build with poppler 0.86
   ./reconf-all
 }
 
@@ -807,6 +795,18 @@
   mv -v usr/share/gambas3/info/gb.pdf.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-poppler() {
+  depends=('gambas3-runtime' 'poppler-glib')
+  pkgdesc="PDF component"
+
+  cd ${srcdir}/fakeinstall
+
+  create_dirs
+
+  mv -v usr/lib/gambas3/gb.poppler.* ${pkgdir}/usr/lib/gambas3/    
+  mv -v usr/share/gambas3/info/gb.poppler.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-qt5-opengl() {
   depends=('gambas3-gb-qt5' 'gambas3-gb-opengl')
   pkgdesc="Qt5 toolkit OpenGL component"
@@ -1028,6 +1028,18 @@
   mv -v usr/share/gambas3/info/gb.web.form.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-web-gui() {
+  depends=('gambas3-gb-web' 'gambas3-gb-util-web' 'gambas3-gb-util' 'gambas3-gb-signal')
+  pkgdesc="web gui component"
+
+  cd ${srcdir}/fakeinstall
+
+  create_dirs
+
+  mv -v usr/lib/gambas3/gb.web.gui.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.web.gui.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-web() {
   depends=('gambas3-runtime')
   pkgdesc="CGI component"