Date: Saturday, November 25, 2017 @ 20:00:10 Author: muflone Revision: 268466
upgpkg: bluegriffon 2.4-1 Modified: bluegriffon/trunk/PKGBUILD ----------+ PKGBUILD | 143 ++++++++++++++++++++----------------------------------------- 1 file changed, 47 insertions(+), 96 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-11-25 19:59:33 UTC (rev 268465) +++ PKGBUILD 2017-11-25 20:00:10 UTC (rev 268466) @@ -2,120 +2,71 @@ # Maintainer: Muflone http://www.muflone.com/contacts/english/ # Contributor: Balló György <ballogyor+arch at gmail dot com> -pkgname=bluegriffon -pkgver=2.3.1 -_mozilla_ver=f14898695ee0 -pkgrel=3 +pkgname='bluegriffon' +pkgver=2.4 +pkgrel=1 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox" arch=('x86_64') url="http://bluegriffon.org/" license=('MPL' 'GPL' 'LGPL') -depends=('alsa-lib' 'desktop-file-utils' 'dbus-glib' 'gtk2' 'gtk3' 'hunspell' 'mozilla-common' - 'nss' 'libevent' 'libvpx' 'libxt' 'python2' 'startup-notification') -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"::"https://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2" - "bug_1329272_icu.patch"::"https://hg.mozilla.org/releases/mozilla-esr45/raw-diff/571b48abf054/build/autoconf/icu.m4" - "bug_1290037_update_keybits_in_h2.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/361ac226da2a" - "bug_1269171_mozalloc_in_stl_wrappers.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/68da139d0866" - "bug_1371991_no_lib_nss_crmf.patch" - "${pkgname}_gtk3.patch" - "bug_1234158_firefox-gtk3-20.patch" - "event__sizeof.patch" - "mozconfig" +depends=('nss' 'dbus-glib' 'gtk2' 'gtk3' 'hunspell' 'libxt') +groups=('bluegriffon') +source=("http://bluegriffon.org/freshmeat/${pkgver}/${pkgname}-${pkgver}.Ubuntu16.04-${CARCH}.tar.bz2" + "icon-16.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/default16.png" + "icon-22.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/default22.png" + "icon-24.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/default24.png" + "icon-32.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/default32.png" + "icon-48.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/default48.png" + "icon-128.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/mozicon128.png" + "icon-256.png"::"https://github.com/therealglazou/${pkgname}/raw/${pkgver}/branding/default256.png" "${pkgname}.desktop") -sha256sums=('1fb0ba05a024be3029fe800ef0297e9e5ff3dcb631d04a95ca30e33e5aa261d7' - '0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2' - '93de8102de543bad38dc49d9ffcf7a8a2d9246594a8e7b92c38736ed6c6050cd' - '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4' - '9d4849338dad39b978f7c15a93c3c255d72d7bfdffa897900a0bdddd771d2e17' - '08e40f75395d26359ce9bcce42789961900b4dc8fbab8555baba6a2895f7798d' - '3868f39181a258823c45e7ad62bba8e7b6e8b07c41535dd584c2dc71431f5deb' - 'd5e1b9a702dc693184494899fc4cd57ac206e1fd5415a8e5520b8ff3b822e734' - 'f4440c9d3826f4cda18b9d00129347fe6a22de61e11d593b1a522fa46d685ca0' - 'eaa26dd7e4216f6efd6c98b00154abd102ec60dd920fedb0817286202bb77269' +sha256sums=('ed3ef933aafb768afe420af65ad13b5eb98550bb792f9f385bcb6910fa52f614' + '339b371abc23894084a8de27925ba688f760ab6b3b42b7a54ba338b1e8025793' + '2fcbe4e9631c749f290e4b3c3b177ad463c5dbdf992674499aeb5adbfeb8862a' + '497e5bde0da375b8a9a2d5f12d008e73d6b1758e712c70432661410b3bc6273c' + 'c03d6e093d43c0bd6b8f25ac77ffae31d2306817b58c074971470186fe998f5a' + '0ea31be427b462612fde24f852bf6049a2db452320c066c93cfd73ea53524395' + '146b2e3979949e97e8d092a41275c27a895d11eff995eb6a453c6d79a6760480' + '8b19d0a8818b1a01dee68dfbda62f192c47ee9dcfd51d90f93c82fb64b40f4d0' '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff') prepare() { - cd "${pkgname}-${pkgver}" - - # Fix build with GTK+3 - patch -Np1 -i "${srcdir}/${pkgname}_gtk3.patch" - - cd "${srcdir}/mozilla-central-${_mozilla_ver}" - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272 - patch -Np1 -i "${srcdir}/bug_1329272_icu.patch" - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1290037 - patch -Np1 -i "${srcdir}/bug_1290037_update_keybits_in_h2.patch" - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1269171 - patch -Np1 -i "${srcdir}/bug_1269171_mozalloc_in_stl_wrappers.patch" - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 - # https://bugs.archlinux.org/task/54395 - patch -Np1 -i "${srcdir}/bug_1371991_no_lib_nss_crmf.patch" - - # Fix for libevent 2.1 - # Change _EVENT_SIZEOF to EVENT__SIZEOF - patch -Np1 -i "${srcdir}/event__sizeof.patch" - - # Move files to their correct location - cp -r "${srcdir}/${pkgname}-${pkgver}" bluegriffon - cp "${srcdir}/mozconfig" .mozconfig - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1234158 - patch -Np1 -i "${srcdir}/bug_1234158_firefox-gtk3-20.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@' '{}' \; + cd "${pkgname}" + # Remove unused files + rm "precomplete" "removed-files" + # Use system wide dictionaries + rm -r "dictionaries" + # Remove all language packs except english + mv "distribution/extensions/langpack-en-US@${pkgname}.org.xpi" "${srcdir}" + rm -r "distribution" + # Use system libraries + for _file in "libnspr4.so" "libplc4.so" "libplds4.so" "libfreeblpriv3.chk" \ + "libfreeblpriv3.so" "libnss3.so" "libnssckbi.so" "libssl3.so" \ + "libnssdbm3.chk" "libnssdbm3.so" "libnssutil3.so" "libsmime3.so" \ + "libsoftokn3.chk" "libsoftokn3.so" + do + rm "${_file}" + sed -i "/${_file}/d" "dependentlibs.list" + done } -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 - - # Fix linking with gtk3 - export LDFLAGS+=" $(pkg-config --libs gtk+-3.0)" - - # 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 -m 755 -d "${pkgdir}/usr/lib" + cp -LR "${pkgname}" "${pkgdir}/usr/lib" + # Install english language pack + install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/distribution/extensions" + install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/distribution/extensions" "${srcdir}/langpack-en-US@${pkgname}.org.xpi" # Install executable file install -m 755 -d "${pkgdir}/usr/bin" ln -sf /usr/lib/${pkgname}/${pkgname} "${pkgdir}/usr/bin/${pkgname}" - # Install icons - cp bluegriffon/branding/mozicon128.png bluegriffon/branding/default128.png for _icon in 16 32 48 128 256; do - install -Dm644 bluegriffon/branding/default${_icon}.png \ - "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgname}.png" + install -m 644 -D "icon-${_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" + install -m 644 -D "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + # Use system wide 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" } +