[arch-commits] Commit in gambas3/trunk (5 files)
Antonio Rojas
arojas at archlinux.org
Wed Apr 24 12:00:24 UTC 2019
Date: Wednesday, April 24, 2019 @ 12:00:23
Author: arojas
Revision: 453286
Remove old patches
Deleted:
gambas3/trunk/0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch
gambas3/trunk/gambas-poppler-0.71.patch
gambas3/trunk/gambas-poppler-0.72.patch
gambas3/trunk/gambas-poppler-0.73.patch
gambas3/trunk/sdl2_mixer.diff
--------------------------------------------------------------+
0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch | 32 ----
gambas-poppler-0.71.patch | 63 --------
gambas-poppler-0.72.patch | 72 ----------
gambas-poppler-0.73.patch | 17 --
sdl2_mixer.diff | 11 -
5 files changed, 195 deletions(-)
Deleted: 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 2019-04-24 11:58:37 UTC (rev 453285)
+++ 0001-GB.SDL2-fix-detection-with-at-least-pkgconf-2.4.2.patch 2019-04-24 12:00:23 UTC (rev 453286)
@@ -1,32 +0,0 @@
-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: gambas-poppler-0.71.patch
===================================================================
--- gambas-poppler-0.71.patch 2019-04-24 11:58:37 UTC (rev 453285)
+++ gambas-poppler-0.71.patch 2019-04-24 12:00:23 UTC (rev 453286)
@@ -1,63 +0,0 @@
---- gambas-3.11.4/gb.pdf/src/CPdfDocument.cpp.orig 2018-11-01 20:05:27.379728413 +0000
-+++ gambas-3.11.4/gb.pdf/src/CPdfDocument.cpp 2018-11-01 20:05:51.586459136 +0000
-@@ -478,7 +478,7 @@
- THIS->len=len;
-
- white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
-- THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
-+ THIS->dev=new SplashOutputDev(splashModeRGB8, 3, false, white);
-
- #if POPPLER_VERSION_0_20
- THIS->dev->startDoc(THIS->doc);
-@@ -922,17 +922,17 @@
- #if POPPLER_VERSION_0_20
- THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- rotation,
-- gFalse,
-- gTrue,
-+ false,
-+ true,
- x,y,w,h,
-- gFalse);
-+ false);
- #else
- THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- rotation,
-- gFalse,
-- gTrue,
-+ false,
-+ true,
- x,y,w,h,
-- gFalse,
-+ false,
- THIS->doc->getCatalog ());
- #endif
-
-@@ -994,11 +994,11 @@
- 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);
-+ dev = new TextOutputDev (NULL, true, 0, false, false);
-+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,false,true,-1, -1, -1, -1, false, 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);
-+ dev = new TextOutputDev (NULL, true, false, false);
-+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,false,true,-1, -1, -1, -1, false,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
- #endif
-
- THIS->page->display(gfx);
-@@ -1226,9 +1226,9 @@
-
- count = 0;
- #if POPPLER_VERSION_0_20
-- while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
-+ while (textdev->findText (block,nlen,false,true,true,false,sensitive,false,false,&x0,&y0,&x1,&y1))
- #else
-- while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
-+ while (textdev->findText (block,nlen,false,true,true,false,sensitive,false,&x0,&y0,&x1,&y1))
- #endif
- {
- if (!THIS->Found)
Deleted: gambas-poppler-0.72.patch
===================================================================
--- gambas-poppler-0.72.patch 2019-04-24 11:58:37 UTC (rev 453285)
+++ gambas-poppler-0.72.patch 2019-04-24 12:00:23 UTC (rev 453286)
@@ -1,72 +0,0 @@
-diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
-index 64cc92796..6a0654bb8 100644
---- a/gb.pdf/src/CPdfDocument.cpp
-+++ b/gb.pdf/src/CPdfDocument.cpp
-@@ -120,7 +120,7 @@ static void return_unicode_string(const Unicode *unicode, int len)
- gstr.append(buf, n);
- }
-
-- GB.ReturnNewZeroString(gstr.getCString());
-+ GB.ReturnNewZeroString(gstr.c_str());
- }
-
-
-@@ -151,11 +151,11 @@ static void aux_return_string_info(void *_object, const char *key)
-
- if (goo_value->hasUnicodeMarker())
- {
-- GB.ConvString (&tmpstr,goo_value->getCString()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
-+ GB.ConvString (&tmpstr,goo_value->c_str()+2,goo_value->getLength()-2,"UTF-16BE","UTF-8");
- GB.ReturnNewZeroString(tmpstr);
- }
- else
-- GB.ReturnNewString(goo_value->getCString(),goo_value->getLength());
-+ GB.ReturnNewString(goo_value->c_str(),goo_value->getLength());
- }
- #if ! POPPLER_VERSION_0_58
- dst.free();
-@@ -194,10 +194,10 @@ static void aux_return_date_info(void *_object, const char *key)
- {
- goo = dst.getString();
- if (goo->hasUnicodeMarker())
-- GB.ConvString (&datestr,goo->getCString()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
-+ GB.ConvString (&datestr,goo->c_str()+2,goo->getLength()-2,"UTF-16BE","UTF-8");
- else
- {
-- datestr = GB.NewString(goo->getCString(),goo->getLength());
-+ datestr = GB.NewString(goo->c_str(),goo->getLength());
- tofree=datestr;
- }
-
-@@ -333,11 +333,11 @@ static char* aux_get_target_from_action(const_LinkAction *act)
-
- if (tmp->hasUnicodeMarker())
- {
-- GB.ConvString (&uni,tmp->getCString()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
-+ GB.ConvString (&uni,tmp->c_str()+2,tmp->getLength()-2,"UTF-16BE","UTF-8");
- vl = GB.AddString(vl, uni, 0);
- }
- else
-- vl = GB.AddString(vl,tmp->getCString(),tmp->getLength());
-+ vl = GB.AddString(vl,tmp->c_str(),tmp->getLength());
-
-
- return vl;
-@@ -1015,7 +1015,7 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGE
- return;
- }
-
-- GB.ReturnNewString(str->getCString(),str->getLength());
-+ GB.ReturnNewString(str->c_str(),str->getLength());
- delete str;
-
- END_METHOD
-@@ -1081,7 +1081,7 @@ BEGIN_PROPERTY (PDFPAGELINKDATA_parameters)
- return;
- }
-
-- GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->getCString());
-+ GB.ReturnNewZeroString(((LinkLaunch*)THIS->action)->getParams()->c_str());
-
- END_PROPERTY
-
Deleted: gambas-poppler-0.73.patch
===================================================================
--- gambas-poppler-0.73.patch 2019-04-24 11:58:37 UTC (rev 453285)
+++ gambas-poppler-0.73.patch 2019-04-24 12:00:23 UTC (rev 453286)
@@ -1,17 +0,0 @@
-diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
-index 3162f0deb..75a4057e5 100644
---- a/gb.pdf/src/CPdfDocument.cpp
-+++ b/gb.pdf/src/CPdfDocument.cpp
-@@ -457,10 +457,10 @@ 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));
-+ stream=new MemStream(buf,0,(unsigned int)len,std::move(obj));
- #else
- obj.initNull();
-- stream=new MemStream(buf,0,(Guint)len,&obj);
-+ stream=new MemStream(buf,0,(unsigned int)len,&obj);
- #endif
- test=new PDFDoc (stream,0,0);
-
Deleted: sdl2_mixer.diff
===================================================================
--- sdl2_mixer.diff 2019-04-24 11:58:37 UTC (rev 453285)
+++ sdl2_mixer.diff 2019-04-24 12:00:23 UTC (rev 453286)
@@ -1,11 +0,0 @@
---- a/gb.sdl2/src/audio/main.c 2017-07-18 17:48:44.000000000 +0200
-+++ b/gb.sdl2/src/audio/main.c.new 2017-11-09 21:33:11.442013948 +0100
-@@ -58,7 +58,7 @@
- init_mixer(MIX_INIT_OGG, "OGG");
- init_mixer(MIX_INIT_MOD, "MOD");
- init_mixer(MIX_INIT_FLAC, "FLAC");
-- init_mixer(MIX_INIT_FLUIDSYNTH, "FLUIDSYNTH");
-+ init_mixer(MIX_INIT_MID, "MID");
-
- if (Mix_OpenAudio(AUDIO_frequency, MIX_DEFAULT_FORMAT, 2, AUDIO_buffer_size))
- {
More information about the arch-commits
mailing list