diff --git a/.SRCINFO b/.SRCINFO index 98691b8..845b36c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = gtk3-mushrooms pkgdesc = GTK3 library with my modifications (see README). - pkgver = 3.22.28 + pkgver = 3.22.29 pkgrel = 1 url = http://www.gtk.org/ arch = x86_64 @@ -37,7 +37,7 @@ pkgbase = gtk3-mushrooms optdepends = colord: for printing backends optdepends = rest: for printing backends optdepends = libcups: for printing backends - provides = gtk3=3.22.28 + provides = gtk3=3.22.29 provides = gtk3-print-backends conflicts = gtk3 conflicts = gtk3-print-backends @@ -53,7 +53,6 @@ pkgbase = gtk3-mushrooms source = csd__server-side-shadow.patch source = default-settings.patch source = file-chooser__places-sidebar.patch - source = file-chooser__single-click.patch source = file-chooser__typeahead.patch source = fixes__atk-bridge-errors.patch source = fixes__too-large-menu-covers-bar.patch @@ -65,12 +64,12 @@ pkgbase = gtk3-mushrooms source = popovers__menu-button.patch source = popovers__places-sidebar.patch source = smaller-adwaita.css - source = https://download.gnome.org/sources/gtk+/3.22/gtk+-3.22.28.tar.xz - source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=77104ae740d96bb94a329151aef97176ef6cd000 - 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=77104ae740d96bb94a329151aef97176ef6cd000 + source = https://download.gnome.org/sources/gtk+/3.22/gtk+-3.22.29.tar.xz + source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=4ac05111e37186cebac1c4fa22610abddb1c2d52 + 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=4ac05111e37186cebac1c4fa22610abddb1c2d52 sha256sums = 68b26360764a2ea7e057a2aaa29c6fdfe164b9987866e038d8d0188a025477fb sha256sums = b2f7d5d3a784b7f833d64c2a278f1d082bec5c53b4cc19602c808223625dedeb - sha256sums = 3d4d9cac36285e19972650a33bdba815096cb256e3f0991914ed3c8c19cfb650 + sha256sums = 86f48054a2df6319d97db14fd17ea15d50b32ea6ba594d83e8faa1596ec657ab sha256sums = 54020144ac0472ae170297b4158da719b49860b17234bf54351ba30f793a7fe7 sha256sums = be4ddf03a5cce8270e8118eb331b3056972c0bd490faa6e4a4ebe332ec4c2e91 sha256sums = 81138fbaff82e37a83da1c4aa074a6c708e6c50340e0ddeff3fb70e2a0b52e1f @@ -80,19 +79,18 @@ pkgbase = gtk3-mushrooms sha256sums = d3816c145d4e0bc3fe04904434b2e2cae5a04d5691693d6b0c86391f76a5bf6a sha256sums = 37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd sha256sums = f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791 - sha256sums = 0cd2cd0365cb532d25ef4587882062f230dfb09f36485c568bdf27c8534831b2 sha256sums = 7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672 sha256sums = 99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b sha256sums = d4d27ccc5735ee1d2c8483da659ded3a05e9d33b3fe41d8ed77495e9ec38be96 sha256sums = 3067face12ad74d664ab7951f59026c01eb8070bef007b522eb84aef1576674a - sha256sums = 2af09af914736eaff37eeec262e14ecfb835598c38cfec3ba8d0997ac2839c8e + sha256sums = acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042 sha256sums = c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071 sha256sums = 7f3e5da1622e243243ea9b1e487460f608dc375e79d800d2f0d826fd30be68ed sha256sums = ef4fed3a364db8eb9c15c9ce0e733035722f168dc88b385df2178fc1168ada54 sha256sums = fe421b6197b4e98254019896ec79ea6b29a2140e7950ce3018ae0e1e4047b0c0 sha256sums = 2de68b575494d0d034accd7cd0ce881f366d5201a48496d8748c43f297836eac sha256sums = 0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5 - sha256sums = d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f + sha256sums = a07d64b939fcc034a066b7723fdf9b24e92c9cfb6a8497593f3471fe56fbbbf8 sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845 diff --git a/PKGBUILD b/PKGBUILD index d5ef596..4a65580 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,10 +3,10 @@ # This file is based on original PKGBUILD of GTK3 package. # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3 -__arch_pkg_commit="77104ae740d96bb94a329151aef97176ef6cd000" +__arch_pkg_commit="4ac05111e37186cebac1c4fa22610abddb1c2d52" pkgname=gtk3-mushrooms -pkgver=3.22.28 +pkgver=3.22.29 pkgrel=1 pkgdesc="GTK3 library with my modifications (see README)." url="http://www.gtk.org/" @@ -45,7 +45,6 @@ source=( "csd__server-side-shadow.patch" "default-settings.patch" "file-chooser__places-sidebar.patch" - "file-chooser__single-click.patch" "file-chooser__typeahead.patch" "fixes__atk-bridge-errors.patch" "fixes__too-large-menu-covers-bar.patch" @@ -70,7 +69,7 @@ source=( sha256sums=( "68b26360764a2ea7e057a2aaa29c6fdfe164b9987866e038d8d0188a025477fb" "b2f7d5d3a784b7f833d64c2a278f1d082bec5c53b4cc19602c808223625dedeb" - "3d4d9cac36285e19972650a33bdba815096cb256e3f0991914ed3c8c19cfb650" + "86f48054a2df6319d97db14fd17ea15d50b32ea6ba594d83e8faa1596ec657ab" "54020144ac0472ae170297b4158da719b49860b17234bf54351ba30f793a7fe7" "be4ddf03a5cce8270e8118eb331b3056972c0bd490faa6e4a4ebe332ec4c2e91" "81138fbaff82e37a83da1c4aa074a6c708e6c50340e0ddeff3fb70e2a0b52e1f" @@ -80,19 +79,18 @@ sha256sums=( "d3816c145d4e0bc3fe04904434b2e2cae5a04d5691693d6b0c86391f76a5bf6a" "37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd" "f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791" - "0cd2cd0365cb532d25ef4587882062f230dfb09f36485c568bdf27c8534831b2" "7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672" "99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b" "d4d27ccc5735ee1d2c8483da659ded3a05e9d33b3fe41d8ed77495e9ec38be96" "3067face12ad74d664ab7951f59026c01eb8070bef007b522eb84aef1576674a" - "2af09af914736eaff37eeec262e14ecfb835598c38cfec3ba8d0997ac2839c8e" + "acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042" "c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071" "7f3e5da1622e243243ea9b1e487460f608dc375e79d800d2f0d826fd30be68ed" "ef4fed3a364db8eb9c15c9ce0e733035722f168dc88b385df2178fc1168ada54" "fe421b6197b4e98254019896ec79ea6b29a2140e7950ce3018ae0e1e4047b0c0" "2de68b575494d0d034accd7cd0ce881f366d5201a48496d8748c43f297836eac" "0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5" - "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f" + "a07d64b939fcc034a066b7723fdf9b24e92c9cfb6a8497593f3471fe56fbbbf8" "01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202" "de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845" ) diff --git a/README.md b/README.md index 1647fcd..8cc8e88 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ Client Side Decorations File chooser --- -* Annoying single-click "feature" in file list is disabled. You always have to double-click to choose file from list. See https://bugzilla.gnome.org/show_bug.cgi?id=758065. * Typeahead feature is restored. Recursive file search will not be ran automatically when you start typing. You can still search recursively by Left Alt + S shortcut. See https://bugzilla.gnome.org/show_bug.cgi?id=784029. * "Other locations" button is removed from places sidebar. All mounted devices and drives are accessible directly. * Trash and XDG user directories (like Pictures, Downloads, Documents) are removed from places sidebar. You can add it as bookmarks. @@ -57,13 +56,12 @@ Fixes * Window background is set properly to theme background color instead of solid black. See https://bugzilla.gnome.org/show_bug.cgi?id=771708. * Errors in console output because of integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238. -* Menu bars are not covered by too high popup menus. +* Menu bars are not covered by too high popup menus. See https://bugzilla.gnome.org/show_bug.cgi?id=792764. -------- Credits --- -* https://launchpad.net/~gnome3-team — file chooser single-click patch. * https://aur.archlinux.org/packages/gtk3-typeahead — file chooser typeahead patch. * https://bugzilla.gnome.org/show_bug.cgi?id=757104#c0 — window background patch. diff --git a/appearance__file-chooser.patch b/appearance__file-chooser.patch index 2e46073..cbf0fbf 100644 --- a/appearance__file-chooser.patch +++ b/appearance__file-chooser.patch @@ -1,19 +1,19 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c ---- ./org/gtk/gtkfilechooserwidget.c 2017-10-02 18:00:49.000000000 +0200 -+++ ./mod/gtk/gtkfilechooserwidget.c 2017-10-30 20:35:48.363519726 +0100 -@@ -76,10 +76,11 @@ +--- ./org/gtk/gtkfilechooserwidget.c 2018-03-12 20:20:04.000000000 +0100 ++++ ./mod/gtk/gtkfilechooserwidget.c 2018-03-13 20:34:44.629974675 +0100 +@@ -75,10 +75,11 @@ + #include "gtkrevealer.h" #include "gtkspinner.h" #include "gtkseparator.h" #include "gtkmodelbutton.h" #include "gtkgesturelongpress.h" - #include "gtkdebug.h" +#include "gtkcssprovider.h" #include #ifdef HAVE_UNISTD_H #include -@@ -8595,10 +8596,20 @@ +@@ -8545,10 +8546,20 @@ gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button); gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button); gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view); diff --git a/file-chooser__single-click.patch b/file-chooser__single-click.patch deleted file mode 100644 index ce2467f..0000000 --- a/file-chooser__single-click.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c ---- ./org/gtk/gtkfilechooserwidget.c 2017-10-02 18:00:49.000000000 +0200 -+++ ./mod/gtk/gtkfilechooserwidget.c 2017-10-30 21:22:16.100324520 +0100 -@@ -2419,11 +2419,11 @@ - device = gdk_event_get_source_device ((GdkEvent *) event); - is_touchscreen = gtk_simulate_touchscreen () || - gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN; - - get_selection_modifiers (widget, event, &modify, &extend); -- if (!is_touchscreen && -+ if (FALSE && !is_touchscreen && - !modify && !extend && - event->type == GDK_BUTTON_PRESS && - event->button == GDK_BUTTON_PRIMARY && - gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->browse_files_tree_view), - event->x, event->y, diff --git a/other__hide-insert-emoji.patch b/other__hide-insert-emoji.patch index 4cbe962..dcf0ce4 100644 --- a/other__hide-insert-emoji.patch +++ b/other__hide-insert-emoji.patch @@ -1,7 +1,7 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c ---- ./org/gtk/gtkentry.c 2017-11-07 20:52:24.000000000 +0100 -+++ ./mod/gtk/gtkentry.c 2017-12-26 16:02:22.023742725 +0100 -@@ -9589,11 +9589,12 @@ +--- ./org/gtk/gtkentry.c 2018-01-09 21:28:23.000000000 +0100 ++++ ./mod/gtk/gtkentry.c 2018-03-13 20:59:04.689968427 +0100 +@@ -9598,11 +9598,12 @@ mode == DISPLAY_NORMAL && info_entry_priv->editable); g_signal_connect_swapped (menuitem, "activate", @@ -15,3 +15,20 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c g_signal_emit (entry, signals[POPULATE_POPUP], 0, menu); if (info->trigger_event && gdk_event_triggers_context_menu (info->trigger_event)) +diff --color -U 5 -r -Z -B ./org/gtk/gtktextview.c ./mod/gtk/gtktextview.c +--- ./org/gtk/gtktextview.c 2018-01-09 21:28:23.000000000 +0100 ++++ ./mod/gtk/gtktextview.c 2018-03-13 20:59:17.309968373 +0100 +@@ -9524,11 +9524,12 @@ + menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji")); + gtk_widget_set_sensitive (menuitem, can_insert); + g_signal_connect_swapped (menuitem, "activate", + G_CALLBACK (gtk_text_view_insert_emoji), text_view); + gtk_widget_show (menuitem); +- gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem); ++ if (g_getenv ("GTKM_INSERT_EMOJI") != FALSE) ++ gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem); + } + + g_signal_emit (text_view, signals[POPULATE_POPUP], + 0, priv->popup_menu); +