summaryrefslogtreecommitdiff
path: root/community/gambas2
diff options
context:
space:
mode:
Diffstat (limited to 'community/gambas2')
-rw-r--r--community/gambas2/PKGBUILD33
-rw-r--r--community/gambas2/db.firebird.gcc-4.6.0-fix.patch35
-rw-r--r--community/gambas2/poppler-0.18.patch40
-rw-r--r--community/gambas2/poppler-0.20.patch100
4 files changed, 119 insertions, 89 deletions
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index 53693e857..7591abe02 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70013 2012-04-28 09:24:06Z allan $
+# $Id: PKGBUILD 71272 2012-05-26 07:54:42Z pschmitz $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Biru Ionut <ionut@archlinux.ro>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -19,8 +19,8 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.1
-pkgrel=10
+pkgver=2.24.0
+pkgrel=1
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64')
url="http://gambas.sourceforge.net"
@@ -34,13 +34,11 @@ groups=('gambas2')
replaces=('gambas2')
conflicts=('gambas2')
source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
- 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
- 'poppler-0.18.patch'
- 'gambas2-script.install' 'gambas2-runtime.install')
-md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
+ 'fix-gbi-gba-path.patch'
+ 'gambas2-script.install' 'gambas2-runtime.install'
+ 'poppler-0.20.patch')
+md5sums=('b59072b6f57b681d586cc84c02333690'
'9dda03a1bbfb7e7ba8b6a4ae91b6752b'
- 'ac9703b390502ed3242c8d34485c9236'
- 'a551b4b216bbdb3489f3c264bf73ee66'
'870ff5b4b33cd75aa9c290539e6fdd5d'
'ab5667175c4945282d2f40a35d0e9e5b')
_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
@@ -66,12 +64,14 @@ _buildgbcomp() {
build() {
cd "${srcdir}/$pkgbase-$pkgver"
- ## workaround to allow package splitting
msg "Applying patches ..."
- patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
- # merged upstream
- patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
- patch -Np2 -i "${srcdir}/poppler-0.18.patch"
+ # workaround to allow package splitting
+ patch -Np1 -i ../fix-gbi-gba-path.patch
+ # fix building with poppler-0.20.x (merged upstream)
+ cd gb.pdf
+ patch -Np0 -i ../../poppler-0.20.patch
+ cd ..
+
./reconf-all
##
@@ -947,3 +947,8 @@ package_gambas2-gb-xml-xslt() {
rm -rf ${pkgdir}/usr/bin
##
}
+md5sums=('b59072b6f57b681d586cc84c02333690'
+ '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
+ '870ff5b4b33cd75aa9c290539e6fdd5d'
+ 'ab5667175c4945282d2f40a35d0e9e5b'
+ '5eb70afe712c0f8667a700df4d9a6735')
diff --git a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch
deleted file mode 100644
index 0b6e68df3..000000000
--- a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864
-+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865
-@@ -1216,7 +1216,8 @@
- GB.StoreVariant(&fantom, &buffer[i]);
- }
- else{
-- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
-+ GB_VARIANT val = res->GetData(pos,i);
-+ GB.StoreVariant(&val , &buffer[i]);
- }
- }
- }
-@@ -1874,6 +1875,8 @@
- static char query[SQLMAXLEN];
- int type;
- std::string str1,str2;
-+ GB_VARIANT varval;
-+ char* charval;
- snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
- if (do_query(db, query, &res, "Unable to get the field from the table")){
- delete res;
-@@ -1900,9 +1903,11 @@
- str1=res->GetData(0,3).value.value._string;
- if(str1!="")
- str2=str1.assign(str1,8,str1.length()-8);
-- GB.FreeString(&res->GetData(0,3).value.value._string);
-+ charval = res->GetData(0,3).value.value._string;
-+ GB.FreeString(&charval);
- res->SetData(0,3,str2);
-- GB.StoreVariant(&res->GetData(0,3), &info->def);
-+ varval = res->GetData(0,3);
-+ GB.StoreVariant(&varval, &info->def);
- }
- delete res;
- return FALSE;
diff --git a/community/gambas2/poppler-0.18.patch b/community/gambas2/poppler-0.18.patch
deleted file mode 100644
index fbcc430bf..000000000
--- a/community/gambas2/poppler-0.18.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038
-+++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997
-@@ -22,6 +22,8 @@
- AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
- pkg-config --atleast-version=0.11.3 poppler
- AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-+ pkg-config --atleast-version=0.17.0 poppler
-+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
- fi
-
- AC_OUTPUT( \
-
---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870
-+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997
-@@ -44,6 +44,7 @@
- #include <Outline.h>
- #include <Link.h>
- #include <Gfx.h>
-+#include <glib/poppler-features.h>
-
- /*****************************************************************************
-
-@@ -956,12 +957,17 @@
- Bookmarks of a PDF page
-
- ******************************************************************************/
-+
- void aux_fill_links(void *_object)
- {
-+ #if POPPLER_VERSION_0_17
-+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
-+ #else
- Object obj;
-
- THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
- obj.free();
-+ #endif
- }
-
- BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/community/gambas2/poppler-0.20.patch b/community/gambas2/poppler-0.20.patch
new file mode 100644
index 000000000..a73d42a7f
--- /dev/null
+++ b/community/gambas2/poppler-0.20.patch
@@ -0,0 +1,100 @@
+Index: src/CPdfDocument.cpp
+===================================================================
+--- src/CPdfDocument.cpp (révision 4732)
++++ src/CPdfDocument.cpp (copie de travail)
+@@ -407,7 +407,11 @@
+ white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
+ THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
+
++ #if POPPLER_VERSION_0_20
++ THIS->dev->startDoc(THIS->doc);
++ #else
+ THIS->dev->startDoc(THIS->doc->getXRef ());
++ #endif
+
+ outline=THIS->doc->getOutline();
+ if (outline) THIS->index=outline->getItems();
+@@ -833,13 +837,22 @@
+
+ if ( (w<0) || (h<0) ) return NULL;
+
++ #if POPPLER_VERSION_0_20
+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
+ rotation,
+ gFalse,
+ gTrue,
+ x,y,w,h,
++ gFalse);
++ #else
++ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
++ rotation,
+ gFalse,
++ gTrue,
++ x,y,w,h,
++ gFalse,
+ THIS->doc->getCatalog ());
++ #endif
+
+ map=THIS->dev->getBitmap();
+
+@@ -929,9 +942,14 @@
+ w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
+ h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
+
++ #if POPPLER_VERSION_0_20
++ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
++ #else
+ dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \
+ gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
++ #endif
+
+ THIS->page->display(gfx);
+ dev->endPage();
+@@ -960,7 +978,9 @@
+
+ void aux_fill_links(void *_object)
+ {
+- #if POPPLER_VERSION_0_17
++ #if POPPLER_VERSION_0_20
++ THIS->links = new Links (THIS->page->getAnnots ());
++ #elif POPPLER_VERSION_0_17
+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
+ #else
+ Object obj;
+@@ -1200,12 +1220,21 @@
+
+ if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
+
++ #if POPPLER_VERSION_0_20
++ textdev = new TextOutputDev (NULL, true, 0, false, false);
++ THIS->page->display (textdev, 72, 72, 0, false, false, false);
++ #else
+ textdev = new TextOutputDev (NULL, true, false, false);
+ THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
++ #endif
+
+ if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
+
++ #if POPPLER_VERSION_0_20
++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
++ #else
+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
++ #endif
+ {
+ if (!THIS->Found) {
+ GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1);
+Index: configure.ac
+===================================================================
+--- configure.ac (révision 4732)
++++ configure.ac (copie de travail)
+@@ -25,6 +25,8 @@
+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
+ pkg-config --atleast-version=0.17.0 poppler
+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
++ pkg-config --atleast-version=0.20.0 poppler
++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
+ fi
+
+ AC_OUTPUT( \
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 00:34:42 +0000