mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-01-24 01:42:13 +08:00
bluegriffon: update to 2.3.1
This commit is contained in:
Francesco Marinucci
parent
2aa8c72b37
commit
37b54caf0a
@ -1,27 +1,104 @@
|
||||
# ArchLinux Contributors
|
||||
|
||||
pkgname=bluegriffon
|
||||
pkgver=1.8
|
||||
pkgver=2.3.1
|
||||
_mozilla_ver=f14898695ee0
|
||||
pkgrel=1
|
||||
pkgdesc='The next-generation Web Editor'
|
||||
url="http://bluegriffon.org/"
|
||||
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=('libpng' 'libjpeg' 'desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mime-info' 'gtk2')
|
||||
makedepends=('wget')
|
||||
install='bluegriffon.install'
|
||||
source=("http://bluegriffon.org/freshmeat/1.8/$pkgname-1.8.Ubuntu15.04.x86_64.tar.bz2"
|
||||
'bluegriffon.desktop'
|
||||
'bluegriffon.install')
|
||||
md5sums=('ae45e34a0130ef937b930d86af1528a0'
|
||||
'e532ce3a2163d91b11a19176dcf2dbe1'
|
||||
'42d885a1665f32babc8045b2041949ea')
|
||||
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"
|
||||
"${pkgname}_gtk3.patch"
|
||||
"bug_1234158_firefox-gtk3-20.patch"
|
||||
"mozconfig"
|
||||
"${pkgname}.desktop")
|
||||
sha256sums=('1fb0ba05a024be3029fe800ef0297e9e5ff3dcb631d04a95ca30e33e5aa261d7'
|
||||
'0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2'
|
||||
'93de8102de543bad38dc49d9ffcf7a8a2d9246594a8e7b92c38736ed6c6050cd'
|
||||
'87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
|
||||
'3868f39181a258823c45e7ad62bba8e7b6e8b07c41535dd584c2dc71431f5deb'
|
||||
'd5e1b9a702dc693184494899fc4cd57ac206e1fd5415a8e5520b8ff3b822e734'
|
||||
'eaa26dd7e4216f6efd6c98b00154abd102ec60dd920fedb0817286202bb77269'
|
||||
'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"
|
||||
|
||||
# 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@' '{}' \;
|
||||
}
|
||||
|
||||
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)"
|
||||
|
||||
export SHELL=/bin/bash
|
||||
|
||||
# Build the package
|
||||
./mach build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}
|
||||
mkdir -p ${pkgdir}/usr/{bin,lib,share/{applications,pixmaps}}
|
||||
cp -R bluegriffon ${pkgdir}/usr/lib/${pkgname}
|
||||
cd "${srcdir}/mozilla-central-${_mozilla_ver}"
|
||||
|
||||
install -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/
|
||||
install -m644 ${srcdir}/bluegriffon/chrome/icons/default/default48.png ${pkgdir}/usr/share/pixmaps/${pkgname}-icon.png
|
||||
# Install files
|
||||
install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
|
||||
cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/${pkgname}"
|
||||
|
||||
ln -sf /usr/lib/bluegriffon/bluegriffon $pkgdir/usr/bin/
|
||||
# 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"
|
||||
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"
|
||||
}
|
||||
|
||||
@ -1,12 +1,16 @@
|
||||
[Desktop Entry]
|
||||
Name=Bluegriffon
|
||||
Comment=The next-generation Web Editor
|
||||
Icon=bluegriffon-icon
|
||||
Type=Application
|
||||
Categories=Application;Development;
|
||||
MimeType=text/html
|
||||
Encoding=UTF-8
|
||||
Exec=bluegriffon %u
|
||||
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
|
||||
MultipleArgs=false
|
||||
StartupNotify=false
|
||||
MimeType=text/html;application/xhtml+xml;
|
||||
Type=Application
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
## arg 1: the new package version
|
||||
## arg 2: the old package version
|
||||
post_upgrade() {
|
||||
if [ "`vercmp $2 1.0pre1-2`" -lt 0 ]; then
|
||||
echo "===================================================="
|
||||
echo "|!! !!!|"
|
||||
echo "|!! Due to important changes to the locales, !!!|"
|
||||
echo "|!! you must delete your BlueGriffon's user !!!|"
|
||||
echo "|!! profile before launching this new build : !!!|"
|
||||
echo "|!! rm -R ~/.disruptive\ innovations\ sarl/ !!!|"
|
||||
echo "|!! !!!|"
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
46
bluegriffon/bluegriffon_gtk3.patch
Normal file
46
bluegriffon/bluegriffon_gtk3.patch
Normal file
@ -0,0 +1,46 @@
|
||||
diff -Naur bluegriffon-2.1.1.orig/config/content.patch bluegriffon-2.1.1/config/content.patch
|
||||
--- bluegriffon-2.1.1.orig/config/content.patch 2016-07-23 21:54:18.367575963 +0000
|
||||
+++ bluegriffon-2.1.1/config/content.patch 2016-07-24 00:36:03.891186550 +0000
|
||||
@@ -4714,14 +4714,8 @@
|
||||
diff --git a/widget/gtk/nsColorPicker.cpp b/widget/gtk/nsColorPicker.cpp
|
||||
--- a/widget/gtk/nsColorPicker.cpp
|
||||
+++ b/widget/gtk/nsColorPicker.cpp
|
||||
-@@ -1,21 +1,24 @@
|
||||
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
- /* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
-
|
||||
+@@ -6,16 +6,18 @@
|
||||
#include <gtk/gtk.h>
|
||||
-+#include <gtk/gtkcolorsel.h>
|
||||
|
||||
#include "nsColor.h"
|
||||
#include "nsColorPicker.h"
|
||||
@@ -4739,7 +4733,7 @@
|
||||
return color_component * 255 + 0.5;
|
||||
}
|
||||
|
||||
-@@ -54,38 +57,39 @@ GtkColorSelection* nsColorPicker::Widget
|
||||
+@@ -54,38 +56,39 @@ GtkColorSelection* nsColorPicker::Widget
|
||||
{
|
||||
return GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(
|
||||
GTK_COLOR_SELECTION_DIALOG(widget)));
|
||||
@@ -4785,7 +4779,7 @@
|
||||
NS_WARNING("mCallback is already set. Open called twice?");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
-@@ -113,16 +117,18 @@ NS_IMETHODIMP nsColorPicker::Open(nsICol
|
||||
+@@ -113,16 +116,18 @@ NS_IMETHODIMP nsColorPicker::Open(nsICol
|
||||
GtkWidget *color_chooser = gtk_color_selection_dialog_new(title);
|
||||
|
||||
if (parent_window) {
|
||||
@@ -4804,7 +4798,7 @@
|
||||
G_CALLBACK(OnColorChanged), this);
|
||||
#endif
|
||||
|
||||
-@@ -176,20 +182,38 @@ nsColorPicker::Update(GtkColorSelection*
|
||||
+@@ -176,20 +181,38 @@ nsColorPicker::Update(GtkColorSelection*
|
||||
}
|
||||
}
|
||||
|
||||
1736
bluegriffon/bug_1234158_firefox-gtk3-20.patch
Normal file
1736
bluegriffon/bug_1234158_firefox-gtk3-20.patch
Normal file
File diff suppressed because it is too large
Load Diff
63
bluegriffon/mozconfig
Normal file
63
bluegriffon/mozconfig
Normal file
@ -0,0 +1,63 @@
|
||||
# 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-gtk3
|
||||
ac_add_options --disable-crashreporter
|
||||
ac_add_options --enable-safe-browsing
|
||||
ac_add_options --enable-gio
|
||||
ac_add_options --disable-gconf
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user