Date: Monday, December 7, 2015 @ 01:24:35 Author: muflone Revision: 149405
upgpkg: bluegriffon 1.8-1 Modified: bluegriffon/trunk/PKGBUILD bluegriffon/trunk/mozconfig -----------+ PKGBUILD | 86 ++++++++++++++++++++++++++---------------------------------- mozconfig | 78 +++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 100 insertions(+), 64 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-07 00:23:39 UTC (rev 149404) +++ PKGBUILD 2015-12-07 00:24:35 UTC (rev 149405) @@ -3,9 +3,10 @@ # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=bluegriffon -pkgver=1.7.2 -_mozilla_ver=9db46ddfb517 -pkgrel=5 +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/" @@ -12,47 +13,33 @@ 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' 'subversion' 'unzip' 'xorg-server-xvfb' 'zip') +makedepends=('autoconf2.13' 'libpulse' 'unzip' 'zip') options=('!emptydirs') install="${pkgname}.install" -source=("${pkgname}-${pkgver}"::"svn+http://sources.disruptive-innovations.com/${pkgname}/tags/${pkgver}" - "${pkgname}-l10n-${pkgver}"::"svn+http://sources.disruptive-innovations.com/${pkgname}-l10n/tags/${pkgver}" - "http://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2" +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" "mozconfig" - "bluegriffon.desktop" - "freetype.patch" - "freetype261.patch" - "libvpx_1.4.patch") -sha256sums=('SKIP' - 'SKIP' - 'c855ec513f351ebc2cab54000390e39e4f0d40dfed76d6bb2c6e8dae52ec9e6e' - '02d87cb754fd6532bf78d461e822b271ae135df27afd1f48d1978aa0372840b1' - '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff' - '431c97f6b6d0c10d026e2d6d848e7c1bb0a7a55912199909f17ce485a8dc484e' + "${pkgname}.desktop") +sha256sums=('0c629f882a7b7fcdf4416871db8d522f43653b62c0e5a25168b1914af8448a11' + '95a9868b809664bd79727119eace53b9f6e97c54a137c28b7e6dda688aade6fd' '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6' - '4a5aa3dc46a6e6a0344e703ade97842935337d4304751f8073b365b44b3162bc') + 'fb8b56dcbf3daf13ac336b85183db8d48068d9f82dc74acad9fa619a165c601f' + '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff') prepare() { cd "${srcdir}/mozilla-central-${_mozilla_ver}" # Move files to their correct location - mv "${srcdir}/${pkgname}-${pkgver}" bluegriffon - mv "${srcdir}/${pkgname}-l10n-${pkgver}" bluegriffon/locales - mv "${srcdir}/mozconfig" .mozconfig + cp -r "${srcdir}/${pkgname}-${_github_ver}" bluegriffon + cp "${srcdir}/mozconfig" .mozconfig + # Apply patches + patch -p1 -i "${srcdir}/bug_1194520_add_ftfntfmt.patch" + # Apply BlueGriffon's upstream customizations patch -Np1 -i bluegriffon/config/content.patch - # Fix build with freetype 2.5 - patch -Np1 -i ../freetype.patch - - # Fix build with freetype 2.6.1 - patch -Np1 <../freetype261.patch - patch -d js/src -Np1 <../freetype261.patch - - # Fix build with libvpx >= 1.4 - patch -Np1 -i ../libvpx_1.4.patch - # python2 fix find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \; } @@ -65,32 +52,35 @@ export CPPFLAGS+=' -O2' export PYTHON=python2 - xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \ - make -f client.mk build + # Build the package + ./mach build } package() { cd "${srcdir}/mozilla-central-${_mozilla_ver}" - mkdir -p "${pkgdir}/usr/lib/bluegriffon" - cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/bluegriffon" + # Install files + install -m 755 -d "${pkgdir}/usr/lib/${pkgname}" + cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/${pkgname}" - mkdir -p "${pkgdir}/usr/bin" - ln -sf /usr/lib/bluegriffon/bluegriffon "${pkgdir}/usr/bin/bluegriffon" + # Install executable file + install -m 755 -d "${pkgdir}/usr/bin" + ln -sf /usr/lib/${pkgname}/${pkgname} "${pkgdir}/usr/bin/${pkgname}" - for i in 16x16 32x32 48x48; do - install -Dm644 bg/dist/branding/default${i/x*/}.png \ - "${pkgdir}/usr/share/icons/hicolor/${i}/apps/bluegriffon.png" + # 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 -Dm644 bg/dist/branding/mozicon128.png \ - "${pkgdir}/usr/share/icons/hicolor/128x128/apps/bluegriffon.png" + # Install desktop file + install -Dm644 ../${pkgname}.desktop \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 ../bluegriffon.desktop \ - "${pkgdir}/usr/share/applications/bluegriffon.desktop" - # Use system-provided dictionaries - rm -rf "${pkgdir}"/usr/lib/bluegriffon/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/bluegriffon/dictionaries" - ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/bluegriffon/hyphenation" + 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" } Modified: mozconfig =================================================================== --- mozconfig 2015-12-07 00:23:39 UTC (rev 149404) +++ mozconfig 2015-12-07 00:24:35 UTC (rev 149405) @@ -1,19 +1,36 @@ -# Select BlueGriffon -mk_add_options MOZ_TOOLKIT_SEARCH= -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/bg -ac_add_options --enable-application=bluegriffon +# 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-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell @@ -22,16 +39,45 @@ #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-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-installer ac_add_options --disable-debug-symbols -# Optimization -ac_add_options --disable-debug -ac_add_options --enable-optimize -mk_add_options MOZ_MAKE_FLAGS="-s -j4" +ac_add_options --enable-media-navigator +mk_add_options MOZ_MEDIA_NAVIGATOR=1