[arch-commits] Commit in bluegriffon/repos (10 files)
Fabio Castelli
muflone at archlinux.org
Sun Jun 26 10:23:00 UTC 2016
Date: Sunday, June 26, 2016 @ 10:22:59
Author: muflone
Revision: 181220
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
bluegriffon/repos/community-testing-i686/
bluegriffon/repos/community-testing-i686/PKGBUILD
(from rev 181219, bluegriffon/trunk/PKGBUILD)
bluegriffon/repos/community-testing-i686/bluegriffon.desktop
(from rev 181219, bluegriffon/trunk/bluegriffon.desktop)
bluegriffon/repos/community-testing-i686/bug_70722_include_next_in_cmath.patch
(from rev 181219, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
bluegriffon/repos/community-testing-i686/mozconfig
(from rev 181219, bluegriffon/trunk/mozconfig)
bluegriffon/repos/community-testing-x86_64/
bluegriffon/repos/community-testing-x86_64/PKGBUILD
(from rev 181219, bluegriffon/trunk/PKGBUILD)
bluegriffon/repos/community-testing-x86_64/bluegriffon.desktop
(from rev 181219, bluegriffon/trunk/bluegriffon.desktop)
bluegriffon/repos/community-testing-x86_64/bug_70722_include_next_in_cmath.patch
(from rev 181219, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
bluegriffon/repos/community-testing-x86_64/mozconfig
(from rev 181219, bluegriffon/trunk/mozconfig)
----------------------------------------------------------------+
community-testing-i686/PKGBUILD | 90 ++++++++++
community-testing-i686/bluegriffon.desktop | 16 +
community-testing-i686/bug_70722_include_next_in_cmath.patch | 12 +
community-testing-i686/mozconfig | 62 ++++++
community-testing-x86_64/PKGBUILD | 90 ++++++++++
community-testing-x86_64/bluegriffon.desktop | 16 +
community-testing-x86_64/bug_70722_include_next_in_cmath.patch | 12 +
community-testing-x86_64/mozconfig | 62 ++++++
8 files changed, 360 insertions(+)
Copied: bluegriffon/repos/community-testing-i686/PKGBUILD (from rev 181219, bluegriffon/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2016-06-26 10:22:59 UTC (rev 181220)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bluegriffon
+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' 'gconf')
+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")
+sha256sums=('266c2e3c4c4d1e8aec7f7013980e28330976569543a2fe179b5b36264f216b02'
+ '0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2'
+ '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
+ '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
+ 'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b'
+ '56832f428267dc31a2ae1e863edb066cb91559bfdd07ccfdf25f4a3752d1c977'
+ '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
+
+prepare() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Move files to their correct location
+ 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
+
+ # python2 fix
+ find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \;
+}
+
+build() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ export CPPFLAGS+=' -O2'
+ export PYTHON=python2
+
+ # Build the package
+ ./mach build
+}
+
+package() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Install files
+ install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
+ cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/${pkgname}"
+
+ # Install executable file
+ install -m 755 -d "${pkgdir}/usr/bin"
+ ln -sf /usr/lib/${pkgname}/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
+
+ # Install icons
+ cp bg/dist/branding/mozicon128.png bg/dist/branding/default128.png
+ for _icon in 16 32 48 128; do
+ install -Dm644 bg/dist/branding/default${_icon}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgname}.png"
+ done
+
+ # Install desktop file
+ install -Dm644 ../${pkgname}.desktop \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+ # Use system-provided dictionaries
+ rm -rf "${pkgdir}/usr/lib/${pkgname}/dictionaries"
+ ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${pkgname}/dictionaries"
+ rm -rf "${pkgdir}/usr/lib/${pkgname}hyphenation"
+ ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${pkgname}/hyphenation"
+}
Copied: bluegriffon/repos/community-testing-i686/bluegriffon.desktop (from rev 181219, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- community-testing-i686/bluegriffon.desktop (rev 0)
+++ community-testing-i686/bluegriffon.desktop 2016-06-26 10:22:59 UTC (rev 181220)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=BlueGriffon
+GenericName=Web Editor
+GenericName[hu]=Webszerkesztő
+X-GNOME-FullName=BlueGriffon Web Editor
+X-GNOME-FullName[hu]=BlueGriffon webszerkesztő
+Comment=Create Web Pages
+Comment[es]=Crea páginas web
+Comment[hu]=Weboldalak készítése
+Comment[it]=Creare pagine Web
+Categories=Development;WebDevelopment;
+Exec=bluegriffon
+Icon=bluegriffon
+Terminal=false
+MimeType=text/html;application/xhtml+xml;
+Type=Application
Copied: bluegriffon/repos/community-testing-i686/bug_70722_include_next_in_cmath.patch (from rev 181219, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
===================================================================
--- community-testing-i686/bug_70722_include_next_in_cmath.patch (rev 0)
+++ community-testing-i686/bug_70722_include_next_in_cmath.patch 2016-06-26 10:22:59 UTC (rev 181220)
@@ -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;
+ }
Copied: bluegriffon/repos/community-testing-i686/mozconfig (from rev 181219, bluegriffon/trunk/mozconfig)
===================================================================
--- community-testing-i686/mozconfig (rev 0)
+++ community-testing-i686/mozconfig 2016-06-26 10:22:59 UTC (rev 181220)
@@ -0,0 +1,62 @@
+# sh
+# Build configuration script for Arch Linux
+#
+# See http://www.mozilla.org/build/unix.html for build instructions.
+#
+
+##############################
+# tweak the following according to your wishes
+##############################
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+##############################
+# 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
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/bg
+mk_add_options MOZ_MEDIA_NAVIGATOR=1
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+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
+
+# Features
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-tests
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-crashreporter
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-gio
+ac_add_options --disable-updater
+ac_add_options --disable-update-packaging
+ac_add_options --disable-webrtc
+ac_add_options --enable-startup-notification
+ac_add_options --enable-pulseaudio
+ac_add_options --disable-debug-symbols
+ac_add_options --enable-media-navigator
+
Copied: bluegriffon/repos/community-testing-x86_64/PKGBUILD (from rev 181219, bluegriffon/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2016-06-26 10:22:59 UTC (rev 181220)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bluegriffon
+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' 'gconf')
+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")
+sha256sums=('266c2e3c4c4d1e8aec7f7013980e28330976569543a2fe179b5b36264f216b02'
+ '0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2'
+ '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
+ '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
+ 'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b'
+ '56832f428267dc31a2ae1e863edb066cb91559bfdd07ccfdf25f4a3752d1c977'
+ '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
+
+prepare() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Move files to their correct location
+ 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
+
+ # python2 fix
+ find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \;
+}
+
+build() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ export CPPFLAGS+=' -O2'
+ export PYTHON=python2
+
+ # Build the package
+ ./mach build
+}
+
+package() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Install files
+ install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
+ cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/${pkgname}"
+
+ # Install executable file
+ install -m 755 -d "${pkgdir}/usr/bin"
+ ln -sf /usr/lib/${pkgname}/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
+
+ # Install icons
+ cp bg/dist/branding/mozicon128.png bg/dist/branding/default128.png
+ for _icon in 16 32 48 128; do
+ install -Dm644 bg/dist/branding/default${_icon}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgname}.png"
+ done
+
+ # Install desktop file
+ install -Dm644 ../${pkgname}.desktop \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+ # Use system-provided dictionaries
+ rm -rf "${pkgdir}/usr/lib/${pkgname}/dictionaries"
+ ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${pkgname}/dictionaries"
+ rm -rf "${pkgdir}/usr/lib/${pkgname}hyphenation"
+ ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${pkgname}/hyphenation"
+}
Copied: bluegriffon/repos/community-testing-x86_64/bluegriffon.desktop (from rev 181219, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- community-testing-x86_64/bluegriffon.desktop (rev 0)
+++ community-testing-x86_64/bluegriffon.desktop 2016-06-26 10:22:59 UTC (rev 181220)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=BlueGriffon
+GenericName=Web Editor
+GenericName[hu]=Webszerkesztő
+X-GNOME-FullName=BlueGriffon Web Editor
+X-GNOME-FullName[hu]=BlueGriffon webszerkesztő
+Comment=Create Web Pages
+Comment[es]=Crea páginas web
+Comment[hu]=Weboldalak készítése
+Comment[it]=Creare pagine Web
+Categories=Development;WebDevelopment;
+Exec=bluegriffon
+Icon=bluegriffon
+Terminal=false
+MimeType=text/html;application/xhtml+xml;
+Type=Application
Copied: bluegriffon/repos/community-testing-x86_64/bug_70722_include_next_in_cmath.patch (from rev 181219, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
===================================================================
--- community-testing-x86_64/bug_70722_include_next_in_cmath.patch (rev 0)
+++ community-testing-x86_64/bug_70722_include_next_in_cmath.patch 2016-06-26 10:22:59 UTC (rev 181220)
@@ -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;
+ }
Copied: bluegriffon/repos/community-testing-x86_64/mozconfig (from rev 181219, bluegriffon/trunk/mozconfig)
===================================================================
--- community-testing-x86_64/mozconfig (rev 0)
+++ community-testing-x86_64/mozconfig 2016-06-26 10:22:59 UTC (rev 181220)
@@ -0,0 +1,62 @@
+# sh
+# Build configuration script for Arch Linux
+#
+# See http://www.mozilla.org/build/unix.html for build instructions.
+#
+
+##############################
+# tweak the following according to your wishes
+##############################
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+##############################
+# 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
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/bg
+mk_add_options MOZ_MEDIA_NAVIGATOR=1
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+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
+
+# Features
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-tests
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-crashreporter
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-gio
+ac_add_options --disable-updater
+ac_add_options --disable-update-packaging
+ac_add_options --disable-webrtc
+ac_add_options --enable-startup-notification
+ac_add_options --enable-pulseaudio
+ac_add_options --disable-debug-symbols
+ac_add_options --enable-media-navigator
+
More information about the arch-commits
mailing list