[arch-commits] Commit in gambas3/trunk (PKGBUILD gambas-poppler-0.76.patch)

[Antonio Rojas]

    Date: Wednesday, April 24, 2019 @ 11:58:37
  Author: arojas
Revision: 453285

Update to 3.13.0, fix build with poppler 0.76

Modified:
  gambas3/trunk/PKGBUILD
  gambas3/trunk/gambas-poppler-0.76.patch

---------------------------+
 PKGBUILD                  |   11 +----
 gambas-poppler-0.76.patch |   93 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 93 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-24 11:54:10 UTC (rev 453284)
+++ PKGBUILD	2019-04-24 11:58:37 UTC (rev 453285)
@@ -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.12.2
-pkgrel=3
+pkgver=3.13.0
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('x86_64')
 url="http://gambas.sourceforge.net/"
@@ -42,11 +42,9 @@
 	 'gmime3')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-        gambas-poppler-0.73.patch
         gambas-poppler-0.76.patch)
-sha512sums=('b6c7cae4b953b4303bf4b7856fd17611c1b2ea0d3253f3d2c19c04cb7836a08da49b50f1d0412353e5fc869935b8a24c4b9a93b1893ecd290bfa54774ad01270'
-            'de829f45c874958dc0f60649b13605d67d9173c8676a2accb518131520e366aaf724fd7a817ee69be0c9280f27bef339df6d973e718580754737c3c4640fa37d'
-            'a30c3607a84b17f2f2872545386b9fbad2e2c64bcf6333953d1cdfbf39f929d290b72528cdd49df3edb1651f0d4aa1daf420fc2786d33fbd5328a32da954dc3f')
+sha512sums=('5a7954df222a91f87926e6d96aca39b098cd3205f43d48557459e639ed4cf70bfb67c41a19d8296ec8f82acaa9a040549a99d4e1702f3fae2af381615a6cc84d'
+            'dab805eb855ad5774833a9d040599c37b7154cf8ad065278d425ea4a23749c442e0585309e4c03f5f2be286398226ee7153f1060fd2e1025c3761e5ded7056df')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -56,7 +54,6 @@
 prepare() {
   cd ${srcdir}/gambas-${pkgver}
 
-  patch -Np1 -i ../gambas-poppler-0.73.patch
   patch -p1 -i ../gambas-poppler-0.76.patch
   ./reconf-all
 }

Modified: gambas-poppler-0.76.patch
===================================================================
--- gambas-poppler-0.76.patch	2019-04-24 11:54:10 UTC (rev 453284)
+++ gambas-poppler-0.76.patch	2019-04-24 11:58:37 UTC (rev 453285)
@@ -1,5 +1,5 @@
 diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
-index 0610a65d8..f9319389b 100644
+index 0610a65d8..e54cb35b5 100644
 --- a/gb.pdf/src/CPdfDocument.cpp
 +++ b/gb.pdf/src/CPdfDocument.cpp
 @@ -40,7 +40,6 @@
@@ -10,17 +10,102 @@
  #include <Outline.h>
  #include <Link.h>
  #include <Gfx.h>
