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

[Laurent Carlier]

    Date: Wednesday, September 8, 2021 @ 07:38:24
  Author: lcarlier
Revision: 1012541

upgpkg: gambas3 3.16.3-1: upstream update 3.16.3

Modified:
  gambas3/trunk/PKGBUILD
Deleted:
  gambas3/trunk/gambas-poppler-20.12.patch
  gambas3/trunk/gambas-poppler-21.06.patch

----------------------------+
 PKGBUILD                   |    6 +++---
 gambas-poppler-20.12.patch |   11 -----------
 gambas-poppler-21.06.patch |   40 ----------------------------------------
 3 files changed, 3 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-08 07:37:36 UTC (rev 1012540)
+++ PKGBUILD	2021-09-08 07:38:24 UTC (rev 1012541)
@@ -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-gui' 'gambas3-gb-web'
          'gambas3-runtime' 'gambas3-dev-tools' 'gambas3-ide' 'gambas3-script')
-pkgver=3.16.2
-pkgrel=6
+pkgver=3.16.3
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('x86_64')
 url="http://gambas.sourceforge.net/"
@@ -42,7 +42,7 @@
          'gmime3' 'libxcrypt')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2")
-sha512sums=('8747d5e7c1d5849e3ff44636d8400431ce219812b421a4cedf1d38be6b257f35f53a3e0fdc7ae9a53a35649007ea17de96510c2a1a6c3c42802b5f871209e0d4')
+sha512sums=('9416b60bdb86decb7193064e51d27ef30bc70baad115f5b28e2ff54712f8630af575bba8890985a7cfe0dc06fb606fb4509eae240b7fd0ee030ef5738df5aff3')
 
 prepare() {
   cd ${srcdir}/gambas-${pkgver}

Deleted: gambas-poppler-20.12.patch
===================================================================
--- gambas-poppler-20.12.patch	2021-09-08 07:37:36 UTC (rev 1012540)
+++ gambas-poppler-20.12.patch	2021-09-08 07:38:24 UTC (rev 1012541)
@@ -1,11 +0,0 @@
-diff -upr gambas-3.15.2.orig/gb.poppler/configure.ac gambas-3.15.2/gb.poppler/configure.ac
---- gambas-3.15.2.orig/gb.poppler/configure.ac	2020-09-17 14:12:42.000000000 +0300
-+++ gambas-3.15.2/gb.poppler/configure.ac	2020-12-02 10:35:34.428168215 +0200
-@@ -9,6 +9,6 @@ GB_COMPONENT_PKG_CONFIG(
-   POPPLER,
-   gb.poppler,
-   [src],
--  'poppler >= 0.20' poppler-splash poppler-glib)
-+  'poppler >= 0.20' poppler-glib)
- AC_OUTPUT( Makefile src/Makefile )
- GB_PRINT_MESSAGES

Deleted: gambas-poppler-21.06.patch
===================================================================
--- gambas-poppler-21.06.patch	2021-09-08 07:37:36 UTC (rev 1012540)
+++ gambas-poppler-21.06.patch	2021-09-08 07:38:24 UTC (rev 1012541)
@@ -1,40 +0,0 @@
-From dbd2bb3a27c90e419b7f9019478004312b5b977d Mon Sep 17 00:00:00 2001
-From: gambas <g4mba5 at gmail.com>
-Date: Thu, 3 Jun 2021 00:44:42 +0200
-Subject: [PATCH] Make 'gb.pdf' compile with poppler 21.06.0.
-
-[GB.PDF]
-* BUG: Make 'gb.pdf' compile with poppler 21.06.0.
----
- gb.pdf/configure.ac         | 2 ++
- gb.pdf/src/CPdfDocument.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
-index d4de2c29c..a695f13bd 100644
---- a/gb.pdf/configure.ac
-+++ b/gb.pdf/configure.ac
-@@ -29,6 +29,8 @@ if test "$have_poppler" = "yes"; then
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_85, $((1-$?)), Poppler version >= 0.85)
-   pkg-config --atleast-version=0.86.0 poppler
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_86, $((1-$?)), Poppler version >= 0.86)
-+  pkg-config --atleast-version=21.06.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_21_06_0, $((1-$?)), Poppler version >= 21.06.0)
- fi
- 
- AC_OUTPUT( \
-diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
-index 9102af09a..89d7f8033 100644
---- a/gb.pdf/src/CPdfDocument.cpp
-+++ b/gb.pdf/src/CPdfDocument.cpp
-@@ -766,8 +766,10 @@ BEGIN_PROPERTY(PDFINDEX_is_open)
- 
- 	if (VPROP(GB_INTEGER))
- 		item->open();
-+#ifndef POPPLER_VERSION_21_06_0
- 	else
- 		item->close();
-+#endif
- 
- END_PROPERTY
-