* Upstream upgrade of bgrabitmapver to 8.7.

* Remove already added upstream fixes.
* Add fix which allows to compile in qt4 widgetset.

6 files changed, 50 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00b5e3debb72..3b46b9c15713 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lazpaint-qt4
 	pkgdesc = Image editor, like PaintBrush or Paint.Net, written in Lazarus (Free Pascal).
 	pkgver = 6.4.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://sourceforge.net/projects/lazpaint/
 	install = lazpaint.install
 	arch = i686
@@ -15,22 +15,22 @@ pkgbase = lazpaint-qt4
 	conflicts = lazpaint-gtk2
 	source = http://downloads.sourceforge.net/project/lazpaint/src/lazpaint6.4.1_src.zip
 	source = http://downloads.sourceforge.net/project/lazpaint/src/inet0.6.6.zip
-	source = http://downloads.sourceforge.net/project/lazpaint/src/bgrabitmap8.5.1.zip
+	source = http://downloads.sourceforge.net/project/lazpaint/src/bgrabitmap8.7.zip
 	source = http://downloads.sourceforge.net/project/bgra-controls/bgra-controls-3.0/bgracontrols-3.6-2015-05-02.zip
 	source = lazpaint.desktop
 	source = lazpaint.png
 	source = language_path_fix.patch
-	source = bgrabitmap_disable_optimization.patch
-	source = bgrabitmap_fix_qt_compilation.patch
+	source = bug_22_fix.patch
+	source = bug_28_fix.patch
 	md5sums = 2ac6eaeedbda6332028a659fdcd58045
 	md5sums = 63e9ae30886fdd3ee309a12bdc0ff613
-	md5sums = f276aa0153d8f04288e28ad6a430eff6
+	md5sums = 3d97daf8bb9ff1a2778b63d11f57e528
 	md5sums = f9c699fc31221355defef022cfb41ef7
 	md5sums = e6f4f8c4d9456b21ed4a25d7b775fec4
 	md5sums = 8f26062ad1e3222d375201d96341716c
 	md5sums = 432a9cea4a7bde018869b5a2ee5af7c3
-	md5sums = ac1568044af330d53da5d4b27797dbf7
-	md5sums = 3349a78f598d8e5ef4a753d3fb3f75b1
+	md5sums = 20c12644e674bb612cc4fd41b7ebe9cc
+	md5sums = e24a3d1bb7149beba4122a0fb86dae81
 
 pkgname = lazpaint-qt4
 
diff --git a/PKGBUILD b/PKGBUILD
index 644ac693a2e4..dbda81ee3291 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ pkgname=lazpaint-qt4
 _pkgname=lazpaint
 pkgver=6.4.1
 _inetver=0.6.6
-_bgrabitmapver=8.5.1
+_bgrabitmapver=8.7
 _bgracontrolsver=3.6-2015-05-02
-pkgrel=2
+pkgrel=3
 pkgdesc='Image editor, like PaintBrush or Paint.Net, written in Lazarus (Free Pascal).'
 arch=(i686 x86_64)
 url='http://sourceforge.net/projects/lazpaint/'
