diff options
author | Manuel Hüsers | 2016-08-12 13:04:11 +0200 |
---|---|---|
committer | Manuel Hüsers | 2016-08-12 13:05:17 +0200 |
commit | 28d6a0bf0707a2f8bab7c5d9d0eb66d464baf76b (patch) | |
tree | 44e408de10e74654cd2e385a4c31fe1bdb33f523 | |
parent | 4b28daf206e47f01b2c16704eb645c8d73a7c3b2 (diff) | |
download | aur-28d6a0bf0707a2f8bab7c5d9d0eb66d464baf76b.tar.gz |
New release
Adds new upstream patches
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | dnd-crash.patch | 39 | ||||
-rw-r--r-- | palette-color.patch | 40 |
4 files changed, 98 insertions, 6 deletions
@@ -1,13 +1,14 @@ # Generated by mksrcinfo v8 -# Wed May 11 16:04:18 UTC 2016 +# Fri Aug 12 11:04:10 UTC 2016 pkgbase = gnome-terminal-fedora pkgdesc = The GNOME Terminal Emulator with Fedora patches pkgver = 3.20.2 - pkgrel = 1 + pkgrel = 2 url = https://wiki.gnome.org/Apps/Terminal install = gnome-terminal-fedora.install arch = i686 arch = x86_64 + groups = gnome license = GPL makedepends = gnome-doc-utils makedepends = intltool @@ -29,10 +30,14 @@ pkgbase = gnome-terminal-fedora conflicts = gnome-terminal options = !emptydirs source = https://download.gnome.org/sources/gnome-terminal/3.20/gnome-terminal-3.20.2.tar.xz + source = dnd-crash.patch + source = palette-color.patch source = 0001-build-Don-t-treat-warnings-as-errors.patch source = gnome-terminal-transparency-notify.patch source = org.gnome.Terminal.gschema.override sha256sums = f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23 + sha256sums = 0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166 + sha256sums = 1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573 sha256sums = 83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7 sha256sums = 34d2fb95873334dd79ff76dda6a69692b0f390e9ac1c9795052020e847a680ed sha256sums = 5409b35d1940443d29d810de0560d3303eb74c009e661e8fbfa1030e5ffde92e @@ -5,7 +5,7 @@ _pkgname='gnome-terminal' pkgname="${_pkgname}-fedora" pkgver=3.20.2 -pkgrel=1 +pkgrel=2 pkgdesc='The GNOME Terminal Emulator with Fedora patches' arch=('i686' 'x86_64') url='https://wiki.gnome.org/Apps/Terminal' @@ -16,15 +16,20 @@ makedepends=('gnome-doc-utils' 'intltool' 'itstool' 'docbook-xsl' 'desktop-file- provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") options=('!emptydirs') +groups=('gnome') install="${pkgname}.install" source=( "https://download.gnome.org/sources/${_pkgname}/${pkgver::4}/${_pkgname}-${pkgver}.tar.xz" + 'dnd-crash.patch' + 'palette-color.patch' '0001-build-Don-t-treat-warnings-as-errors.patch' 'gnome-terminal-transparency-notify.patch' 'org.gnome.Terminal.gschema.override' ) sha256sums=( 'f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23' + '0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166' + '1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573' '83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7' '34d2fb95873334dd79ff76dda6a69692b0f390e9ac1c9795052020e847a680ed' '5409b35d1940443d29d810de0560d3303eb74c009e661e8fbfa1030e5ffde92e' @@ -33,10 +38,13 @@ sha256sums=( prepare () { cd "${_pkgname}-${pkgver}" - patch -p1 -i '../0001-build-Don-t-treat-warnings-as-errors.patch' - patch -p1 -i '../gnome-terminal-transparency-notify.patch' + patch -Np1 -i '../dnd-crash.patch' + patch -Np1 -i '../palette-color.patch' - autoreconf -f -i + patch -Np1 -i '../0001-build-Don-t-treat-warnings-as-errors.patch' + patch -Np1 -i '../gnome-terminal-transparency-notify.patch' + + autoreconf -fvi } build() { diff --git a/dnd-crash.patch b/dnd-crash.patch new file mode 100644 index 000000000000..baa66e5195fc --- /dev/null +++ b/dnd-crash.patch @@ -0,0 +1,39 @@ +From 69e82e354de26cd7e6957b95740c724ed1c31c10 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson <andreas@fatal.se> +Date: Mon, 25 Jul 2016 19:38:18 +0200 +Subject: notebook: avoid crash on tab DND + +See "gtk_notebook_detach_tab" API documentation. Using it instead +of gtk_container_remove avoids an assertion crash in gtk+ when +dragging and dropping a tab between terminal windows. + +See also original bug report at +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825818 + +https://bugzilla.gnome.org/show_bug.cgi?id=769161 +(cherry picked from commit 85b448f7c9e219e82d4d8abafe405d73349c08c1) +--- + src/terminal-notebook.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c +index 9d488fc..b054676 100644 +--- a/src/terminal-notebook.c ++++ b/src/terminal-notebook.c +@@ -152,8 +152,13 @@ terminal_notebook_remove_screen (TerminalMdiContainer *container, + update_tab_visibility (notebook, -1); + + screen_container = terminal_screen_container_get_from_screen (screen); ++#if GTK_CHECK_VERSION(3, 16, 0) ++ gtk_notebook_detach_tab (GTK_NOTEBOOK (notebook), ++ GTK_WIDGET (screen_container)); ++#else + gtk_container_remove (GTK_CONTAINER (notebook), + GTK_WIDGET (screen_container)); ++#endif + } + + static TerminalScreen * +-- +cgit v0.12 + diff --git a/palette-color.patch b/palette-color.patch new file mode 100644 index 000000000000..f5924094e62a --- /dev/null +++ b/palette-color.patch @@ -0,0 +1,40 @@ +From 2a10e0ed7d6210b0522ffc2faf8483c64f1d183d Mon Sep 17 00:00:00 2001 +From: Egmont Koblinger <egmont@gmail.com> +Date: Fri, 22 Jul 2016 16:42:14 +0200 +Subject: profile: editor: Properly initialize the first palette color + +https://bugzilla.gnome.org/show_bug.cgi?id=768850 +(cherry picked from commit 6447aded26416e49bf5fdce8a8fd13c16c0ebb44) +--- + src/profile-editor.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/src/profile-editor.c b/src/profile-editor.c +index ff26df6..82cc7a9 100644 +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -405,18 +405,13 @@ profile_palette_notify_colorpickers_cb (GSettings *profile, + for (i = 0; i < n_colors; i++) + { + char name[32]; +- GdkRGBA old_color; + + g_snprintf (name, sizeof (name), "palette-colorpicker-%" G_GSIZE_FORMAT, i + 1); + w = (GtkWidget *) gtk_builder_get_object (builder, name); + +- gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (w), &old_color); +- if (!rgba_equal (&old_color, &colors[i])) +- { +- g_signal_handlers_block_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); +- gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &colors[i]); +- g_signal_handlers_unblock_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); +- } ++ g_signal_handlers_block_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); ++ gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &colors[i]); ++ g_signal_handlers_unblock_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); + } + } + +-- +cgit v0.12 + |