+@@ -273,7 +272,7 @@ static uint32_t aux_get_page_from_action(void *_object, const_LinkAction *act)
+ 	if (dest->isPageRef() )
+ 	{
+ 		pref= dest->getPageRef();
+-		return THIS->doc->findPage(pref.num, pref.gen);
++		return THIS->doc->findPage(pref);
+ 	}
+ 	else
+ 		return dest->getPageNum();
+@@ -717,7 +716,7 @@ PDF document index
+ 
+ BEGIN_PROPERTY(PDFDOCUMENT_has_index)
+ 
+-	GB.ReturnBoolean(THIS->index && THIS->index->getLength());
++	GB.ReturnBoolean(THIS->index && THIS->index->size());
+ 
+ END_PROPERTY
+ 
+@@ -725,14 +724,14 @@ BEGIN_PROPERTY(PDFDOCUMENT_index)
+ 
+ 	if (!THIS->index) { GB.ReturnNull(); return; }
+ 	
+-	THIS->action=((OutlineItem*)THIS->index->get(THIS->currindex))->getAction();
++	THIS->action=((*THIS->index)[THIS->currindex])->getAction();
+ 	RETURN_SELF();
+ 
+ END_PROPERTY
+ 
+ BEGIN_PROPERTY(PDFINDEX_count)
+ 
+-	GB.ReturnInteger(THIS->index->getLength());
++	GB.ReturnInteger(THIS->index->size());
+ 
+ END_PROPERTY
+ 
+@@ -740,8 +739,8 @@ BEGIN_PROPERTY(PDFINDEX_has_children)
+ 
+ 	OutlineItem *item;
+ 
+-	item = (OutlineItem *)THIS->index->get (THIS->currindex);
+-	GB.ReturnBoolean(item->getKids() && item->getKids()->getLength());
++	item = (*THIS->index)[THIS->currindex];
++	GB.ReturnBoolean(item->getKids() && item->getKids()->size());
+ 
+ END_PROPERTY
+ 
+@@ -749,7 +748,7 @@ BEGIN_PROPERTY(PDFINDEX_is_open)
+ 
+ 	OutlineItem *item;
+ 
+-	item = (OutlineItem *)THIS->index->get (THIS->currindex);
++	item = (*THIS->index)[THIS->currindex];
+ 
+ 	if (READ_PROPERTY)
+ 	{	GB.ReturnBoolean(item->isOpen()); return; }
+@@ -763,7 +762,7 @@ BEGIN_PROPERTY(PDFINDEX_title)
+ 
+ 	OutlineItem *item;
+ 
+-	item = (OutlineItem *)THIS->index->get (THIS->currindex);
++	item = (*THIS->index)[THIS->currindex];
+ 	return_unicode_string(item->getTitle(), item->getTitleLength());
+ 
+ END_PROPERTY
+@@ -792,7 +791,7 @@ END_METHOD
+ 
+ BEGIN_METHOD_VOID(PDFINDEX_next)
+ 
+-	if ( (THIS->currindex+1) >= (uint32_t)THIS->index->getLength() )
++	if ( (THIS->currindex+1) >= (uint32_t)THIS->index->size() )
+ 		 { GB.ReturnBoolean(true); return; }
+ 
+ 	THIS->currindex++;
+@@ -804,9 +803,9 @@ BEGIN_METHOD_VOID(PDFINDEX_child)
+ 
+ 	OutlineItem *item;
+ 
+-	item = (OutlineItem *)THIS->index->get (THIS->currindex);
++	item = (*THIS->index)[THIS->currindex];
+ 
+-	if (!item->hasKids() || item->getKids()->getLength() == 0) { GB.ReturnBoolean(true); return; }
++	if (!item->hasKids() || item->getKids()->size() == 0) { GB.ReturnBoolean(true); return; }
+ 
+ 	if (THIS->pindex)
+ 	{
 @@ -833,7 +832,7 @@ BEGIN_METHOD_VOID(PDFINDEX_parent)
  
  	if (!THIS->pindex) { GB.ReturnBoolean(true); return; }
  
 -	THIS->index=(GooList*)THIS->pindex[GB.Count(POINTER(THIS->pindex))-1];
-+	THIS->index=(const std::vector<OutlineItem*>*)THIS->pindex[GB.Count(POINTER(THIS->pindex))-1];
++	THIS->index=(std::vector<OutlineItem*>*)THIS->pindex[GB.Count(POINTER(THIS->pindex))-1];
  	THIS->currindex=THIS->oldindex[GB.Count(POINTER(THIS->pindex))-1];
  	if (GB.Count(POINTER(THIS->pindex))==1)
  	{
 diff --git a/gb.pdf/src/CPdfDocument.h b/gb.pdf/src/CPdfDocument.h
-index fa80d47a9..e9afdbf81 100644
+index fa80d47a9..c616e325d 100644
 --- a/gb.pdf/src/CPdfDocument.h
 +++ b/gb.pdf/src/CPdfDocument.h
 @@ -29,7 +29,7 @@
@@ -32,7 +117,7 @@
  #include <stdint.h>
  
  #if POPPLER_VERSION_0_64
-@@ -93,7 +92,7 @@ typedef
+@@ -93,7 +93,7 @@ typedef
  		uint currpage;
  
  		void **pindex;            // Parent of current index entries