Date: Saturday, May 7, 2016 @ 21:00:49 Author: muflone Revision: 174231
upgpkg: bluegriffon 1.8-2 Added: bluegriffon/trunk/bug_70722_include_next_in_cmath.patch Modified: bluegriffon/trunk/PKGBUILD Deleted: bluegriffon/trunk/bluegriffon.install ---------------------------------------+ PKGBUILD | 6 ++++-- bluegriffon.install | 12 ------------ bug_70722_include_next_in_cmath.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-07 18:43:16 UTC (rev 174230) +++ PKGBUILD 2016-05-07 19:00:49 UTC (rev 174231) @@ -6,7 +6,7 @@ pkgver=1.8 _mozilla_ver=fec90cbfbaad _github_ver=5961e4cbc9ea546f9d7e4b9a7f2bb6884d66a378 -pkgrel=1 +pkgrel=2 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox" arch=('i686' 'x86_64') url="http://bluegriffon.org/" @@ -15,11 +15,11 @@ 'nss' 'libevent' 'libvpx' 'libxt' 'python2' 'startup-notification') makedepends=('autoconf2.13' 'libpulse' 'unzip' 'zip') options=('!emptydirs') -install="${pkgname}.install" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/therealglazou/${pkgname}/archive/${_github_ver}.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") sha256sums=('0c629f882a7b7fcdf4416871db8d522f43653b62c0e5a25168b1914af8448a11' @@ -26,6 +26,7 @@ '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd' '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6' '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd' + 'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b' 'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f' '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff') @@ -39,6 +40,7 @@ # 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 Deleted: bluegriffon.install =================================================================== --- bluegriffon.install 2016-05-07 18:43:16 UTC (rev 174230) +++ bluegriffon.install 2016-05-07 19:00:49 UTC (rev 174231) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Added: bug_70722_include_next_in_cmath.patch =================================================================== --- bug_70722_include_next_in_cmath.patch (rev 0) +++ bug_70722_include_next_in_cmath.patch 2016-05-07 19:00:49 UTC (rev 174231) @@ -0,0 +1,12 @@ +--- 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; + }