[arch-commits] Commit in bluegriffon/repos (16 files)
Fabio Castelli
muflone at archlinux.org
Sat May 7 19:01:21 UTC 2016
Date: Saturday, May 7, 2016 @ 21:01:21
Author: muflone
Revision: 174232
archrelease: copy trunk to community-i686, community-x86_64
Added:
bluegriffon/repos/community-i686/PKGBUILD
(from rev 174231, bluegriffon/trunk/PKGBUILD)
bluegriffon/repos/community-i686/bluegriffon.desktop
(from rev 174231, bluegriffon/trunk/bluegriffon.desktop)
bluegriffon/repos/community-i686/bug_70722_include_next_in_cmath.patch
(from rev 174231, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
bluegriffon/repos/community-i686/mozconfig
(from rev 174231, bluegriffon/trunk/mozconfig)
bluegriffon/repos/community-x86_64/PKGBUILD
(from rev 174231, bluegriffon/trunk/PKGBUILD)
bluegriffon/repos/community-x86_64/bluegriffon.desktop
(from rev 174231, bluegriffon/trunk/bluegriffon.desktop)
bluegriffon/repos/community-x86_64/bug_70722_include_next_in_cmath.patch
(from rev 174231, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
bluegriffon/repos/community-x86_64/mozconfig
(from rev 174231, bluegriffon/trunk/mozconfig)
Deleted:
bluegriffon/repos/community-i686/PKGBUILD
bluegriffon/repos/community-i686/bluegriffon.desktop
bluegriffon/repos/community-i686/bluegriffon.install
bluegriffon/repos/community-i686/mozconfig
bluegriffon/repos/community-x86_64/PKGBUILD
bluegriffon/repos/community-x86_64/bluegriffon.desktop
bluegriffon/repos/community-x86_64/bluegriffon.install
bluegriffon/repos/community-x86_64/mozconfig
--------------------------------------------------------+
/PKGBUILD | 182 +++++++++++++++
/bluegriffon.desktop | 32 ++
/mozconfig | 166 +++++++++++++
community-i686/PKGBUILD | 89 -------
community-i686/bluegriffon.desktop | 16 -
community-i686/bluegriffon.install | 12
community-i686/bug_70722_include_next_in_cmath.patch | 12
community-i686/mozconfig | 83 ------
community-x86_64/PKGBUILD | 89 -------
community-x86_64/bluegriffon.desktop | 16 -
community-x86_64/bluegriffon.install | 12
community-x86_64/bug_70722_include_next_in_cmath.patch | 12
community-x86_64/mozconfig | 83 ------
13 files changed, 404 insertions(+), 400 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-i686/PKGBUILD 2016-05-07 19:01:21 UTC (rev 174232)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=bluegriffon
-pkgver=1.8
-_mozilla_ver=fec90cbfbaad
-_github_ver=5961e4cbc9ea546f9d7e4b9a7f2bb6884d66a378
-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')
-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"
- "mozconfig"
- "${pkgname}.desktop")
-sha256sums=('0c629f882a7b7fcdf4416871db8d522f43653b62c0e5a25168b1914af8448a11'
- '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd'
- '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
- '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
- 'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f'
- '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
-
-prepare() {
- cd "${srcdir}/mozilla-central-${_mozilla_ver}"
-
- # Move files to their correct location
- cp -r "${srcdir}/${pkgname}-${_github_ver}" 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"
-
- # 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-i686/PKGBUILD (from rev 174231, bluegriffon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-07 19:01:21 UTC (rev 174232)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bluegriffon
+pkgver=1.8
+_mozilla_ver=fec90cbfbaad
+_github_ver=5961e4cbc9ea546f9d7e4b9a7f2bb6884d66a378
+pkgrel=2
+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')
+options=('!emptydirs')
+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'
+ '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd'
+ '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
+ '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
+ 'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b'
+ 'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f'
+ '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
+
+prepare() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Move files to their correct location
+ cp -r "${srcdir}/${pkgname}-${_github_ver}" 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"
+}
Deleted: community-i686/bluegriffon.desktop
===================================================================
--- community-i686/bluegriffon.desktop 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-i686/bluegriffon.desktop 2016-05-07 19:01:21 UTC (rev 174232)
@@ -1,16 +0,0 @@
-[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-i686/bluegriffon.desktop (from rev 174231, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- community-i686/bluegriffon.desktop (rev 0)
+++ community-i686/bluegriffon.desktop 2016-05-07 19:01:21 UTC (rev 174232)
@@ -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
Deleted: community-i686/bluegriffon.install
===================================================================
--- community-i686/bluegriffon.install 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-i686/bluegriffon.install 2016-05-07 19:01:21 UTC (rev 174232)
@@ -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
-}
Copied: bluegriffon/repos/community-i686/bug_70722_include_next_in_cmath.patch (from rev 174231, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
===================================================================
--- community-i686/bug_70722_include_next_in_cmath.patch (rev 0)
+++ community-i686/bug_70722_include_next_in_cmath.patch 2016-05-07 19:01:21 UTC (rev 174232)
@@ -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;
+ }
Deleted: community-i686/mozconfig
===================================================================
--- community-i686/mozconfig 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-i686/mozconfig 2016-05-07 19:01:21 UTC (rev 174232)
@@ -1,83 +0,0 @@
-# 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
-ac_add_options --enable-stdcxx-compat
-mk_add_options MOZ_MAKE_FLAGS="-s -j4"
-
-##############################
-# DO NOT MODIFY BELOW THIS LINE
-##############################
-# System directories
-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=
-
-ac_add_options --disable-cpp-exceptions
-
-# 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 --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
-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
-mk_add_options MOZ_MEDIA_NAVIGATOR=1
Copied: bluegriffon/repos/community-i686/mozconfig (from rev 174231, bluegriffon/trunk/mozconfig)
===================================================================
--- community-i686/mozconfig (rev 0)
+++ community-i686/mozconfig 2016-05-07 19:01:21 UTC (rev 174232)
@@ -0,0 +1,83 @@
+# 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
+ac_add_options --enable-stdcxx-compat
+mk_add_options MOZ_MAKE_FLAGS="-s -j4"
+
+##############################
+# DO NOT MODIFY BELOW THIS LINE
+##############################
+# System directories
+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=
+
+ac_add_options --disable-cpp-exceptions
+
+# 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 --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
+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
+mk_add_options MOZ_MEDIA_NAVIGATOR=1
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-x86_64/PKGBUILD 2016-05-07 19:01:21 UTC (rev 174232)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=bluegriffon
-pkgver=1.8
-_mozilla_ver=fec90cbfbaad
-_github_ver=5961e4cbc9ea546f9d7e4b9a7f2bb6884d66a378
-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')
-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"
- "mozconfig"
- "${pkgname}.desktop")
-sha256sums=('0c629f882a7b7fcdf4416871db8d522f43653b62c0e5a25168b1914af8448a11'
- '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd'
- '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
- '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
- 'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f'
- '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
-
-prepare() {
- cd "${srcdir}/mozilla-central-${_mozilla_ver}"
-
- # Move files to their correct location
- cp -r "${srcdir}/${pkgname}-${_github_ver}" 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"
-
- # 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-x86_64/PKGBUILD (from rev 174231, bluegriffon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-05-07 19:01:21 UTC (rev 174232)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bluegriffon
+pkgver=1.8
+_mozilla_ver=fec90cbfbaad
+_github_ver=5961e4cbc9ea546f9d7e4b9a7f2bb6884d66a378
+pkgrel=2
+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')
+options=('!emptydirs')
+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'
+ '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd'
+ '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
+ '2df11bae529ce96d0133ba3ce076e0016350d66a7800a2253b19db13785a87fd'
+ 'b981a29f6243373b9118990727c17a4dee24156a9af1ea0eb25f23acd51fd37b'
+ 'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f'
+ '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff')
+
+prepare() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Move files to their correct location
+ cp -r "${srcdir}/${pkgname}-${_github_ver}" 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"
+}
Deleted: community-x86_64/bluegriffon.desktop
===================================================================
--- community-x86_64/bluegriffon.desktop 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-x86_64/bluegriffon.desktop 2016-05-07 19:01:21 UTC (rev 174232)
@@ -1,16 +0,0 @@
-[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-x86_64/bluegriffon.desktop (from rev 174231, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- community-x86_64/bluegriffon.desktop (rev 0)
+++ community-x86_64/bluegriffon.desktop 2016-05-07 19:01:21 UTC (rev 174232)
@@ -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
Deleted: community-x86_64/bluegriffon.install
===================================================================
--- community-x86_64/bluegriffon.install 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-x86_64/bluegriffon.install 2016-05-07 19:01:21 UTC (rev 174232)
@@ -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
-}
Copied: bluegriffon/repos/community-x86_64/bug_70722_include_next_in_cmath.patch (from rev 174231, bluegriffon/trunk/bug_70722_include_next_in_cmath.patch)
===================================================================
--- community-x86_64/bug_70722_include_next_in_cmath.patch (rev 0)
+++ community-x86_64/bug_70722_include_next_in_cmath.patch 2016-05-07 19:01:21 UTC (rev 174232)
@@ -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;
+ }
Deleted: community-x86_64/mozconfig
===================================================================
--- community-x86_64/mozconfig 2016-05-07 19:00:49 UTC (rev 174231)
+++ community-x86_64/mozconfig 2016-05-07 19:01:21 UTC (rev 174232)
@@ -1,83 +0,0 @@
-# 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
-ac_add_options --enable-stdcxx-compat
-mk_add_options MOZ_MAKE_FLAGS="-s -j4"
-
-##############################
-# DO NOT MODIFY BELOW THIS LINE
-##############################
-# System directories
-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=
-
-ac_add_options --disable-cpp-exceptions
-
-# 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 --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
-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
-mk_add_options MOZ_MEDIA_NAVIGATOR=1
Copied: bluegriffon/repos/community-x86_64/mozconfig (from rev 174231, bluegriffon/trunk/mozconfig)
===================================================================
--- community-x86_64/mozconfig (rev 0)
+++ community-x86_64/mozconfig 2016-05-07 19:01:21 UTC (rev 174232)
@@ -0,0 +1,83 @@
+# 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
+ac_add_options --enable-stdcxx-compat
+mk_add_options MOZ_MAKE_FLAGS="-s -j4"
+
+##############################
+# DO NOT MODIFY BELOW THIS LINE
+##############################
+# System directories
+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=
+
+ac_add_options --disable-cpp-exceptions
+
+# 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 --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
+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
+mk_add_options MOZ_MEDIA_NAVIGATOR=1
More information about the arch-commits
mailing list