diff options
author | Jonathon Fernyhough | 2019-12-16 21:16:20 +0000 |
---|---|---|
committer | Jonathon Fernyhough | 2019-12-16 21:16:20 +0000 |
commit | 8a69f284b1073093bb732f64682aade4fd1b0759 (patch) | |
tree | 9fe54e6cacdf9643a4974626dc1144741c86eab1 | |
parent | 573c7c52305fbb567c5ea9818b838995f33b9794 (diff) | |
download | aur-8a69f284b1073093bb732f64682aade4fd1b0759.tar.gz |
Include gtk-3-24 branch fixes to 3.24.13+23. Refresh patches. Tidy popovers__file-chooser-list.patch.
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | appearance__disable-backdrop.patch | 2 | ||||
-rw-r--r-- | csd__clean-headerbar.patch | 2 | ||||
-rw-r--r-- | plus23.patch.xz | bin | 0 -> 12644 bytes | |||
-rw-r--r-- | popovers__file-chooser-list.patch | 49 | ||||
-rw-r--r-- | series | 1 |
7 files changed, 53 insertions, 29 deletions
@@ -1,6 +1,6 @@ pkgbase = gtk3-classic pkgdesc = GTK3 patched for classic desktops like XFCE or MATE. Please see README. - pkgver = 3.24.13 + pkgver = 3.24.13+23 pkgrel = 1 url = https://github.com/krumelmonster/gtk3-mushrooms install = gtk3.install @@ -64,6 +64,7 @@ pkgbase = gtk3-classic 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 @@ -89,14 +90,15 @@ pkgbase = gtk3-classic 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 = 4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c + sha256sums = 01d9f898c75bbe8864651e5058289e8d61626bd5fe231f382cfbcad74af69fa1 + sha256sums = 3f09e78c05868d9af21f5ede03a25d99aaba30adb469ea4e64ad5f0ad3719cb7 sha256sums = c39e5150702006ecabbb88c14e2319153296e9cf5c8e0278ebcf7fc66603c85a - sha256sums = cefc28b73ab294c7b09d784341c9bbd659ce4c8381e255e394f68f5b20373425 + sha256sums = 5234787a01cd2dda127c7dfd066f8e3c9e4bf953b631304340e6f1ddc9d876bd sha256sums = 6aa86c7375a29ead4444e669f3ff880c4512591f1c939195c379203b323917f4 sha256sums = 1b2e522770c61a18ee68ce99510a03e452c9bcda3e39ced585059e7b29ebdc36 sha256sums = e51bc1aba0e98f1af8a6f6b04b66ab519f3e0933bd52cf724dc4d00bc064f5cc sha256sums = 31ed9560b395a4a7cb46acd54f429426ecc4b7463b1ee46046786c8ccbe44f5b - sha256sums = de363c448870f78f6b953fb2d1c945c361bfd3ff9c5f5e1bc98a886a5aa436cf + sha256sums = 856eeedcc5a6fa808b2f2ad8d210d441b08c6106fc145b81bbc26af649734a8d sha256sums = 1a2941de50f881fe2e91fc2816c08be6d30349fc2e5f2483f027ee553ec7cb30 sha256sums = 679d1c28981afdfa8ded5e6f89765a1a1fe7f2beab74e14b58bcc823cb581fdf sha256sums = 58a891b6c364090d56a14a84b1e55fc7993c3f0c071fce69f257b452cab03308 @@ -108,7 +110,7 @@ pkgbase = gtk3-classic sha256sums = af9b112d1140c7f8028bc8150b5b42bb8b8397c590bc15017c9a1f5feee22dae sha256sums = eef29d471bd9645b41b6ecbb1042d669290c0550c9afb990f16d75b372f2c524 sha256sums = ec552ded4e07ab4325ba946d9bfb86b3d109cdecb3fd574a4b263bca1ffc6295 - sha256sums = 57ad303c97252d9d43ac651318f17c718074b7822e553256e28a57a83a71a733 + sha256sums = 7ec4ac55ca86c862c27790ba60120738138d6cb725d12f8f6e8da7a762111a2e sha256sums = 55bf4c426ee0a9c637832229e188cfa3bd0be48a190289a0aa5fbc4b78b5bca3 sha256sums = ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31 sha256sums = 4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9 @@ -168,7 +170,7 @@ pkgname = lib32-gtk3-classic depends = lib32-libcups depends = lib32-krb5 depends = lib32-e2fsprogs - depends = gtk3-classic>=3.24.13 - provides = lib32-gtk3=3.24.13 + depends = gtk3-classic>=3.24.13+23 + provides = lib32-gtk3=3.24.13+23 conflicts = lib32-gtk3 @@ -10,7 +10,7 @@ _gtkver=3.24.13 pkgbase=gtk3-classic pkgname=($pkgbase lib32-$pkgbase) -pkgver=${_gtkver} +pkgver=${_gtkver}+23 pkgrel=1 pkgdesc="GTK3 patched for classic desktops like XFCE or MATE. Please see README." url="https://github.com/krumelmonster/gtk3-mushrooms" @@ -35,6 +35,7 @@ install=gtk3.install source=( # Patch files. series + plus23.patch.xz appearance__buttons-menus-icons.patch appearance__disable-backdrop.patch appearance__file-chooser.patch @@ -68,14 +69,15 @@ source=( README.md ) -sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c' +sha256sums=('01d9f898c75bbe8864651e5058289e8d61626bd5fe231f382cfbcad74af69fa1' + '3f09e78c05868d9af21f5ede03a25d99aaba30adb469ea4e64ad5f0ad3719cb7' 'c39e5150702006ecabbb88c14e2319153296e9cf5c8e0278ebcf7fc66603c85a' - 'cefc28b73ab294c7b09d784341c9bbd659ce4c8381e255e394f68f5b20373425' + '5234787a01cd2dda127c7dfd066f8e3c9e4bf953b631304340e6f1ddc9d876bd' '6aa86c7375a29ead4444e669f3ff880c4512591f1c939195c379203b323917f4' '1b2e522770c61a18ee68ce99510a03e452c9bcda3e39ced585059e7b29ebdc36' 'e51bc1aba0e98f1af8a6f6b04b66ab519f3e0933bd52cf724dc4d00bc064f5cc' '31ed9560b395a4a7cb46acd54f429426ecc4b7463b1ee46046786c8ccbe44f5b' - 'de363c448870f78f6b953fb2d1c945c361bfd3ff9c5f5e1bc98a886a5aa436cf' + '856eeedcc5a6fa808b2f2ad8d210d441b08c6106fc145b81bbc26af649734a8d' '1a2941de50f881fe2e91fc2816c08be6d30349fc2e5f2483f027ee553ec7cb30' '679d1c28981afdfa8ded5e6f89765a1a1fe7f2beab74e14b58bcc823cb581fdf' '58a891b6c364090d56a14a84b1e55fc7993c3f0c071fce69f257b452cab03308' @@ -87,7 +89,7 @@ sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c' 'af9b112d1140c7f8028bc8150b5b42bb8b8397c590bc15017c9a1f5feee22dae' 'eef29d471bd9645b41b6ecbb1042d669290c0550c9afb990f16d75b372f2c524' 'ec552ded4e07ab4325ba946d9bfb86b3d109cdecb3fd574a4b263bca1ffc6295' - '57ad303c97252d9d43ac651318f17c718074b7822e553256e28a57a83a71a733' + '7ec4ac55ca86c862c27790ba60120738138d6cb725d12f8f6e8da7a762111a2e' '55bf4c426ee0a9c637832229e188cfa3bd0be48a190289a0aa5fbc4b78b5bca3' 'ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31' '4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9' diff --git a/appearance__disable-backdrop.patch b/appearance__disable-backdrop.patch index ccc0c6b29fec..44f248ffed1c 100644 --- a/appearance__disable-backdrop.patch +++ b/appearance__disable-backdrop.patch @@ -2,7 +2,7 @@ Index: src/gtk+-3.24.13/gtk/gtkwindow.c =================================================================== --- src.orig/gtk+-3.24.13/gtk/gtkwindow.c +++ src/gtk+-3.24.13/gtk/gtkwindow.c -@@ -8004,7 +8004,7 @@ gtk_window_state_event (GtkWidget +@@ -8011,7 +8011,7 @@ gtk_window_state_event (GtkWidget GtkWindow *window = GTK_WINDOW (widget); GtkWindowPrivate *priv = window->priv; diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch index 45daec67a427..3e5b41999949 100644 --- a/csd__clean-headerbar.patch +++ b/csd__clean-headerbar.patch @@ -72,7 +72,7 @@ Index: src/gtk+-3.24.13/gtk/gtkwindow.c gtk_window_set_title_internal (self, title, FALSE); } -@@ -9353,6 +9355,7 @@ static void +@@ -9360,6 +9362,7 @@ static void gtk_window_do_popup (GtkWindow *window, GdkEventButton *event) { diff --git a/plus23.patch.xz b/plus23.patch.xz Binary files differnew file mode 100644 index 000000000000..d564f6f29e22 --- /dev/null +++ b/plus23.patch.xz diff --git a/popovers__file-chooser-list.patch b/popovers__file-chooser-list.patch index 7644a72d20a8..ff95bf79c8c4 100644 --- a/popovers__file-chooser-list.patch +++ b/popovers__file-chooser-list.patch @@ -10,43 +10,62 @@ Index: src/gtk+-3.24.13/gtk/gtkfilechooserwidget.c #include "gtkclipboard.h" #include "gtkcomboboxtext.h" #include "gtkdragsource.h" -@@ -2268,6 +2269,10 @@ append_separator (GtkWidget *box) +@@ -2268,15 +2269,9 @@ append_separator (GtkWidget *box) { GtkWidget *separator; +- separator = g_object_new (GTK_TYPE_SEPARATOR, +- "orientation", GTK_ORIENTATION_HORIZONTAL, +- "visible", TRUE, +- "margin-start", 12, +- "margin-end", 12, +- "margin-top", 6, +- "margin-bottom", 6, +- NULL); +- gtk_container_add (GTK_CONTAINER (box), separator); + separator = gtk_separator_menu_item_new (); + gtk_widget_set_visible (GTK_WIDGET (separator), TRUE); + gtk_menu_shell_append (GTK_MENU_SHELL (box), separator); -+ return separator; - separator = g_object_new (GTK_TYPE_SEPARATOR, - "orientation", GTK_ORIENTATION_HORIZONTAL, - "visible", TRUE, -@@ -2289,6 +2294,14 @@ add_button (GtkWidget *box, + + return separator; + } +@@ -2289,12 +2294,14 @@ add_button (GtkWidget *box, { GtkWidget *item; +- item = g_object_new (GTK_TYPE_MODEL_BUTTON, +- "visible", TRUE, +- "action-name", action, +- "text", label, +- NULL); +- gtk_container_add (GTK_CONTAINER (box), item); + if (g_str_match_string ("toggle", action, TRUE)) + item = gtk_check_menu_item_new_with_mnemonic (label); + else + item = gtk_image_menu_item_new_with_mnemonic (label); ++ + g_object_set (G_OBJECT (item), "action-name", action, NULL); + gtk_widget_set_visible (GTK_WIDGET (item), TRUE); + gtk_menu_shell_append (GTK_MENU_SHELL (box), item); -+ return item; - item = g_object_new (GTK_TYPE_MODEL_BUTTON, - "visible", TRUE, - "action-name", action, -@@ -2313,6 +2326,9 @@ file_list_build_popover (GtkFileChooserW - g_object_set (box, "margin", 10, NULL); - gtk_widget_show (box); - gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box); + + return item; + } +@@ -2308,11 +2315,9 @@ file_list_build_popover (GtkFileChooserW + if (priv->browse_files_popover) + return; + +- priv->browse_files_popover = gtk_popover_new (priv->browse_files_tree_view); +- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +- g_object_set (box, "margin", 10, NULL); +- gtk_widget_show (box); +- gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box); + priv->browse_files_popover = gtk_menu_new (); + gtk_menu_attach_to_widget (GTK_MENU (priv->browse_files_popover), GTK_WIDGET (priv->browse_files_tree_view), NULL); + box = priv->browse_files_popover; 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 +2345,12 @@ file_list_build_popover (GtkFileChooserW +@@ -2329,6 +2334,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"); @@ -1,3 +1,4 @@ +plus23.patch appearance__buttons-menus-icons.patch appearance__disable-backdrop.patch appearance__file-chooser.patch |