[arch-commits] Commit in gambas3/trunk (5 files)
Laurent Carlier
lcarlier at archlinux.org
Tue Jun 5 16:11:22 UTC 2018
Date: Tuesday, June 5, 2018 @ 16:11:21
Author: lcarlier
Revision: 340525
upgpkg: gambas3 3.11.3-1
upstream update 3.11.3
Added:
gambas3/trunk/0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
Modified:
gambas3/trunk/PKGBUILD
Deleted:
gambas3/trunk/0001-adapt-to-poppler-0.58.patch
gambas3/trunk/gambas-poppler-0.64.patch
gambas3/trunk/prefer-qt5.patch
--------------------------------------------------------------+
0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch | 32 ++
0001-adapt-to-poppler-0.58.patch | 105 ---------
PKGBUILD | 44 +--
gambas-poppler-0.64.patch | 115 ----------
prefer-qt5.patch | 57 ----
5 files changed, 47 insertions(+), 306 deletions(-)
Added: 0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
===================================================================
--- 0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch (rev 0)
+++ 0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch 2018-06-05 16:11:21 UTC (rev 340525)
@@ -0,0 +1,32 @@
+From b041e381e6f2a952383bafe7812df7287754ff27 Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Tue, 5 Jun 2018 17:40:28 +0200
+Subject: [PATCH] [GB.SDL2] fix detection with at least pkgconf 2.4.2
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ gb.sdl2/configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gb.sdl2/configure.ac b/gb.sdl2/configure.ac
+index c22addebc..2406d49f1 100644
+--- a/gb.sdl2/configure.ac
++++ b/gb.sdl2/configure.ac
+@@ -9,12 +9,12 @@ AC_PROG_LIBTOOL
+
+ GB_COMPONENT_PKG_CONFIG(
+ sdl2, SDL2, gb.sdl2, [src],
+- sdl2 ">= 2.0.2" SDL2_image ">= 2.0.0" SDL2_ttf ">= 2.0.12"
++ 'sdl2 >= 2.0.2' 'SDL2_image >= 2.0.0' 'SDL2_ttf >= 2.0.12'
+ )
+
+ GB_COMPONENT_PKG_CONFIG(
+ sdl2audio, SDL2AUDIO, gb.sdl2.audio, [audio],
+- sdl2 ">= 2.0.2" SDL2_mixer ">= 2.0.0"
++ 'sdl2 >= 2.0.2' 'SDL2_mixer >= 2.0.0'
+ )
+
+ AC_OUTPUT( \
+--
+2.17.1
+
Deleted: 0001-adapt-to-poppler-0.58.patch
===================================================================
--- 0001-adapt-to-poppler-0.58.patch 2018-06-05 15:20:00 UTC (rev 340524)
+++ 0001-adapt-to-poppler-0.58.patch 2018-06-05 16:11:21 UTC (rev 340525)
@@ -1,105 +0,0 @@
-From 6a4adabfd7e02e6fef99049e8e2373b12b559e69 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Wed, 6 Sep 2017 12:58:12 +0200
-Subject: [PATCH] adapt to poppler 0.58
-
----
- gb.pdf/configure.ac | 2 ++
- gb.pdf/src/CPdfDocument.cpp | 24 ++++++++++++++++++++++++
- 2 files changed, 26 insertions(+)
-
-diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
-index 25b344a9a..be4bf9557 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_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)
-+ pkg-config --atleast-version=0.58.0 poppler
-+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_58, $((1-$?)), Poppler version >= 0.58)
- fi
-
- AC_OUTPUT( \
-diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
-index 43802c77b..80d2d97c5 100644
---- a/gb.pdf/src/CPdfDocument.cpp
-+++ b/gb.pdf/src/CPdfDocument.cpp
-@@ -132,11 +132,19 @@ static void aux_return_string_info(void *_object, const char *key)
- Dict *info_dict;
- char *tmpstr;
-
-+ #if POPPLER_VERSION_0_58
-+ obj = THIS->doc->getDocInfo ();
-+ #else
- THIS->doc->getDocInfo (&obj);
-+ #endif
- if (!obj.isDict()) { GB.ReturnNewZeroString(""); return; }
-
- info_dict=obj.getDict();
-+ #if POPPLER_VERSION_0_58
-+ dst = info_dict->lookup ((char *)key);
-+ #else
- info_dict->lookup ((char *)key, &dst);
-+ #endif
- if (!dst.isString ()) { GB.ReturnNewZeroString(""); }
- else {
- goo_value = dst.getString();
-@@ -149,8 +157,10 @@ static void aux_return_string_info(void *_object, const char *key)
- else
- GB.ReturnNewString(goo_value->getCString(),goo_value->getLength());
- }
-+ #if ! POPPLER_VERSION_0_58
- dst.free();
- obj.free();
-+ #endif
- }
-
- static void aux_return_date_info(void *_object, const char *key)
-@@ -167,11 +177,19 @@ static void aux_return_date_info(void *_object, const char *key)
-
- GB.ReturnDate(NULL);
-
-+ #if POPPLER_VERSION_0_58
-+ obj = THIS->doc->getDocInfo ();
-+ #else
- THIS->doc->getDocInfo (&obj);
-+ #endif
- if (!obj.isDict()) return;
-
- info_dict=obj.getDict();
-+ #if POPPLER_VERSION_0_58
-+ dst = info_dict->lookup ((char *)key);
-+ #else
- info_dict->lookup ((char *)key, &dst);
-+ #endif
- if (dst.isString ())
- {
- goo = dst.getString();
-@@ -197,8 +215,10 @@ static void aux_return_date_info(void *_object, const char *key)
- }
-
- if (tofree) GB.FreeString(&tofree);
-+ #if ! POPPLER_VERSION_0_58
- dst.free();
- obj.free();
-+ #endif
- }
-
- static LinkDest *get_dest(LinkAction *act)
-@@ -426,8 +446,12 @@ int32_t open_document (void *_object, char *sfile, int32_t lfile)
-
- if ( GB.LoadFile(sfile,lfile,&buf,&len) ) return -1;
-
-+ #if POPPLER_VERSION_0_58
-+ stream=new MemStream(buf,0,(Guint)len,std::move(obj));
-+ #else
- obj.initNull();
- stream=new MemStream(buf,0,(Guint)len,&obj);
-+ #endif
- test=new PDFDoc (stream,0,0);
-
- if (!test->isOk())
---
-2.13.5
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-05 15:20:00 UTC (rev 340524)
+++ PKGBUILD 2018-06-05 16:11:21 UTC (rev 340525)
@@ -15,8 +15,8 @@
'gambas3-gb-sdl2-audio' 'gambas3-gb-sdl2' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal'
'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-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
-pkgver=3.10.0
-pkgrel=6
+pkgver=3.11.3
+pkgrel=1
pkgdesc="A free development environment based on a Basic interpreter."
arch=('x86_64')
url="http://gambas.sourceforge.net/"
@@ -25,18 +25,15 @@
makedepends=('intltool' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'gtk3'
'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite' 'librsvg'
- 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'libxtst'
+ 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'sdl2' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'libxtst'
'pcre' 'qt4' 'qt5-webkit' 'qt5-x11extras' 'qt5-svg' 'libxcursor' 'libsm' 'dbus' 'libxml2'
'libxslt' 'libgnome-keyring' 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses'
'gmime')
options=('!emptydirs' 'libtool')
-source=("${pkgbase}-${pkgver}::https://gitlab.com/gambas/gambas/repository/v${pkgver}/archive.tar.bz2"
- 'prefer-qt5.patch' '0001-adapt-to-poppler-0.58.patch' 'sdl2_mixer.diff' 'gambas-poppler-0.64.patch')
-md5sums=('ca2bd77b4a6b0b5f2b36de335e2d4384'
- '71131eb16bbdf27bf6d329f089602cf7'
- 'f82c6633e79a07e2b6542ec1ceccfbff'
- '57c5a2125a526a6011f68a405480a3af'
- 'd84b0a03e2bfc50e5267255d6b24e220')
+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)
+sha512sums=('d5ca1b80feb8272fef719ef9d30a10bac9a2bb9f095cc5ca8370da72fa0e04a4aa2c6ba7a0112563879dcebc197831e72a12cb9e36c3186445559350aa6c6e06'
+ '51daba92877e52f578c74f0c46f58151a9ee7cdd32993845f269d598cca7c0068880a47a3ec3f9e3e862032be5b2b37c4c35e2ee50f72f117ba627f337ef26d7')
create_dirs() {
install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -44,27 +41,16 @@
}
prepare() {
- cd ${srcdir}/gambas-v${pkgver}-*
+ cd ${srcdir}/gambas-${pkgver}
- # Prefer Qt5 over Qt4 for the IDE (Qt4 will not work due to the QtWebkit removal)
- patch -Np1 -i ../prefer-qt5.patch
-
- # poppler 0.58 buildfix
- patch -Np1 -i ../0001-adapt-to-poppler-0.58.patch
+ # merged upstream
+ patch -Np1 -i ../0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
- # fix build with poppler 0.64
- patch -p1 -i ../gambas-poppler-0.64.patch
-
- # fix build with sdl2_mixer >= 2.0.2
- # Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
- # renamed to MIX_INIT_MID.
- patch -Np1 -i ../sdl2_mixer.diff
-
./reconf-all
}
build() {
- cd ${srcdir}/gambas-v${pkgver}-*
+ cd ${srcdir}/gambas-${pkgver}
./configure --prefix=/usr
@@ -1109,7 +1095,7 @@
mv -v usr/bin/gb{r,x}3 ${pkgdir}/usr/bin
mv -v usr/lib/gambas3/* ${pkgdir}/usr/lib/gambas3/
mv -v usr/share/gambas3/info/* ${pkgdir}/usr/share/gambas3/info/
- install -m644 ${srcdir}/gambas-v${pkgver}-*/main/mime/* ${pkgdir}/usr/share/gambas3/mime/
+ install -m644 ${srcdir}/gambas-${pkgver}/main/mime/* ${pkgdir}/usr/share/gambas3/mime/
install -m644 ${pkgdir}/usr/share/gambas3/mime/application-x-gambas3.png ${pkgdir}/usr/share/gambas3/icons/
}
@@ -1141,8 +1127,8 @@
mv -v usr/share/appdata ${pkgdir}/usr/share/
mv -v usr/share/gambas3/template ${pkgdir}/usr/share/gambas3/
- install -m644 ${srcdir}/gambas-v${pkgver}-*/app/desktop/gambas3.desktop ${pkgdir}/usr/share/applications/
- install -m644 ${srcdir}/gambas-v${pkgver}-*/app/desktop/gambas3.png ${pkgdir}/usr/share/pixmaps/
+ install -m644 ${srcdir}/gambas-${pkgver}/app/desktop/gambas3.desktop ${pkgdir}/usr/share/applications/
+ install -m644 ${srcdir}/gambas-${pkgver}/app/desktop/gambas3.png ${pkgdir}/usr/share/pixmaps/
}
package_gambas3-script() {
@@ -1155,5 +1141,5 @@
install -dm755 ${pkgdir}/usr/share/gambas3/mime
mv -v usr/bin/gb{s,w}3* ${pkgdir}/usr/bin/
- install -m644 ${srcdir}/gambas-v${pkgver}-*/app/mime/* ${pkgdir}/usr/share/gambas3/mime/
+ install -m644 ${srcdir}/gambas-${pkgver}/app/mime/* ${pkgdir}/usr/share/gambas3/mime/
}
Deleted: gambas-poppler-0.64.patch
===================================================================
--- gambas-poppler-0.64.patch 2018-06-05 15:20:00 UTC (rev 340524)
+++ gambas-poppler-0.64.patch 2018-06-05 16:11:21 UTC (rev 340525)
@@ -1,115 +0,0 @@
-diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
-index 80d2d97c5..7e44ebe98 100644
---- a/gb.pdf/src/CPdfDocument.cpp
-+++ b/gb.pdf/src/CPdfDocument.cpp
-@@ -99,7 +99,7 @@ END_PROPERTY
-
- ****************************************************************************/
-
--static void return_unicode_string(Unicode *unicode, int len)
-+static void return_unicode_string(const Unicode *unicode, int len)
- {
- static UnicodeMap *uMap = NULL;
-
-@@ -128,7 +128,7 @@ static void aux_return_string_info(void *_object, const char *key)
- {
- Object obj;
- Object dst;
-- GooString *goo_value;
-+ const GooString *goo_value;
- Dict *info_dict;
- char *tmpstr;
-
-@@ -170,7 +170,7 @@ static void aux_return_date_info(void *_object, const char *key)
- GB_DATE ret;
- Object obj;
- Object dst;
-- GooString *goo;
-+ const GooString *goo;
- Dict *info_dict;
- char *datestr=NULL,*tofree=NULL;
- int nnum;
-@@ -221,7 +221,7 @@ static void aux_return_date_info(void *_object, const char *key)
- #endif
- }
-
--static LinkDest *get_dest(LinkAction *act)
-+static const LinkDest *get_dest(LinkAction *act)
- {
- if (!act)
- return 0;
-@@ -237,9 +237,9 @@ static LinkDest *get_dest(LinkAction *act)
- static uint32_t aux_get_page_from_action(void *_object, LinkAction *act)
- {
- Ref pref;
-- LinkDest *dest = get_dest(act);
-+ const LinkDest *dest = get_dest(act);
- #if POPPLER_VERSION_0_6
-- GooString *name;
-+ const GooString *name;
- #else
- UGooString *name;
- #endif
-@@ -272,7 +272,7 @@ static uint32_t aux_get_page_from_action(void *_object, LinkAction *act)
-
- static void aux_get_dimensions_from_action(LinkAction *act, CPDFRECT *rect)
- {
-- LinkDest *dest = get_dest(act);
-+ const LinkDest *dest = get_dest(act);
- if (!dest)
- return;
-
-@@ -284,7 +284,7 @@ static void aux_get_dimensions_from_action(LinkAction *act, CPDFRECT *rect)
-
- static double aux_get_zoom_from_action(LinkAction *act)
- {
-- LinkDest *dest = get_dest(act);
-+ const LinkDest *dest = get_dest(act);
- if (dest)
- return dest->getZoom();
- else
-@@ -295,7 +295,7 @@ static char* aux_get_target_from_action(LinkAction *act)
- {
- char *vl=NULL;
- char *uni=NULL;
-- GooString *tmp=NULL;
-+ const GooString *tmp=NULL;
-
- switch (act->getKind())
- {
-@@ -480,7 +480,7 @@ int32_t open_document (void *_object, char *sfile, int32_t lfile)
- #endif
-
- outline=THIS->doc->getOutline();
-- if (outline) THIS->index=outline->getItems();
-+ if (outline) THIS->index=(GooList*)outline->getItems();
-
- //if (THIS->index)
- // if (!THIS->index->getLength()) THIS->index=NULL;
-@@ -715,7 +715,7 @@ BEGIN_PROPERTY(PDFDOCUMENT_index)
-
- if (!THIS->index) { GB.ReturnNull(); return; }
-
-- THIS->action=((OutlineItem*)THIS->index->get(THIS->currindex))->getAction();
-+ THIS->action=(LinkAction*)((OutlineItem*)THIS->index->get(THIS->currindex))->getAction();
- RETURN_SELF();
-
- END_PROPERTY
-@@ -764,7 +764,7 @@ BEGIN_METHOD_VOID(PDFINDEX_root)
- Outline *outline;
-
- outline=THIS->doc->getOutline();
-- if (outline) THIS->index=outline->getItems();
-+ if (outline) THIS->index=(GooList*)outline->getItems();
- THIS->currindex=0;
- if (THIS->pindex) { GB.FreeArray(POINTER(&THIS->pindex)); THIS->pindex=NULL; }
- if (THIS->oldindex) { GB.FreeArray(POINTER(&THIS->oldindex)); THIS->oldindex=NULL; }
-@@ -812,7 +812,7 @@ BEGIN_METHOD_VOID(PDFINDEX_child)
- if (!item->isOpen()) item->open();
- THIS->pindex[GB.Count(POINTER(THIS->pindex))-1]=(void*)THIS->index;
- THIS->oldindex[GB.Count(POINTER(THIS->pindex))-1]=THIS->currindex;
-- THIS->index=item->getKids();
-+ THIS->index=(GooList*)item->getKids();
- THIS->currindex=0;
-
- GB.ReturnBoolean(false);
Deleted: prefer-qt5.patch
===================================================================
--- prefer-qt5.patch 2018-06-05 15:20:00 UTC (rev 340524)
+++ prefer-qt5.patch 2018-06-05 16:11:21 UTC (rev 340525)
@@ -1,57 +0,0 @@
-diff -Naur gambas3-3.9.2.orig/main/lib/gui/main.c gambas3-3.9.2/main/lib/gui/main.c
---- gambas3-3.9.2.orig/main/lib/gui/main.c 2016-12-17 13:38:03.000000000 +0100
-+++ gambas3-3.9.2/main/lib/gui/main.c 2017-02-08 15:20:42.767501760 +0100
-@@ -36,7 +36,7 @@
- NULL
- };
-
--char *GB_INCLUDE EXPORT = "gb.qt4";
-+char *GB_INCLUDE EXPORT = "gb.qt5";
-
- int EXPORT GB_INIT(void)
- {
-diff -Naur gambas3-3.9.2.orig/main/lib/gui.opengl/main.c gambas3-3.9.2/main/lib/gui.opengl/main.c
---- gambas3-3.9.2.orig/main/lib/gui.opengl/main.c 2016-12-17 13:38:04.000000000 +0100
-+++ gambas3-3.9.2/main/lib/gui.opengl/main.c 2017-02-08 15:20:42.790835802 +0100
-@@ -32,7 +32,7 @@
- NULL
- };
-
--char *GB_INCLUDE EXPORT = "gb.qt4.opengl";
-+char *GB_INCLUDE EXPORT = "gb.qt5.opengl";
-
- int EXPORT GB_INIT(void)
- {
-diff -Naur gambas3-3.9.2.orig/main/lib/gui.qt/main.c gambas3-3.9.2/main/lib/gui.qt/main.c
---- gambas3-3.9.2.orig/main/lib/gui.qt/main.c 2016-12-17 13:38:04.000000000 +0100
-+++ gambas3-3.9.2/main/lib/gui.qt/main.c 2017-02-08 15:20:42.790835802 +0100
-@@ -36,7 +36,7 @@
- NULL
- };
-
--char *GB_INCLUDE EXPORT = "gb.qt4";
-+char *GB_INCLUDE EXPORT = "gb.qt5";
-
- int EXPORT GB_INIT(void)
- {
-@@ -58,7 +58,7 @@
-
- if (use == USE_NOTHING)
- {
-- use = USE_GB_QT4;
-+ use = USE_GB_QT5;
-
- env = getenv("KDE_FULL_SESSION");
-
-diff -Naur gambas3-3.9.2.orig/main/lib/gui.qt.webkit/main.c gambas3-3.9.2/main/lib/gui.qt.webkit/main.c
---- gambas3-3.9.2.orig/main/lib/gui.qt.webkit/main.c 2016-12-17 13:38:04.000000000 +0100
-+++ gambas3-3.9.2/main/lib/gui.qt.webkit/main.c 2017-02-08 15:20:42.790835802 +0100
-@@ -32,7 +32,7 @@
- NULL
- };
-
--char *GB_INCLUDE EXPORT = "gb.qt4.webkit";
-+char *GB_INCLUDE EXPORT = "gb.qt5.webkit";
-
- int EXPORT GB_INIT(void)
- {
More information about the arch-commits
mailing list