[arch-commits] Commit in bluegriffon/trunk (PKGBUILD mozconfig)

[Fabio Castelli]

    Date: Sunday, June 26, 2016 @ 10:22:26
  Author: muflone
Revision: 181219

upgpkg: bluegriffon 2.0-1

Modified:
  bluegriffon/trunk/PKGBUILD
  bluegriffon/trunk/mozconfig

-----------+
 PKGBUILD  |   27 +++++++++++++--------------
 mozconfig |   43 +++++++++++--------------------------------
 2 files changed, 24 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-26 08:22:37 UTC (rev 181218)
+++ PKGBUILD	2016-06-26 10:22:26 UTC (rev 181219)
@@ -3,19 +3,18 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=bluegriffon
-pkgver=1.8
-_mozilla_ver=fec90cbfbaad
-_github_ver=5961e4cbc9ea546f9d7e4b9a7f2bb6884d66a378
-pkgrel=3
+pkgver=2.0
+_mozilla_ver=f14898695ee0
+pkgrel=1
 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
 arch=('i686' 'x86_64')
 url="http://bluegriffon.org/"
 license=('MPL' 'GPL' 'LGPL')
 depends=('alsa-lib' 'desktop-file-utils' 'dbus-glib' 'gtk2' 'hunspell' 'mozilla-common'
-         'nss' 'libevent' 'libvpx' 'libxt' 'python2' 'startup-notification')
-makedepends=('autoconf2.13' 'libpulse' 'unzip' 'zip')
+         'nss' 'libevent' 'libvpx' 'libxt' 'python2' 'startup-notification' 'gconf')
+makedepends=('autoconf2.13' 'libpulse' 'unzip' 'zip' 'yasm')
 options=('!emptydirs')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/therealglazou/${pkgname}/archive/${_github_ver}.tar.gz"
+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"
@@ -22,12 +21,12 @@
         "bug_70722_include_next_in_cmath.patch"
         "mozconfig"
         "${pkgname}.desktop")
-sha256sums=('0c629f882a7b7fcdf4416871db8d522f43653b62c0e5a25168b1914af8448a11'
-            '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd'
+sha256sums=('266c2e3c4c4d1e8aec7f7013980e28330976569543a2fe179b5b36264f216b02'
+            '0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2'
             '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
             '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
             'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b'
-            'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f'
+            '56832f428267dc31a2ae1e863edb066cb91559bfdd07ccfdf25f4a3752d1c977'
             '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
 
 prepare() {
@@ -34,13 +33,13 @@
   cd "${srcdir}/mozilla-central-${_mozilla_ver}"
 
   # Move files to their correct location
-  cp -r "${srcdir}/${pkgname}-${_github_ver}" bluegriffon
+  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"
+#  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

Modified: mozconfig
===================================================================
--- mozconfig	2016-06-26 08:22:37 UTC (rev 181218)
+++ mozconfig	2016-06-26 10:22:26 UTC (rev 181219)
@@ -12,22 +12,23 @@
 ac_add_options --enable-strip
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
-ac_add_options --enable-stdcxx-compat
+
+##############################
+# I build on a 4-cpu machine ; comment out or adapt to your own case
+##############################
 mk_add_options MOZ_MAKE_FLAGS="-s -j4"
 
 ##############################
 # DO NOT MODIFY BELOW THIS LINE
 ##############################
+ac_add_options --enable-application=bluegriffon
 # System directories
+mk_add_options MOZ_TOOLKIT_SEARCH=
 ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/bg
-ac_add_options --enable-application=bluegriffon
-mk_add_options MOZ_TOOLKIT_SEARCH=
+mk_add_options MOZ_MEDIA_NAVIGATOR=1
 
-ac_add_options --disable-cpp-exceptions
-
 # System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -38,46 +39,24 @@
 #ac_add_options --enable-system-ffi
 #ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
-
-ac_add_options --enable-libnotify
-ac_add_options --enable-system-lcms
-ac_add_options --disable-necko-wifi
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-pthreads
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
+
+# Features
+ac_add_options --disable-necko-wifi
 ac_add_options --disable-tests
-ac_add_options --disable-airbag
-ac_add_options --enable-places
-ac_add_options --enable-storage
-ac_add_options --disable-shared
-ac_add_options --enable-static
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-xprint
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --disable-javaxpcom
 ac_add_options --disable-crashreporter
 ac_add_options --enable-safe-browsing
 ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-webm
 ac_add_options --disable-updater
 ac_add_options --disable-update-packaging
 ac_add_options --disable-webrtc
-ac_add_options --disable-gstreamer
-
-# Features
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pulseaudio
 ac_add_options --disable-debug-symbols
+ac_add_options --enable-media-navigator
 
-ac_add_options --enable-media-navigator
-mk_add_options MOZ_MEDIA_NAVIGATOR=1