summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Fernyhough2020-03-01 12:58:32 +0000
committerJonathon Fernyhough2020-03-01 12:58:32 +0000
commit1eda2003dc5b921513885d606ec5226fb0d9bde4 (patch)
tree7e3da71a952f0cd1a0b7bacc8d437d72a777b310
parent8a69f284b1073093bb732f64682aade4fd1b0759 (diff)
downloadaur-1eda2003dc5b921513885d606ec5226fb0d9bde4.tar.gz
Upstream 3.24.14
-rw-r--r--.SRCINFO58
-rw-r--r--PKGBUILD50
-rw-r--r--appearance__buttons-menus-icons.patch12
-rw-r--r--appearance__disable-backdrop.patch8
-rw-r--r--appearance__file-chooser.patch6
-rw-r--r--appearance__message-dialogs.patch18
-rw-r--r--appearance__print-dialog.patch12
-rw-r--r--appearance__smaller-statusbar.patch6
-rw-r--r--csd__clean-headerbar.patch14
-rw-r--r--csd__disabled-by-default.patch6
-rw-r--r--csd__server-side-shadow.patch6
-rw-r--r--file-chooser__places-sidebar.patch12
-rw-r--r--file-chooser__typeahead.patch6
-rw-r--r--fixes__atk-bridge-errors.patch6
-rw-r--r--fixes__labels-wrapping.patch6
-rw-r--r--fixes__too-large-menu-covers-bar.disabled-patch4
-rw-r--r--other__default-settings.patch18
-rw-r--r--other__hide-insert-emoji.patch12
-rw-r--r--other__mnemonics-delay.patch6
-rw-r--r--plus23.patch.xzbin12644 -> 0 bytes
-rw-r--r--popovers__color-chooser.patch6
-rw-r--r--popovers__file-chooser-list.patch12
-rw-r--r--popovers__places-sidebar.patch6
-rw-r--r--series1
24 files changed, 143 insertions, 148 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7b2a9818891f..97514b2734ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gtk3-classic
pkgdesc = GTK3 patched for classic desktops like XFCE or MATE. Please see README.
- pkgver = 3.24.13+23
+ pkgver = 3.24.14
pkgrel = 1
url = https://github.com/krumelmonster/gtk3-mushrooms
install = gtk3.install
@@ -58,13 +58,12 @@ pkgbase = gtk3-classic
makedepends = lib32-libcups
makedepends = lib32-krb5
makedepends = lib32-e2fsprogs
- provides = gtk3=3.24.13
- provides = gtk3-mushrooms=3.24.13
+ provides = gtk3=3.24.14
+ provides = gtk3-mushrooms=3.24.14
provides = gtk3-print-backends
conflicts = gtk3
conflicts = gtk3-print-backends
source = series
- source = plus23.patch.xz
source = appearance__buttons-menus-icons.patch
source = appearance__disable-backdrop.patch
source = appearance__file-chooser.patch
@@ -86,34 +85,33 @@ pkgbase = gtk3-classic
source = popovers__file-chooser-list.patch
source = popovers__places-sidebar.patch
source = smaller-adwaita.css
- source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.13.tar.xz
+ source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.14.tar.xz
source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=dd59624b448ca6f6e48d4f1268fd3c871a20ae76
source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=dd59624b448ca6f6e48d4f1268fd3c871a20ae76
source = README.md
- sha256sums = 01d9f898c75bbe8864651e5058289e8d61626bd5fe231f382cfbcad74af69fa1
- sha256sums = 3f09e78c05868d9af21f5ede03a25d99aaba30adb469ea4e64ad5f0ad3719cb7
- sha256sums = c39e5150702006ecabbb88c14e2319153296e9cf5c8e0278ebcf7fc66603c85a
- sha256sums = 5234787a01cd2dda127c7dfd066f8e3c9e4bf953b631304340e6f1ddc9d876bd
- sha256sums = 6aa86c7375a29ead4444e669f3ff880c4512591f1c939195c379203b323917f4
- sha256sums = 1b2e522770c61a18ee68ce99510a03e452c9bcda3e39ced585059e7b29ebdc36
- sha256sums = e51bc1aba0e98f1af8a6f6b04b66ab519f3e0933bd52cf724dc4d00bc064f5cc
- sha256sums = 31ed9560b395a4a7cb46acd54f429426ecc4b7463b1ee46046786c8ccbe44f5b
- sha256sums = 856eeedcc5a6fa808b2f2ad8d210d441b08c6106fc145b81bbc26af649734a8d
- sha256sums = 1a2941de50f881fe2e91fc2816c08be6d30349fc2e5f2483f027ee553ec7cb30
- sha256sums = 679d1c28981afdfa8ded5e6f89765a1a1fe7f2beab74e14b58bcc823cb581fdf
- sha256sums = 58a891b6c364090d56a14a84b1e55fc7993c3f0c071fce69f257b452cab03308
- sha256sums = 3281ff1522634f77471bb97e709dd3dfcb88f1907c85a6d8c7c962c7b2b30575
- sha256sums = 69ca5447db5443ef9539033cb72dfd08b0a62f034757a8aeefa9b57657fc6e60
- sha256sums = dcaa4d091721a1493b7e0c70c5b15d94af459905b9c9ef76d33d5211b6136645
- sha256sums = 2497ffb697f5ac9fc55c67674b672200548955ff0a3c73d6f9c5b2256e2a6138
- sha256sums = 724e18f309576d27bc17b70f3719fb8db7d82917d99f04f37da420219e769c93
- sha256sums = af9b112d1140c7f8028bc8150b5b42bb8b8397c590bc15017c9a1f5feee22dae
- sha256sums = eef29d471bd9645b41b6ecbb1042d669290c0550c9afb990f16d75b372f2c524
- sha256sums = ec552ded4e07ab4325ba946d9bfb86b3d109cdecb3fd574a4b263bca1ffc6295
- sha256sums = 7ec4ac55ca86c862c27790ba60120738138d6cb725d12f8f6e8da7a762111a2e
- sha256sums = 55bf4c426ee0a9c637832229e188cfa3bd0be48a190289a0aa5fbc4b78b5bca3
+ sha256sums = 4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c
+ sha256sums = 963d8ac098b4be573897d231acfbb53185bbffae0ecf94861a60271ee664ed0e
+ sha256sums = 3ccdaf68ed3c557987b984d7ad18a3af1e870e8488cd0fb010568281bcbca092
+ sha256sums = 16edf7014239d5ae956d5742167f9facbb6b04588be1c9c4644bb745b7eb7e2b
+ sha256sums = 441e15fdcf3a909628506decdfdaf941e4f812863f2e3e0820e39c61bf93be88
+ sha256sums = 568cd11b34cbfb593bb0aa4c2ae2d2af13e539a5b3d1aca1d370daf791bb9896
+ sha256sums = 3c9c57338bb6ae44a772d189dbaccf1a58f6e64704842ade847ff1bbe11e3ccd
+ sha256sums = 66876362683d2f166842be053c1d324e47df475c1535ff6913ea8245d5a907d9
+ sha256sums = a1a0d1a7365e7691c4434628e592a853b8593a417962fa01f7ad4792bb1522e8
+ sha256sums = 99d899d53565a74c78f139f57cf726c292b77f2b467ab03ef557ac7e575f86ad
+ sha256sums = 07b3959d1603e5f21f254d01335ff56a5fe5edfec998fd248f12ad925700831d
+ sha256sums = 102479f46d9c40c553824b5f470fc19b9261e7c45ab0333859c04e2e0447c470
+ sha256sums = 384f448b71980f32bd298e491434aa0817f5193c07553f1bbdb937e90c990b61
+ sha256sums = 4386617c929c835c9a94f17a28aa03a4f63f90767cee24c874af77f94efe166d
+ sha256sums = 03e9c02971f9221df1d28421f76263044d1e1a73e00051fea0a8323c7577f247
+ sha256sums = d868f79b37e8c5d032b5f0fd1ea51a8c50996cb5fa2bf693de082215e9f892db
+ sha256sums = b4c2dccfb6a1332512c705012be9ffb6bcf07794becda2592c686e9a37054375
+ sha256sums = 009973688864b30287da1768ee56d92bb26974aa097501aef467f0749801ef7a
+ sha256sums = e6517444d9ec7fb76a2d644a55658dae6f94aba67aba5c230f11afefa9271b51
+ sha256sums = 41080e3632254e50a703dd69f5761784d1545471f8bf3cab1db9eee123957f2f
+ sha256sums = 07faab98d9ff20f7323846840afe860a7fa4a35e67f949e5c26f73fd997d42d5
sha256sums = ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31
- sha256sums = 4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9
+ sha256sums = 1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88
sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
sha256sums = 1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada
@@ -170,7 +168,7 @@ pkgname = lib32-gtk3-classic
depends = lib32-libcups
depends = lib32-krb5
depends = lib32-e2fsprogs
- depends = gtk3-classic>=3.24.13+23
- provides = lib32-gtk3=3.24.13+23
+ depends = gtk3-classic>=3.24.14
+ provides = lib32-gtk3=3.24.14
conflicts = lib32-gtk3
diff --git a/PKGBUILD b/PKGBUILD
index e65e00679280..9f71c6c1e0a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,11 @@
# https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
__arch_pkg_commit="dd59624b448ca6f6e48d4f1268fd3c871a20ae76"
-_gtkver=3.24.13
+_gtkver=3.24.14
pkgbase=gtk3-classic
pkgname=($pkgbase lib32-$pkgbase)
-pkgver=${_gtkver}+23
+pkgver=${_gtkver}
pkgrel=1
pkgdesc="GTK3 patched for classic desktops like XFCE or MATE. Please see README."
url="https://github.com/krumelmonster/gtk3-mushrooms"
@@ -35,7 +35,6 @@ install=gtk3.install
source=(
# Patch files.
series
- plus23.patch.xz
appearance__buttons-menus-icons.patch
appearance__disable-backdrop.patch
appearance__file-chooser.patch
@@ -69,30 +68,29 @@ source=(
README.md
)
-sha256sums=('01d9f898c75bbe8864651e5058289e8d61626bd5fe231f382cfbcad74af69fa1'
- '3f09e78c05868d9af21f5ede03a25d99aaba30adb469ea4e64ad5f0ad3719cb7'
- 'c39e5150702006ecabbb88c14e2319153296e9cf5c8e0278ebcf7fc66603c85a'
- '5234787a01cd2dda127c7dfd066f8e3c9e4bf953b631304340e6f1ddc9d876bd'
- '6aa86c7375a29ead4444e669f3ff880c4512591f1c939195c379203b323917f4'
- '1b2e522770c61a18ee68ce99510a03e452c9bcda3e39ced585059e7b29ebdc36'
- 'e51bc1aba0e98f1af8a6f6b04b66ab519f3e0933bd52cf724dc4d00bc064f5cc'
- '31ed9560b395a4a7cb46acd54f429426ecc4b7463b1ee46046786c8ccbe44f5b'
- '856eeedcc5a6fa808b2f2ad8d210d441b08c6106fc145b81bbc26af649734a8d'
- '1a2941de50f881fe2e91fc2816c08be6d30349fc2e5f2483f027ee553ec7cb30'
- '679d1c28981afdfa8ded5e6f89765a1a1fe7f2beab74e14b58bcc823cb581fdf'
- '58a891b6c364090d56a14a84b1e55fc7993c3f0c071fce69f257b452cab03308'
- '3281ff1522634f77471bb97e709dd3dfcb88f1907c85a6d8c7c962c7b2b30575'
- '69ca5447db5443ef9539033cb72dfd08b0a62f034757a8aeefa9b57657fc6e60'
- 'dcaa4d091721a1493b7e0c70c5b15d94af459905b9c9ef76d33d5211b6136645'
- '2497ffb697f5ac9fc55c67674b672200548955ff0a3c73d6f9c5b2256e2a6138'
- '724e18f309576d27bc17b70f3719fb8db7d82917d99f04f37da420219e769c93'
- 'af9b112d1140c7f8028bc8150b5b42bb8b8397c590bc15017c9a1f5feee22dae'
- 'eef29d471bd9645b41b6ecbb1042d669290c0550c9afb990f16d75b372f2c524'
- 'ec552ded4e07ab4325ba946d9bfb86b3d109cdecb3fd574a4b263bca1ffc6295'
- '7ec4ac55ca86c862c27790ba60120738138d6cb725d12f8f6e8da7a762111a2e'
- '55bf4c426ee0a9c637832229e188cfa3bd0be48a190289a0aa5fbc4b78b5bca3'
+sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c'
+ '963d8ac098b4be573897d231acfbb53185bbffae0ecf94861a60271ee664ed0e'
+ '3ccdaf68ed3c557987b984d7ad18a3af1e870e8488cd0fb010568281bcbca092'
+ '16edf7014239d5ae956d5742167f9facbb6b04588be1c9c4644bb745b7eb7e2b'
+ '441e15fdcf3a909628506decdfdaf941e4f812863f2e3e0820e39c61bf93be88'
+ '568cd11b34cbfb593bb0aa4c2ae2d2af13e539a5b3d1aca1d370daf791bb9896'
+ '3c9c57338bb6ae44a772d189dbaccf1a58f6e64704842ade847ff1bbe11e3ccd'
+ '66876362683d2f166842be053c1d324e47df475c1535ff6913ea8245d5a907d9'
+ 'a1a0d1a7365e7691c4434628e592a853b8593a417962fa01f7ad4792bb1522e8'
+ '99d899d53565a74c78f139f57cf726c292b77f2b467ab03ef557ac7e575f86ad'
+ '07b3959d1603e5f21f254d01335ff56a5fe5edfec998fd248f12ad925700831d'
+ '102479f46d9c40c553824b5f470fc19b9261e7c45ab0333859c04e2e0447c470'
+ '384f448b71980f32bd298e491434aa0817f5193c07553f1bbdb937e90c990b61'
+ '4386617c929c835c9a94f17a28aa03a4f63f90767cee24c874af77f94efe166d'
+ '03e9c02971f9221df1d28421f76263044d1e1a73e00051fea0a8323c7577f247'
+ 'd868f79b37e8c5d032b5f0fd1ea51a8c50996cb5fa2bf693de082215e9f892db'
+ 'b4c2dccfb6a1332512c705012be9ffb6bcf07794becda2592c686e9a37054375'
+ '009973688864b30287da1768ee56d92bb26974aa097501aef467f0749801ef7a'
+ 'e6517444d9ec7fb76a2d644a55658dae6f94aba67aba5c230f11afefa9271b51'
+ '41080e3632254e50a703dd69f5761784d1545471f8bf3cab1db9eee123957f2f'
+ '07faab98d9ff20f7323846840afe860a7fa4a35e67f949e5c26f73fd997d42d5'
'ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31'
- '4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9'
+ '1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88'
'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
'1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada')
diff --git a/appearance__buttons-menus-icons.patch b/appearance__buttons-menus-icons.patch
index 509b0907131f..40e209268bfa 100644
--- a/appearance__buttons-menus-icons.patch
+++ b/appearance__buttons-menus-icons.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkbutton.c
+Index: b/gtk+-3.24.14/gtk/gtkbutton.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkbutton.c
-+++ src/gtk+-3.24.13/gtk/gtkbutton.c
+--- a/gtk+-3.24.14/gtk/gtkbutton.c
++++ b/gtk+-3.24.14/gtk/gtkbutton.c
@@ -2164,6 +2164,27 @@ gtk_button_set_label (GtkButton *butto
g_return_if_fail (GTK_IS_BUTTON (button));
@@ -30,10 +30,10 @@ Index: src/gtk+-3.24.13/gtk/gtkbutton.c
new_label = g_strdup (label);
g_free (priv->label_text);
-Index: src/gtk+-3.24.13/gtk/gtkmenuitem.c
+Index: b/gtk+-3.24.14/gtk/gtkmenuitem.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkmenuitem.c
-+++ src/gtk+-3.24.13/gtk/gtkmenuitem.c
+--- a/gtk+-3.24.14/gtk/gtkmenuitem.c
++++ b/gtk+-3.24.14/gtk/gtkmenuitem.c
@@ -1010,6 +1010,20 @@ gtk_menu_item_new_with_label (const gcha
GtkWidget*
gtk_menu_item_new_with_mnemonic (const gchar *label)
diff --git a/appearance__disable-backdrop.patch b/appearance__disable-backdrop.patch
index 44f248ffed1c..646d64e1c51e 100644
--- a/appearance__disable-backdrop.patch
+++ b/appearance__disable-backdrop.patch
@@ -1,8 +1,8 @@
-Index: src/gtk+-3.24.13/gtk/gtkwindow.c
+Index: b/gtk+-3.24.14/gtk/gtkwindow.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkwindow.c
-+++ src/gtk+-3.24.13/gtk/gtkwindow.c
-@@ -8011,7 +8011,7 @@ gtk_window_state_event (GtkWidget
+--- a/gtk+-3.24.14/gtk/gtkwindow.c
++++ b/gtk+-3.24.14/gtk/gtkwindow.c
+@@ -8004,7 +8004,7 @@ gtk_window_state_event (GtkWidget
GtkWindow *window = GTK_WINDOW (widget);
GtkWindowPrivate *priv = window->priv;
diff --git a/appearance__file-chooser.patch b/appearance__file-chooser.patch
index cd18c4f987d3..bfc7f0594553 100644
--- a/appearance__file-chooser.patch
+++ b/appearance__file-chooser.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
+Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
-+++ src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
+--- a/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
++++ b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
@@ -78,6 +78,7 @@
#include "gtkseparator.h"
#include "gtkmodelbutton.h"
diff --git a/appearance__message-dialogs.patch b/appearance__message-dialogs.patch
index e31a4ab009c0..e3334403e73f 100644
--- a/appearance__message-dialogs.patch
+++ b/appearance__message-dialogs.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkdialog.c
+Index: b/gtk+-3.24.14/gtk/gtkdialog.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkdialog.c
-+++ src/gtk+-3.24.13/gtk/gtkdialog.c
+--- a/gtk+-3.24.14/gtk/gtkdialog.c
++++ b/gtk+-3.24.14/gtk/gtkdialog.c
@@ -700,12 +700,12 @@ update_spacings (GtkDialog *dialog)
/* don't set spacing when buttons are linked */
@@ -17,10 +17,10 @@ Index: src/gtk+-3.24.13/gtk/gtkdialog.c
_gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE);
}
}
-Index: src/gtk+-3.24.13/gtk/gtkmessagedialog.c
+Index: b/gtk+-3.24.14/gtk/gtkmessagedialog.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkmessagedialog.c
-+++ src/gtk+-3.24.13/gtk/gtkmessagedialog.c
+--- a/gtk+-3.24.14/gtk/gtkmessagedialog.c
++++ b/gtk+-3.24.14/gtk/gtkmessagedialog.c
@@ -37,6 +37,7 @@
#include "gtkintl.h"
#include "gtkprivate.h"
@@ -92,10 +92,10 @@ Index: src/gtk+-3.24.13/gtk/gtkmessagedialog.c
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
if (GTK_IS_ACCESSIBLE (atk_obj))
{
-Index: src/gtk+-3.24.13/gtk/ui/gtkmessagedialog.ui
+Index: b/gtk+-3.24.14/gtk/ui/gtkmessagedialog.ui
===================================================================
---- src.orig/gtk+-3.24.13/gtk/ui/gtkmessagedialog.ui
-+++ src/gtk+-3.24.13/gtk/ui/gtkmessagedialog.ui
+--- a/gtk+-3.24.14/gtk/ui/gtkmessagedialog.ui
++++ b/gtk+-3.24.14/gtk/ui/gtkmessagedialog.ui
@@ -6,6 +6,7 @@
<property name="resizable">0</property>
<property name="type-hint">dialog</property>
diff --git a/appearance__print-dialog.patch b/appearance__print-dialog.patch
index 524cbfef64ac..f492aaec53f7 100644
--- a/appearance__print-dialog.patch
+++ b/appearance__print-dialog.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkprintunixdialog.c
+Index: b/gtk+-3.24.14/gtk/gtkprintunixdialog.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkprintunixdialog.c
-+++ src/gtk+-3.24.13/gtk/gtkprintunixdialog.c
+--- a/gtk+-3.24.14/gtk/gtkprintunixdialog.c
++++ b/gtk+-3.24.14/gtk/gtkprintunixdialog.c
@@ -750,6 +750,11 @@ gtk_print_unix_dialog_init (GtkPrintUnix
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
widget = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -14,10 +14,10 @@ Index: src/gtk+-3.24.13/gtk/gtkprintunixdialog.c
/* Treeview auxiliary functions need to be setup here */
gtk_tree_model_filter_set_visible_func (priv->printer_list_filter,
-Index: src/gtk+-3.24.13/gtk/ui/gtkprintunixdialog.ui
+Index: b/gtk+-3.24.14/gtk/ui/gtkprintunixdialog.ui
===================================================================
---- src.orig/gtk+-3.24.13/gtk/ui/gtkprintunixdialog.ui
-+++ src/gtk+-3.24.13/gtk/ui/gtkprintunixdialog.ui
+--- a/gtk+-3.24.14/gtk/ui/gtkprintunixdialog.ui
++++ b/gtk+-3.24.14/gtk/ui/gtkprintunixdialog.ui
@@ -48,6 +48,7 @@
<property name="step-increment">1</property>
</object>
diff --git a/appearance__smaller-statusbar.patch b/appearance__smaller-statusbar.patch
index 66c32e7cf806..1f87af5be657 100644
--- a/appearance__smaller-statusbar.patch
+++ b/appearance__smaller-statusbar.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/ui/gtkstatusbar.ui
+Index: b/gtk+-3.24.14/gtk/ui/gtkstatusbar.ui
===================================================================
---- src.orig/gtk+-3.24.13/gtk/ui/gtkstatusbar.ui
-+++ src/gtk+-3.24.13/gtk/ui/gtkstatusbar.ui
+--- a/gtk+-3.24.14/gtk/ui/gtkstatusbar.ui
++++ b/gtk+-3.24.14/gtk/ui/gtkstatusbar.ui
@@ -5,8 +5,8 @@
<property name="spacing">2</property>
<property name="margin-start">10</property>
diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch
index 3e5b41999949..ea6d6ea6e907 100644
--- a/csd__clean-headerbar.patch
+++ b/csd__clean-headerbar.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkheaderbar.c
+Index: b/gtk+-3.24.14/gtk/gtkheaderbar.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkheaderbar.c
-+++ src/gtk+-3.24.13/gtk/gtkheaderbar.c
+--- a/gtk+-3.24.14/gtk/gtkheaderbar.c
++++ b/gtk+-3.24.14/gtk/gtkheaderbar.c
@@ -300,6 +300,27 @@ _gtk_header_bar_update_window_buttons (G
priv->titlebar_icon = NULL;
@@ -59,10 +59,10 @@ Index: src/gtk+-3.24.13/gtk/gtkheaderbar.c
}
/**
-Index: src/gtk+-3.24.13/gtk/gtkwindow.c
+Index: b/gtk+-3.24.14/gtk/gtkwindow.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkwindow.c
-+++ src/gtk+-3.24.13/gtk/gtkwindow.c
+--- a/gtk+-3.24.14/gtk/gtkwindow.c
++++ b/gtk+-3.24.14/gtk/gtkwindow.c
@@ -4168,6 +4168,8 @@ on_titlebar_title_notify (GtkHeaderBar *
const gchar *title;
@@ -72,7 +72,7 @@ Index: src/gtk+-3.24.13/gtk/gtkwindow.c
gtk_window_set_title_internal (self, title, FALSE);
}
-@@ -9360,6 +9362,7 @@ static void
+@@ -9353,6 +9355,7 @@ static void
gtk_window_do_popup (GtkWindow *window,
GdkEventButton *event)
{
diff --git a/csd__disabled-by-default.patch b/csd__disabled-by-default.patch
index 7d2576f3f948..9729a444c5ce 100644
--- a/csd__disabled-by-default.patch
+++ b/csd__disabled-by-default.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkwindow.c
+Index: b/gtk+-3.24.14/gtk/gtkwindow.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkwindow.c
-+++ src/gtk+-3.24.13/gtk/gtkwindow.c
+--- a/gtk+-3.24.14/gtk/gtkwindow.c
++++ b/gtk+-3.24.14/gtk/gtkwindow.c
@@ -4158,6 +4158,14 @@ gtk_window_enable_csd (GtkWindow *window
}
diff --git a/csd__server-side-shadow.patch b/csd__server-side-shadow.patch
index 9d76f1c3b04d..a77ef61a2c7e 100644
--- a/csd__server-side-shadow.patch
+++ b/csd__server-side-shadow.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkwindow.c
+Index: b/gtk+-3.24.14/gtk/gtkwindow.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkwindow.c
-+++ src/gtk+-3.24.13/gtk/gtkwindow.c
+--- a/gtk+-3.24.14/gtk/gtkwindow.c
++++ b/gtk+-3.24.14/gtk/gtkwindow.c
@@ -4107,6 +4107,8 @@ gtk_window_supports_client_shadow (GtkWi
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display))
diff --git a/file-chooser__places-sidebar.patch b/file-chooser__places-sidebar.patch
index 9c6606dd8ad8..8f623b2278a2 100644
--- a/file-chooser__places-sidebar.patch
+++ b/file-chooser__places-sidebar.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkplacessidebar.c
+Index: b/gtk+-3.24.14/gtk/gtkplacessidebar.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkplacessidebar.c
-+++ src/gtk+-3.24.13/gtk/gtkplacessidebar.c
+--- a/gtk+-3.24.14/gtk/gtkplacessidebar.c
++++ b/gtk+-3.24.14/gtk/gtkplacessidebar.c
@@ -633,6 +633,7 @@ open_home (GtkPlacesSidebar *sidebar)
static void
add_special_dirs (GtkPlacesSidebar *sidebar)
@@ -46,10 +46,10 @@ Index: src/gtk+-3.24.13/gtk/gtkplacessidebar.c
sidebar->hostnamed_cancellable = g_cancellable_new ();
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-Index: src/gtk+-3.24.13/gtk/ui/gtkfilechooserwidget.ui
+Index: b/gtk+-3.24.14/gtk/ui/gtkfilechooserwidget.ui
===================================================================
---- src.orig/gtk+-3.24.13/gtk/ui/gtkfilechooserwidget.ui
-+++ src/gtk+-3.24.13/gtk/ui/gtkfilechooserwidget.ui
+--- a/gtk+-3.24.14/gtk/ui/gtkfilechooserwidget.ui
++++ b/gtk+-3.24.14/gtk/ui/gtkfilechooserwidget.ui
@@ -16,7 +16,8 @@
<property name="visible">1</property>
<property name="hscrollbar-policy">never</property>
diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch
index eb023026b599..399d85d662ed 100644
--- a/file-chooser__typeahead.patch
+++ b/file-chooser__typeahead.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
+Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
-+++ src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
+--- a/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
++++ b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
@@ -1419,7 +1419,7 @@ gtk_file_chooser_widget_key_press_event
return TRUE;
}
diff --git a/fixes__atk-bridge-errors.patch b/fixes__atk-bridge-errors.patch
index 419d70689e18..9b3e1bd19b26 100644
--- a/fixes__atk-bridge-errors.patch
+++ b/fixes__atk-bridge-errors.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/a11y/gtkaccessibility.c
+Index: b/gtk+-3.24.14/gtk/a11y/gtkaccessibility.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/a11y/gtkaccessibility.c
-+++ src/gtk+-3.24.13/gtk/a11y/gtkaccessibility.c
+--- a/gtk+-3.24.14/gtk/a11y/gtkaccessibility.c
++++ b/gtk+-3.24.14/gtk/a11y/gtkaccessibility.c
@@ -989,7 +989,10 @@ _gtk_accessibility_init (void)
do_window_event_initialization ();
diff --git a/fixes__labels-wrapping.patch b/fixes__labels-wrapping.patch
index e6e9be7d1188..2a77e41f3c55 100644
--- a/fixes__labels-wrapping.patch
+++ b/fixes__labels-wrapping.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtklabel.c
+Index: b/gtk+-3.24.14/gtk/gtklabel.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtklabel.c
-+++ src/gtk+-3.24.13/gtk/gtklabel.c
+--- a/gtk+-3.24.14/gtk/gtklabel.c
++++ b/gtk+-3.24.14/gtk/gtklabel.c
@@ -3685,6 +3685,14 @@ gtk_label_get_preferred_layout_size (Gtk
GtkLabelPrivate *priv = label->priv;
PangoLayout *layout;
diff --git a/fixes__too-large-menu-covers-bar.disabled-patch b/fixes__too-large-menu-covers-bar.disabled-patch
index 02ffb2163e94..27566c4797fe 100644
--- a/fixes__too-large-menu-covers-bar.disabled-patch
+++ b/fixes__too-large-menu-covers-bar.disabled-patch
@@ -1,6 +1,6 @@
diff --color -U 5 -r -Z -B gtk/gtkmenu.c gtk/gtkmenu.c
---- src/gtk+-3.24.13/gtk/gtkmenu.c 2018-01-31 18:37:18.000000000 +0100
-+++ src/gtk+-3.24.13/gtk/gtkmenu.c 2018-07-16 23:43:51.061469725 +0200
+--- src/gtk+-3.24.14/gtk/gtkmenu.c 2018-01-31 18:37:18.000000000 +0100
++++ src/gtk+-3.24.14/gtk/gtkmenu.c 2018-07-16 23:43:51.061469725 +0200
@@ -1393,10 +1393,17 @@
const GdkRectangle *final_rect,
gboolean flipped_x,
diff --git a/other__default-settings.patch b/other__default-settings.patch
index 570e5b0872c0..343c675ded93 100644
--- a/other__default-settings.patch
+++ b/other__default-settings.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkscrolledwindow.c
+Index: b/gtk+-3.24.14/gtk/gtkscrolledwindow.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkscrolledwindow.c
-+++ src/gtk+-3.24.13/gtk/gtkscrolledwindow.c
+--- a/gtk+-3.24.14/gtk/gtkscrolledwindow.c
++++ b/gtk+-3.24.14/gtk/gtkscrolledwindow.c
@@ -4448,7 +4448,7 @@ gtk_scrolled_window_update_use_indicator
use_indicators = overlay_scrolling && priv->overlay_scrolling;
@@ -11,10 +11,10 @@ Index: src/gtk+-3.24.13/gtk/gtkscrolledwindow.c
use_indicators = FALSE;
if (priv->use_indicators != use_indicators)
-Index: src/gtk+-3.24.13/gtk/gtksettings.c
+Index: b/gtk+-3.24.14/gtk/gtksettings.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtksettings.c
-+++ src/gtk+-3.24.13/gtk/gtksettings.c
+--- a/gtk+-3.24.14/gtk/gtksettings.c
++++ b/gtk+-3.24.14/gtk/gtksettings.c
@@ -61,7 +61,7 @@
#ifdef GDK_WINDOWING_QUARTZ
#define PRINT_PREVIEW_COMMAND "open -a /Applications/Preview.app %f"
@@ -24,10 +24,10 @@ Index: src/gtk+-3.24.13/gtk/gtksettings.c
#endif
/**
-Index: src/gtk+-3.24.13/gtk/org.gtk.Settings.FileChooser.gschema.xml
+Index: b/gtk+-3.24.14/gtk/org.gtk.Settings.FileChooser.gschema.xml
===================================================================
---- src.orig/gtk+-3.24.13/gtk/org.gtk.Settings.FileChooser.gschema.xml
-+++ src/gtk+-3.24.13/gtk/org.gtk.Settings.FileChooser.gschema.xml
+--- a/gtk+-3.24.14/gtk/org.gtk.Settings.FileChooser.gschema.xml
++++ b/gtk+-3.24.14/gtk/org.gtk.Settings.FileChooser.gschema.xml
@@ -133,7 +133,7 @@
</description>
</key>
diff --git a/other__hide-insert-emoji.patch b/other__hide-insert-emoji.patch
index e84df325ea4f..e4ea53d9f230 100644
--- a/other__hide-insert-emoji.patch
+++ b/other__hide-insert-emoji.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkentry.c
+Index: b/gtk+-3.24.14/gtk/gtkentry.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkentry.c
-+++ src/gtk+-3.24.13/gtk/gtkentry.c
+--- a/gtk+-3.24.14/gtk/gtkentry.c
++++ b/gtk+-3.24.14/gtk/gtkentry.c
@@ -9626,7 +9626,8 @@ popup_targets_received (GtkClipboard
g_signal_connect_swapped (menuitem, "activate",
G_CALLBACK (gtk_entry_insert_emoji), entry);
@@ -12,10 +12,10 @@ Index: src/gtk+-3.24.13/gtk/gtkentry.c
}
g_signal_emit (entry, signals[POPULATE_POPUP], 0, menu);
-Index: src/gtk+-3.24.13/gtk/gtktextview.c
+Index: b/gtk+-3.24.14/gtk/gtktextview.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtktextview.c
-+++ src/gtk+-3.24.13/gtk/gtktextview.c
+--- a/gtk+-3.24.14/gtk/gtktextview.c
++++ b/gtk+-3.24.14/gtk/gtktextview.c
@@ -9537,7 +9537,8 @@ popup_targets_received (GtkClipboard
g_signal_connect_swapped (menuitem, "activate",
G_CALLBACK (gtk_text_view_insert_emoji), text_view);
diff --git a/other__mnemonics-delay.patch b/other__mnemonics-delay.patch
index 01bc21b7bc7a..3b0623e40a18 100644
--- a/other__mnemonics-delay.patch
+++ b/other__mnemonics-delay.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkwindow.c
+Index: b/gtk+-3.24.14/gtk/gtkwindow.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkwindow.c
-+++ src/gtk+-3.24.13/gtk/gtkwindow.c
+--- a/gtk+-3.24.14/gtk/gtkwindow.c
++++ b/gtk+-3.24.14/gtk/gtkwindow.c
@@ -147,7 +147,7 @@
* widget that is added as a titlebar child.
*/
diff --git a/plus23.patch.xz b/plus23.patch.xz
deleted file mode 100644
index d564f6f29e22..000000000000
--- a/plus23.patch.xz
+++ /dev/null
Binary files differ
diff --git a/popovers__color-chooser.patch b/popovers__color-chooser.patch
index 2e6a89f05cdd..61b239acc4a6 100644
--- a/popovers__color-chooser.patch
+++ b/popovers__color-chooser.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkcolorswatch.c
+Index: b/gtk+-3.24.14/gtk/gtkcolorswatch.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkcolorswatch.c
-+++ src/gtk+-3.24.13/gtk/gtkcolorswatch.c
+--- a/gtk+-3.24.14/gtk/gtkcolorswatch.c
++++ b/gtk+-3.24.14/gtk/gtkcolorswatch.c
@@ -349,6 +349,17 @@ do_popup (GtkColorSwatch *swatch)
{
if (swatch->priv->popover == NULL)
diff --git a/popovers__file-chooser-list.patch b/popovers__file-chooser-list.patch
index ff95bf79c8c4..9863826ac0da 100644
--- a/popovers__file-chooser-list.patch
+++ b/popovers__file-chooser-list.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
+Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
-+++ src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
+--- a/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
++++ b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
@@ -29,6 +29,7 @@
#include "gtkcellrendererpixbuf.h"
#include "gtkcellrenderertext.h"
@@ -29,7 +29,7 @@ Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
return separator;
}
-@@ -2289,12 +2294,14 @@ add_button (GtkWidget *box,
+@@ -2289,12 +2284,14 @@ add_button (GtkWidget *box,
{
GtkWidget *item;
@@ -50,7 +50,7 @@ Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
return item;
}
-@@ -2308,11 +2315,9 @@ file_list_build_popover (GtkFileChooserW
+@@ -2308,11 +2305,9 @@ file_list_build_popover (GtkFileChooserW
if (priv->browse_files_popover)
return;
@@ -65,7 +65,7 @@ Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c
priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit");
priv->open_folder_item = add_button (box, _("_Open With File Manager"), "item.open");
-@@ -2329,6 +2334,12 @@ file_list_build_popover (GtkFileChooserW
+@@ -2329,6 +2324,12 @@ file_list_build_popover (GtkFileChooserW
priv->type_column_item = add_button (box, _("Show T_ype Column"), "item.toggle-show-type");
priv->show_time_item = add_button (box, _("Show _Time"), "item.toggle-show-time");
priv->sort_directories_item = add_button (box, _("Sort _Folders before Files"), "item.toggle-sort-dirs-first");
diff --git a/popovers__places-sidebar.patch b/popovers__places-sidebar.patch
index 267e0e26ded3..65e3770fcffe 100644
--- a/popovers__places-sidebar.patch
+++ b/popovers__places-sidebar.patch
@@ -1,7 +1,7 @@
-Index: src/gtk+-3.24.13/gtk/gtkplacessidebar.c
+Index: b/gtk+-3.24.14/gtk/gtkplacessidebar.c
===================================================================
---- src.orig/gtk+-3.24.13/gtk/gtkplacessidebar.c
-+++ src/gtk+-3.24.13/gtk/gtkplacessidebar.c
+--- a/gtk+-3.24.14/gtk/gtkplacessidebar.c
++++ b/gtk+-3.24.14/gtk/gtkplacessidebar.c
@@ -64,6 +64,7 @@
#include "gtkgesturelongpress.h"
#include "gtkbox.h"
diff --git a/series b/series
index 390749b511cf..fc430c001aaa 100644
--- a/series
+++ b/series
@@ -1,4 +1,3 @@
-plus23.patch
appearance__buttons-menus-icons.patch
appearance__disable-backdrop.patch
appearance__file-chooser.patch