From 5086411d48d7dd2c64ba0efe590c5e378209525b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 3 Jul 2016 18:16:52 +0000
Subject: [PATCH] community/bluegriffon to 2.1-1

---
 community/bluegriffon/PKGBUILD                    | 15 ++-------------
 .../bug_70722_include_next_in_cmath.patch         | 12 ------------
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 community/bluegriffon/bug_70722_include_next_in_cmath.patch

diff --git a/community/bluegriffon/PKGBUILD b/community/bluegriffon/PKGBUILD
index a41d9dcd2..16375cc23 100644
--- a/community/bluegriffon/PKGBUILD
+++ b/community/bluegriffon/PKGBUILD
@@ -9,7 +9,7 @@
 highmem=1
 
 pkgname=bluegriffon
-pkgver=2.0
+pkgver=2.1
 _mozilla_ver=f14898695ee0
 pkgrel=1
 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
@@ -22,17 +22,11 @@ makedepends=('autoconf2.13' 'libpulse' 'unzip' 'zip' 'yasm')
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/therealglazou/${pkgname}/archive/${pkgver}.tar.gz"
         "mozilla-central-${_mozilla_ver}.tar.bz2"::"http://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2"
-        "bug_1194520_add_ftfntfmt.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/af40750720b5"
-        "bug_1153109_CXX11_ABI.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/070d6e282fe4"
-        "bug_70722_include_next_in_cmath.patch"
         "mozconfig"
         "${pkgname}.desktop"
         "bug_1257019.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/d5e77c8d64c9")
-sha256sums=('266c2e3c4c4d1e8aec7f7013980e28330976569543a2fe179b5b36264f216b02'
+sha256sums=('524baa8fe0510c254d8e59a3aac1ff2aa26ee1cda7817a7a71ef8851c108eea4'
             '0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2'
-            '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
-            '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
-            'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b'
             'b548bd055dbddc0cae7ad9d9e98b9f540b2838003bacf69e10928842baa77c03'
             '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
             'cae36525cffd2869b5c76c1f48eac4d77e4b8b1c0767a0ddb967596f9dc6d717')
@@ -44,11 +38,6 @@ prepare() {
   cp -r "${srcdir}/${pkgname}-${pkgver}" bluegriffon
   cp "${srcdir}/mozconfig" .mozconfig
 
-  # Apply patches
-#  patch -p1 -i "${srcdir}/bug_1194520_add_ftfntfmt.patch"
-#  patch -p1 -i "${srcdir}/bug_1153109_CXX11_ABI.patch"
-#  patch -p1 -i "${srcdir}/bug_70722_include_next_in_cmath.patch"
-
   # Apply BlueGriffon's upstream customizations
   patch -Np1 -i bluegriffon/config/content.patch
 
diff --git a/community/bluegriffon/bug_70722_include_next_in_cmath.patch b/community/bluegriffon/bug_70722_include_next_in_cmath.patch
deleted file mode 100644
index 3e2a20741..000000000
--- a/community/bluegriffon/bug_70722_include_next_in_cmath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla-central-fec90cbfbaad/nsprpub/config/make-system-wrappers.pl.orig	2015-04-10 04:57:56.000000000 +0200
-+++ mozilla-central-fec90cbfbaad/nsprpub/config/make-system-wrappers.pl	2016-05-07 19:51:53.832876185 +0200
-@@ -19,7 +19,9 @@
-     open OUT, ">$output_dir/$_";
-     print OUT "#pragma GCC system_header\n";  # suppress include_next warning
-     print OUT "#pragma GCC visibility push(default)\n";
-+    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
-     print OUT "#include_next \<$_\>\n";
-+    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
-     print OUT "#pragma GCC visibility pop\n";
-     close OUT;
- }