@@ -23,29 +23,32 @@ source=(http://downloads.sourceforge.net/project/${_pkgname}/src/${_pkgname}${pk
         ${_pkgname}.desktop
         ${_pkgname}.png
         language_path_fix.patch
-        bgrabitmap_disable_optimization.patch
-        bgrabitmap_fix_qt_compilation.patch)
+        bug_22_fix.patch
+        bug_28_fix.patch)
 md5sums=(2ac6eaeedbda6332028a659fdcd58045
          63e9ae30886fdd3ee309a12bdc0ff613
-         f276aa0153d8f04288e28ad6a430eff6
+         3d97daf8bb9ff1a2778b63d11f57e528
          f9c699fc31221355defef022cfb41ef7
          e6f4f8c4d9456b21ed4a25d7b775fec4
          8f26062ad1e3222d375201d96341716c
          432a9cea4a7bde018869b5a2ee5af7c3
-         ac1568044af330d53da5d4b27797dbf7
-         3349a78f598d8e5ef4a753d3fb3f75b1)
+         20c12644e674bb612cc4fd41b7ebe9cc
+         e24a3d1bb7149beba4122a0fb86dae81)
 _ws=qt
 
 prepare() {
   cd ${srcdir}
 
   patch -p0 < language_path_fix.patch
-  # http://sourceforge.net/p/lazpaint/bugs/20/
-  patch -p0 < bgrabitmap_disable_optimization.patch
-  # http://sourceforge.net/p/lazpaint/bugs/21/
-  patch -p0 < bgrabitmap_fix_qt_compilation.patch
 
-  mkdir config
+  # http://sourceforge.net/p/lazpaint/bugs/22/
+  patch -p0 < bug_22_fix.patch
+
+  # http://sourceforge.net/p/lazpaint/bugs/28/
+  cd ${srcdir}/bgrabitmap${_bgrabitmapver}
+  patch -p1 < ${srcdir}/bug_28_fix.patch
+
+  mkdir ${srcdir}/config
 }
 
 build() {
diff --git a/bgrabitmap_disable_optimization.patch b/bgrabitmap_disable_optimization.patch
deleted file mode 100644
index 13efe8c8fe2a..000000000000
--- a/bgrabitmap_disable_optimization.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN bgrabitmap8.5.1/bgrapath.pas bgrabitmap8.5.1_p/bgrapath.pas
---- bgrabitmap8.5.1/bgrapath.pas	2015-04-29 19:20:24.000000000 +0200
-+++ bgrabitmap8.5.1_p/bgrapath.pas	2015-05-05 22:25:53.854300675 +0200
-@@ -2532,7 +2532,9 @@ begin
-     transformedArc.radius := arcDef.radius*FScale;

-     transformedArc.xAngleRadCW := arcDef.xAngleRadCW+FAngleRadCW;

-     PArcElement(AllocateElement(peArc))^ := transformedArc;

-+    {$PUSH}{$OPTIMIZATION OFF}

-     SetLastCoord(ArcEndPoint(arcDef));

-+    {$POP}

-   end;

- end;

- 

diff --git a/bgrabitmap_fix_qt_compilation.patch b/bgrabitmap_fix_qt_compilation.patch
deleted file mode 100644
index 90a6a912ff42..000000000000
--- a/bgrabitmap_fix_qt_compilation.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -rupN bgrabitmap8.5.1/bgraqtbitmap.pas bgrabitmap8.5.1_p/bgraqtbitmap.pas
---- bgrabitmap8.5.1/bgraqtbitmap.pas	2015-04-15 15:09:04.000000000 +0200
-+++ bgrabitmap8.5.1_p/bgraqtbitmap.pas	2015-05-05 22:16:21.450982555 +0200
-@@ -28,14 +28,14 @@ interface
- 

- uses

-   Classes, SysUtils, BGRALCLBitmap, Graphics,

--  GraphType;

-+  GraphType, BGRABitmapTypes;

- 

- type

-   { TBGRAQtBitmap }

- 

-   TBGRAQtBitmap = class(TBGRALCLBitmap)

-   private

--    procedure SlowDrawTransparent(ABitmap: TBGRALCLBitmap;

-+    procedure SlowDrawTransparent(ABitmap: TBGRACustomBitmap;

-       ACanvas: TCanvas; ARect: TRect);

-   public

-     procedure DataDrawTransparent(ACanvas: TCanvas; Rect: TRect;

-@@ -51,12 +51,12 @@ type
- 

- implementation

- 

--uses BGRABitmapTypes, LCLType,

-+uses LCLType,

-   LCLIntf, IntfGraphics,

-   qtobjects, qt4,

-   FPImage;

- 

--procedure TBGRAQtBitmap.SlowDrawTransparent(ABitmap: TBGRALCLBitmap;

-+procedure TBGRAQtBitmap.SlowDrawTransparent(ABitmap: TBGRACustomBitmap;

-   ACanvas: TCanvas; ARect: TRect);

- begin

-   ACanvas.StretchDraw(ARect, ABitmap.Bitmap);

-@@ -65,9 +65,9 @@ end;
- procedure TBGRAQtBitmap.DataDrawTransparent(ACanvas: TCanvas; Rect: TRect;

-   AData: Pointer; ALineOrder: TRawImageLineOrder; AWidth, AHeight: integer);

- var

--  Temp: TBGRAPtrBitmap;

-+  Temp: TBGRALCLPtrBitmap;

- begin

--  Temp := TBGRAPtrBitmap.Create(AWidth, AHeight, AData);

-+  Temp := TBGRALCLPtrBitmap.Create(AWidth, AHeight, AData);

-   Temp.LineOrder := ALineOrder;

-   SlowDrawTransparent(Temp, ACanvas, Rect);

-   Temp.Free;

-@@ -143,7 +143,6 @@ begin
-   SrcX     := x + Ofs.X;

-   SrcY     := y + Ofs.Y;

- 

--  {$warning QT: recheck this}

-   if (dcSource.vImage <> nil) and (dcSource.vImage.Handle <> nil) then

-   begin

-     // we must stop painting on device

-@@ -156,10 +155,6 @@ begin
-       QPainter_begin(dcDest.Widget, TQtImage(bmp.Handle).Handle);

-   end;

- 

--  (*

--  gdk_window_copy_area(dcDest.Drawable, dcDest.GC, 0, 0, dcSource.Drawable,

--    SrcX, SrcY, Width, Height);

--  *)

-   LoadFromRawImage(bmp.RawImage, 255, True);

-   bmp.Free;

-   InvalidateBitmap;

diff --git a/bug_22_fix.patch b/bug_22_fix.patch
new file mode 100644
index 000000000000..832ebb092afb
--- /dev/null
+++ b/bug_22_fix.patch
@@ -0,0 +1,12 @@
+diff -rupN lazpaint/utranslation.pas lazpaint_p/utranslation.pas
+--- lazpaint/utranslation.pas	2014-08-12 16:38:38.000000000 +0200
++++ lazpaint_p/utranslation.pas	2015-09-10 22:39:19.309513345 +0200
+@@ -32,7 +32,7 @@ procedure TranslateLazPaint(AConfig: TIn
+ 

+ implementation

+ 

+-uses Forms, FileUtil, LCLProc, LResources, DefaultTranslator, Translations, LazPaintType;

++uses Forms, FileUtil, LCLProc, LResources, LCLTranslator, Translations, LazPaintType;

+ 

+ {$ifdef Darwin}

+ function GetResourcesPath(): string;

diff --git a/bug_28_fix.patch b/bug_28_fix.patch
new file mode 100644
index 000000000000..b4ba3b36e35e
--- /dev/null
+++ b/bug_28_fix.patch
@@ -0,0 +1,16 @@
+diff --git a/bgraqtbitmap.pas b/bgraqtbitmap.pas
+index c232c8d..39cb0f9 100644
+--- a/bgraqtbitmap.pas
++++ b/bgraqtbitmap.pas
+@@ -107,9 +107,9 @@ begin
+ 

+   RawImage.Init;

+   if TBGRAPixel_RGBAOrder then

+-    RawImage.Description.Init_BPP32_R8G8B8_BIO_TTB(AWidth, AHeight)

++    RawImage.Description.Init_BPP32_R8G8B8A8_BIO_TTB(AWidth, AHeight)

+   else

+-    RawImage.Description.Init_BPP32_B8G8R8_BIO_TTB(AWidth, AHeight);

++    RawImage.Description.Init_BPP32_B8G8R8A8_BIO_TTB(AWidth, AHeight);

+   RawImage.Description.LineOrder := ALineOrder;

+   RawImage.Description.LineEnd := rileDWordBoundary;

+   RawImage.Data     := PByte(AData);