Date: Wednesday, December 2, 2020 @ 09:07:08 Author: foutrelis Revision: 769114
Remove old patches Deleted: gambas3/trunk/0001-Fix-segfault-with-poppler-0.83.patch gambas3/trunk/0001-Packager-Fix-ArchLinux-packager.patch gambas3/trunk/0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch gambas3/trunk/gambas-poppler-0.86.patch gambas3/trunk/gambas-postgresql-12.patch --------------------------------------------------------------+ 0001-Fix-segfault-with-poppler-0.83.patch | 29 ----- 0001-Packager-Fix-ArchLinux-packager.patch | 29 ----- 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch | 54 ---------- gambas-poppler-0.86.patch | 38 ------- gambas-postgresql-12.patch | 27 ----- 5 files changed, 177 deletions(-) Deleted: 0001-Fix-segfault-with-poppler-0.83.patch =================================================================== --- 0001-Fix-segfault-with-poppler-0.83.patch 2020-12-02 09:04:12 UTC (rev 769113) +++ 0001-Fix-segfault-with-poppler-0.83.patch 2020-12-02 09:07:08 UTC (rev 769114) @@ -1,29 +0,0 @@ -From 36c093cb21d9dab3aae35f64d44e5883eefe020e Mon Sep 17 00:00:00 2001 -From: Laurent Carlier <lordhea...@gmail.com> -Date: Thu, 23 Jan 2020 18:02:44 +0100 -Subject: [PATCH] Fix segfault with poppler>0.83 - -[GB.PDF] -* BUG: Fix segfault with poppler > 0.83 - -Signed-off-by: Laurent Carlier <lordhea...@gmail.com> ---- - gb.pdf/src/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gb.pdf/src/main.cpp b/gb.pdf/src/main.cpp -index 2d7f02ca0..62923cc34 100644 ---- a/gb.pdf/src/main.cpp -+++ b/gb.pdf/src/main.cpp -@@ -56,7 +56,7 @@ int EXPORT GB_INIT(void) - if (!globalParams) - { - #if POPPLER_VERSION_0_83 -- globalParams = std::unique_ptr<GlobalParams>(); -+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams()); - #else - globalParams = new GlobalParams(); - #endif --- -2.25.0 - Deleted: 0001-Packager-Fix-ArchLinux-packager.patch =================================================================== --- 0001-Packager-Fix-ArchLinux-packager.patch 2020-12-02 09:04:12 UTC (rev 769113) +++ 0001-Packager-Fix-ArchLinux-packager.patch 2020-12-02 09:07:08 UTC (rev 769114) @@ -1,29 +0,0 @@ -From 989a1266a20f360f1b2db3635a35cc5bbb95d763 Mon Sep 17 00:00:00 2001 -From: gambas <g4m...@gmail.com> -Date: Mon, 27 Jan 2020 08:24:52 +0100 -Subject: [PATCH] Packager: Fix ArchLinux packager. - -[DEVELOPMENT ENVIRONMENT] -* BUG: Packager: Fix ArchLinux packager. - -Signed-off-by: Laurent Carlier <lordhea...@gmail.com> ---- - app/src/gambas3/.src/Packager/Package.module | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module -index 2d2ecae5a..2f741237c 100644 ---- a/app/src/gambas3/.src/Packager/Package.module -+++ b/app/src/gambas3/.src/Packager/Package.module -@@ -2467,7 +2467,7 @@ Private Function MakeArchPackage(sSys As String) - - Print #hFile, " install -d ${pkgdir}/usr/bin" - Print #hFile, " install -m755 " & $sName & ".gambas ${pkgdir}/usr/bin" &/ $sName -- If $sName <> sPackageName Then Print #hFile, " ln -s " & Shell$($sName) & " \"$(pkgdir)\"/usr/bin" &/ Shell$(sPackageName) -+ If $sName <> sPackageName Then Print #hFile, " ln -s " & Shell$($sName) & " \"${pkgdir}\"/usr/bin" &/ Shell$(sPackageName) - Print #hFile, " install -D .." &/ Project.Name & ".png \\" - Print #hFile, " ${pkgdir}/usr/share/pixmaps" &/ Project.Name & ".png" - Print #hFile, " install -D .." &/ sPackageName & ".desktop \\" --- -2.25.0 - Deleted: 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch =================================================================== --- 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch 2020-12-02 09:04:12 UTC (rev 769113) +++ 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch 2020-12-02 09:07:08 UTC (rev 769114) @@ -1,54 +0,0 @@ -From 6a16e02ee3a0f05cd70876d76f807ab5076440b1 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evange...@foutrelis.com> -Date: Thu, 30 Jan 2020 21:08:47 +0200 -Subject: [PATCH] Use GlobalParams::getUtf8Map() found in poppler 0.85 - -[GB.PDF] -* BUG: Make 'gb.pdf' compile with poppler >= 0.85. ---- - gb.pdf/configure.ac | 2 ++ - gb.pdf/src/CPdfDocument.cpp | 7 +++++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac -index 691e3088a..1dd10b455 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_76, $((1-$?)), Poppler version >= 0.76) - pkg-config --atleast-version=0.83.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_83, $((1-$?)), Poppler version >= 0.83) -+ pkg-config --atleast-version=0.85.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_85, $((1-$?)), Poppler version >= 0.85) - fi - - AC_OUTPUT( \ -diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp -index 9522d15db..4b53fd50d 100644 ---- a/gb.pdf/src/CPdfDocument.cpp -+++ b/gb.pdf/src/CPdfDocument.cpp -@@ -104,12 +104,14 @@ END_PROPERTY - - static void return_unicode_string(const Unicode *unicode, int len) - { -- static UnicodeMap *uMap = NULL; -- - GooString gstr; - char buf[8]; /* 8 is enough for mapping an unicode char to a string */ - int i, n; - -+#if POPPLER_VERSION_0_85 -+ const UnicodeMap *uMap = globalParams->getUtf8Map(); -+#else -+ static UnicodeMap *uMap = NULL; - if (uMap == NULL) - { - GooString *enc = new GooString("UTF-8"); -@@ -117,6 +119,7 @@ static void return_unicode_string(const Unicode *unicode, int len) - uMap->incRefCnt(); - delete enc; - } -+#endif - - for (i = 0; i < len; ++i) { - n = uMap->mapUnicode(unicode[i], buf, sizeof(buf)); Deleted: gambas-poppler-0.86.patch =================================================================== --- gambas-poppler-0.86.patch 2020-12-02 09:04:12 UTC (rev 769113) +++ gambas-poppler-0.86.patch 2020-12-02 09:07:08 UTC (rev 769114) @@ -1,38 +0,0 @@ -diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp -index 4b53fd50d..58a51aecf 100644 ---- a/gb.pdf/src/CPdfDocument.cpp -+++ b/gb.pdf/src/CPdfDocument.cpp -@@ -256,7 +256,7 @@ static uint32_t aux_get_page_from_action(void *_object, const_LinkAction *act) - name = ((LinkGoTo*)act)->getNamedDest(); - if (name) { - #if POPPLER_VERSION_0_64 -- dest = THIS->doc->findDest(name); -+ dest = THIS->doc->findDest(name).get(); - #else - dest = THIS->doc->findDest((GooString *) name); - #endif -@@ -307,6 +307,7 @@ static char* aux_get_target_from_action(const_LinkAction *act) - char *vl=NULL; - char *uni=NULL; - const_GooString *tmp=NULL; -+ GooString gstr; - - switch (act->getKind()) - { -@@ -317,13 +318,13 @@ static char* aux_get_target_from_action(const_LinkAction *act) - tmp=((LinkLaunch*)act)->getFileName(); break; - - case actionURI: -- tmp=((LinkURI*)act)->getURI(); break; -+ gstr=GooString(((LinkURI*)act)->getURI()); tmp=&gstr; break; - - case actionNamed: -- tmp=((LinkNamed*)act)->getName(); break; -+ gstr=GooString(((LinkNamed*)act)->getName()); tmp=&gstr; break; - - case actionMovie: -- tmp=((LinkMovie*)act)->getAnnotTitle(); break; -+ gstr=GooString(((LinkMovie*)act)->getAnnotTitle()); tmp=&gstr; break; - - default: - break; Deleted: gambas-postgresql-12.patch =================================================================== --- gambas-postgresql-12.patch 2020-12-02 09:04:12 UTC (rev 769113) +++ gambas-postgresql-12.patch 2020-12-02 09:07:08 UTC (rev 769114) @@ -1,27 +0,0 @@ -diff --git a/gb.db.postgresql/src/main.c b/gb.db.postgresql/src/main.c -index 5401768d4..e0cca37d5 100644 ---- a/gb.db.postgresql/src/main.c -+++ b/gb.db.postgresql/src/main.c -@@ -24,15 +24,18 @@ - - #define __MAIN_C - -+#include <libpq-fe.h> -+#include <postgres.h> -+#include <pg_type.h> -+ -+#undef fprintf -+#undef snprintf -+#undef sprintf - #include <stdio.h> - #include <stdlib.h> - #include <stdarg.h> - #include <string.h> - --#include <libpq-fe.h> --#include <postgres.h> --#include <pg_type.h> -- - #ifdef PACKAGE_NAME - #undef PACKAGE_NAME - #undef PACKAGE_BUGREPORT