diff options
author | Que Quotion | 2019-11-20 04:03:23 +0900 |
---|---|---|
committer | Que Quotion | 2019-11-20 04:11:24 +0900 |
commit | abf8ba28c0745c214fe596b6636fb59a21f6c073 (patch) | |
tree | 8cc978c781e377064a4f4ec93076ec2a42987a26 | |
parent | d833ab3559650cec1c667c6f1ff3afbea59dca25 (diff) | |
download | aur-abf8ba28c0745c214fe596b6636fb59a21f6c073.tar.gz |
Update to 3.34.1 and forward port pantheon patchset.
-rw-r--r-- | .SRCINFO | 57 | ||||
-rw-r--r-- | 01-full-width-url-bar.patch | 13 | ||||
-rw-r--r-- | 02-24px-color-toolbar-icons.patch | 58 | ||||
-rw-r--r-- | 03-tab-close-buttons-on-the-left.patch | 103 | ||||
-rw-r--r-- | 04-new-tab-button-on-the-left.patch (renamed from new-tab-button-left.patch) | 0 | ||||
-rw-r--r-- | 05-rename-to-epiphany.patch (renamed from use-real-name.patch) | 6 | ||||
-rw-r--r-- | 06-double-click-for-new-tab.patch (renamed from double-click-for-new-tab.patch) | 4 | ||||
-rw-r--r-- | 07-overlay-bar-style.patch (renamed from overlay-bar-style.patch) | 0 | ||||
-rw-r--r-- | 08-rename-incongito-class-to-dodge-GNOME-style.patch | 13 | ||||
-rw-r--r-- | 09-middle-click-closes-tab.patch (renamed from middle-click-close-tab.patch) | 4 | ||||
-rw-r--r-- | 10-add-preferences-menuitem.patch (renamed from add-preferences-menuitem.patch) | 0 | ||||
-rw-r--r-- | 11-fix-menu-margins.patch (renamed from fix-menu-margins.patch) | 0 | ||||
-rw-r--r-- | 12-remove-tab-menuitem.patch (renamed from remove-newtab-menuitem.patch) | 0 | ||||
-rw-r--r-- | 13-remove-text-encoding-menuitem.patch (renamed from remove-text-encoding-menuitem.patch) | 0 | ||||
-rw-r--r-- | 14-add-important-menuitems.patch (renamed from add-various-menuitem.patch) | 0 | ||||
-rw-r--r-- | 15-remove-GNOME-menu.patch (renamed from remove-gnome-menu.patch) | 0 | ||||
-rw-r--r-- | 16-hide-the-fonts-and-styles-tab.patch (renamed from hide-fonts-and-style-tab.patch) | 23 | ||||
-rw-r--r-- | 17-give-notebook-a-margin.patch (renamed from notebook-margin.patch) | 0 | ||||
-rw-r--r-- | 24px-color-toolbar-icons-reduced.patch | 43 | ||||
-rw-r--r-- | PKGBUILD | 133 | ||||
-rw-r--r-- | dodge-incognito-mode-style.patch | 13 | ||||
-rw-r--r-- | full-width-url-bar-lesshandy.patch | 20 | ||||
-rw-r--r-- | tab-close-button-left.patch | 74 |
23 files changed, 281 insertions, 283 deletions
@@ -1,6 +1,6 @@ pkgbase = epiphany-pantheon pkgdesc = A GNOME web browser based on the WebKit rendering engine (with elementary OS patches) - pkgver = 3.32.2 + pkgver = 3.34.1 pkgrel = 1 url = https://wiki.gnome.org/Apps/Web arch = x86_64 @@ -17,50 +17,49 @@ pkgbase = epiphany-pantheon makedepends = meson depends = webkit2gtk depends = gcr - depends = icu depends = libdazzle depends = libhandy - provides = epiphany=3.32.2 + provides = epiphany=3.34.1 provides = epiphany-sync - source = epiphany-pantheon::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=d154e6cea18123576d511512827cd6308c9780e2 + source = epiphany-pantheon::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=fae9ef019e39c8ca420344c8c01416a3184bb8fc source = epiphany-sync source = epiphany-sync.service - source = full-width-url-bar-lesshandy.patch - source = 24px-color-toolbar-icons-reduced.patch - source = tab-close-button-left.patch - source = new-tab-button-left.patch - source = use-real-name.patch - source = double-click-for-new-tab.patch - source = overlay-bar-style.patch - source = dodge-incognito-mode-style.patch - source = middle-click-close-tab.patch - source = add-preferences-menuitem.patch - source = fix-menu-margins.patch - source = remove-newtab-menuitem.patch - source = remove-text-encoding-menuitem.patch - source = add-various-menuitem.patch - source = remove-gnome-menu.patch - source = hide-fonts-and-style-tab.patch - source = notebook-margin.patch + source = 01-full-width-url-bar.patch + source = 02-24px-color-toolbar-icons.patch + source = 03-tab-close-buttons-on-the-left.patch + source = 04-new-tab-button-on-the-left.patch + source = 05-rename-to-epiphany.patch + source = 06-double-click-for-new-tab.patch + source = 07-overlay-bar-style.patch + source = 08-rename-incongito-class-to-dodge-GNOME-style.patch + source = 09-middle-click-closes-tab.patch + source = 10-add-preferences-menuitem.patch + source = 11-fix-menu-margins.patch + source = 12-remove-tab-menuitem.patch + source = 13-remove-text-encoding-menuitem.patch + source = 14-add-important-menuitems.patch + source = 15-remove-GNOME-menu.patch + source = 16-hide-the-fonts-and-styles-tab.patch + source = 17-give-notebook-a-margin.patch sha1sums = SKIP sha1sums = 2a8fda153bf3fb2d9a14b632082329ed6e2d8fab sha1sums = 2c1c89aee5e1ea2ca47d518690b93238213e73fd - sha1sums = 66527476f0f7ef19eefdfd2c700748350c1e24b9 - sha1sums = 9ee462279ae5115535590ce6fb3318de7f7eeba1 - sha1sums = 6830e08ab8f2fc363768a3357544c5322f3f702a + sha1sums = 96c7a159f357077150e320bfe39ca4acd610d357 + sha1sums = 3ebd0aadbf3ba145ccf5b5c07b810cc21c28f5a9 + sha1sums = 824c797de664a7d5a904b49d76636ab929f5e400 sha1sums = ec44a91a1693c664e55ef42c21ae2d9e27c75148 - sha1sums = 8be3e4ce2d2dd1226faaeb1937e93aedbfc5c7a9 - sha1sums = d1153085b4827a12aa3959ad6d7ab7e80b2a4754 + sha1sums = 7dbfdea116239bb3ee947e9175a43a6bdd768f1e + sha1sums = 71fc912aee1e01bc6d17907d7bfa33852ef15fb2 sha1sums = cb88f86c9e44936993ab2e3a02f71874de422ae7 - sha1sums = 1588217c2f425172693b4c6430accbc03273a349 - sha1sums = fd94fe5b97a9e1d189f1f9e0310389831aa14e10 + sha1sums = 0f1085fb06e06298c7fb8feb12be0699d166dd2b + sha1sums = 5c0d41eda4b449ceba4699e1a1e8b6359d12deb4 sha1sums = 2b07c438cdabe254a33b6b5f180f9359e3e21422 sha1sums = 8deb1718a29e157e888a1358048200cc5887b1f3 sha1sums = 58227528aa8bc1d1480fbd0f5e18a6eb11450ba8 sha1sums = 33246f87659164729c55a201151c368bd0f02b9c sha1sums = 67f6d0c60cbf4ea9252c56d3ac37090fd18a534c sha1sums = e125a6e6ca85ad06d192e1c200190438ca2b1f8a - sha1sums = 5a0aa426e87cfb2943a68ca70e1b301b0e6f427a + sha1sums = 0f3e50ecb72b9cf671dc75d5ac987f5e05b2ed66 sha1sums = cd1090f20a153d77060aa1d6304c4d5e621c125f pkgname = epiphany-pantheon diff --git a/01-full-width-url-bar.patch b/01-full-width-url-bar.patch new file mode 100644 index 000000000000..d52386020f55 --- /dev/null +++ b/01-full-width-url-bar.patch @@ -0,0 +1,13 @@ +diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c +index 389c34b3b..00cb6f038 100644 +--- a/src/ephy-header-bar.c ++++ b/src/ephy-header-bar.c +@@ -176,7 +177,7 @@ + column = hdy_column_new (); + gtk_widget_set_hexpand (GTK_WIDGET (column), TRUE); + gtk_widget_show (GTK_WIDGET (column)); +- hdy_column_set_maximum_width (column, 860); ++ hdy_column_set_maximum_width (column, gdk_screen_width ()); + hdy_column_set_linear_growth_width (column, 560); + gtk_container_add (GTK_CONTAINER (column), GTK_WIDGET (header_bar->title_widget)); + gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), GTK_WIDGET (column)); diff --git a/02-24px-color-toolbar-icons.patch b/02-24px-color-toolbar-icons.patch new file mode 100644 index 000000000000..d8fc7233a77c --- /dev/null +++ b/02-24px-color-toolbar-icons.patch @@ -0,0 +1,58 @@ +--- a/src/resources/gtk/action-bar-end.ui ++++ b/src/resources/gtk/action-bar-end.ui +@@ -16,7 +16,7 @@ + <object class="GtkImage" id="bookmarks_image"> + <property name="visible">True</property> + <property name="icon-name">ephy-bookmarks-symbolic</property> +- <property name="icon-size">1</property> ++ <property name="icon-size">3</property> + </object> + </child> + </object> +--- a/src/resources/gtk/action-bar-start.ui ++++ b/src/resources/gtk/action-bar-start.ui +@@ -25,7 +25,7 @@ + <object class="GtkImage" id="back_image"> + <property name="visible">True</property> + <property name="icon-name">go-previous-symbolic</property> +- <property name="icon-size">1</property> ++ <property name="icon-size">3</property> + </object> + </child> + </object> +@@ -44,7 +44,7 @@ + <object class="GtkImage" id="forward_image"> + <property name="visible">True</property> + <property name="icon-name">go-next-symbolic</property> +- <property name="icon-size">1</property> ++ <property name="icon-size">3</property> + </object> + </child> + </object> +@@ -63,7 +63,7 @@ + <object class="GtkImage" id="combined_stop_reload_image"> + <property name="visible">True</property> + <property name="icon-name">view-refresh-symbolic</property> +- <property name="icon-size">1</property> ++ <property name="icon-size">3</property> + </object> + </child> + </object> +@@ -82,7 +82,7 @@ + <object class="GtkImage" id="homepage_image"> + <property name="visible">True</property> + <property name="icon-name">go-home-symbolic</property> +- <property name="icon-size">1</property> ++ <property name="icon-size">3</property> + </object> + </child> + </object> +@@ -101,7 +101,7 @@ + <object class="GtkImage" id="new_tab_image"> + <property name="visible">True</property> + <property name="icon-name">tab-new-symbolic</property> +- <property name="icon-size">1</property> ++ <property name="icon-size">3</property> + </object> + </child> + </object> diff --git a/03-tab-close-buttons-on-the-left.patch b/03-tab-close-buttons-on-the-left.patch new file mode 100644 index 000000000000..5a913130be61 --- /dev/null +++ b/03-tab-close-buttons-on-the-left.patch @@ -0,0 +1,103 @@ +diff --git a/src/resources/gtk/tab-label.ui b/src/resources/gtk/tab-label.ui +index bddbaef23..6bb8e6086 100644 +--- a/src/resources/gtk/tab-label.ui ++++ b/src/resources/gtk/tab-label.ui +@@ -12,71 +12,71 @@ + <property name="spacing">6</property> + <signal name="style-updated" handler="style_updated_cb" swapped="no"/> + <child> +- <object class="GtkImage" id="icon"> ++ <object class="GtkButton" id="close_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> ++ <property name="focus_on_click">False</property> ++ <property name="receives_default">False</property> ++ <property name="tooltip_text" translatable="yes">Close Document</property> ++ <property name="image">close_button_image</property> ++ <property name="relief">none</property> ++ <signal name="clicked" handler="close_button_clicked_cb" object="EphyTabLabel" swapped="no"/> ++ <style> ++ <class name="small-button"/> ++ <class name="flat"/> ++ </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="position">0</property> ++ <property name="pack_type">end</property> ++ <property name="position">3</property> + </packing> + </child> +- <child> +- <object class="GtkSpinner" id="spinner"> ++ <child type="center"> ++ <object class="GtkLabel" id="label"> ++ <property name="visible">True</property> + <property name="can_focus">False</property> ++ <property name="ellipsize">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="position">1</property> ++ <property name="position">0</property> + </packing> + </child> +- <child type="center"> +- <object class="GtkLabel" id="label"> ++ <child> ++ <object class="GtkImage" id="audio_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> +- <property name="ellipsize">end</property> ++ <property name="icon_name">audio-volume-high-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="position">0</property> ++ <property name="pack_type">end</property> ++ <property name="position">5</property> + </packing> + </child> + <child> +- <object class="GtkButton" id="close_button"> +- <property name="visible">True</property> ++ <object class="GtkSpinner" id="spinner"> + <property name="can_focus">False</property> +- <property name="focus_on_click">False</property> +- <property name="receives_default">False</property> +- <property name="tooltip_text" translatable="yes">Close Document</property> +- <property name="image">close_button_image</property> +- <property name="relief">none</property> +- <signal name="clicked" handler="close_button_clicked_cb" object="EphyTabLabel" swapped="no"/> +- <style> +- <class name="small-button"/> +- <class name="flat"/> +- </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="pack_type">end</property> +- <property name="position">3</property> ++ <property name="position">1</property> + </packing> + </child> + <child> +- <object class="GtkImage" id="audio_button"> ++ <object class="GtkImage" id="icon"> + <property name="visible">True</property> + <property name="can_focus">False</property> +- <property name="icon_name">audio-volume-high-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> +- <property name="pack_type">end</property> +- <property name="position">5</property> ++ <property name="position">0</property> + </packing> + </child> + </template> diff --git a/new-tab-button-left.patch b/04-new-tab-button-on-the-left.patch index 2e67a4c78952..2e67a4c78952 100644 --- a/new-tab-button-left.patch +++ b/04-new-tab-button-on-the-left.patch diff --git a/use-real-name.patch b/05-rename-to-epiphany.patch index d0e67adf8bc6..aea7a68bc911 100644 --- a/use-real-name.patch +++ b/05-rename-to-epiphany.patch @@ -1,7 +1,7 @@ -diff --git a/data/org.gnome.Epiphany.desktop.in b/data/org.gnome.Epiphany.desktop.in +diff --git a/data/org.gnome.Epiphany.desktop.in.in b/data/org.gnome.Epiphany.desktop.in.in index c02164e1e..4c2e2fea0 100644 ---- a/data/org.gnome.Epiphany.desktop.in -+++ b/data/org.gnome.Epiphany.desktop.in +--- a/data/org.gnome.Epiphany.desktop.in.in ++++ b/data/org.gnome.Epiphany.desktop.in.in @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Web diff --git a/double-click-for-new-tab.patch b/06-double-click-for-new-tab.patch index bf0039992e30..cee8ca127dec 100644 --- a/double-click-for-new-tab.patch +++ b/06-double-click-for-new-tab.patch @@ -5,7 +5,7 @@ index dee8f1b4b..3947ff681 100644 @@ -234,6 +234,20 @@ button_press_cb (EphyNotebook *notebook, gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), tab_clicked); } - + + /* Open a new tab when double-clicked. */ + if (event->type == GDK_2BUTTON_PRESS && + event->button == 1 && @@ -22,4 +22,4 @@ index dee8f1b4b..3947ff681 100644 + return GDK_EVENT_PROPAGATE; } - + diff --git a/overlay-bar-style.patch b/07-overlay-bar-style.patch index fd3bdee01f26..fd3bdee01f26 100644 --- a/overlay-bar-style.patch +++ b/07-overlay-bar-style.patch diff --git a/08-rename-incongito-class-to-dodge-GNOME-style.patch b/08-rename-incongito-class-to-dodge-GNOME-style.patch new file mode 100644 index 000000000000..82a38dbc833a --- /dev/null +++ b/08-rename-incongito-class-to-dodge-GNOME-style.patch @@ -0,0 +1,13 @@ +diff --git a/src/ephy-window.c b/src/ephy-window.c +index 3d90f2610..279c9c358 100644 +--- a/src/ephy-window.c ++++ b/src/ephy-window.c +@@ -3722,7 +3722,7 @@ + + /* Setup incognito mode style */ + if (mode == EPHY_EMBED_SHELL_MODE_INCOGNITO) +- gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "incognito-mode"); ++ gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "incognito"); + else if (mode == EPHY_EMBED_SHELL_MODE_AUTOMATION) + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "automation-mode"); + diff --git a/middle-click-close-tab.patch b/09-middle-click-closes-tab.patch index 0d7f9116c09d..65bbb1387559 100644 --- a/middle-click-close-tab.patch +++ b/09-middle-click-closes-tab.patch @@ -5,7 +5,7 @@ index 3947ff681..07c0afa7f 100644 @@ -248,6 +248,16 @@ button_press_cb (EphyNotebook *notebook, g_action_activate (action, NULL); } - + + /* Close the tab if it gets middle clicked */ + if (event->type == GDK_BUTTON_PRESS && + event->button == 2 && @@ -18,4 +18,4 @@ index 3947ff681..07c0afa7f 100644 + return GDK_EVENT_PROPAGATE; } - + diff --git a/add-preferences-menuitem.patch b/10-add-preferences-menuitem.patch index 29b9104b3b59..29b9104b3b59 100644 --- a/add-preferences-menuitem.patch +++ b/10-add-preferences-menuitem.patch diff --git a/fix-menu-margins.patch b/11-fix-menu-margins.patch index d38d5834743b..d38d5834743b 100644 --- a/fix-menu-margins.patch +++ b/11-fix-menu-margins.patch diff --git a/remove-newtab-menuitem.patch b/12-remove-tab-menuitem.patch index c9a043b43a4d..c9a043b43a4d 100644 --- a/remove-newtab-menuitem.patch +++ b/12-remove-tab-menuitem.patch diff --git a/remove-text-encoding-menuitem.patch b/13-remove-text-encoding-menuitem.patch index 565e9dc4bdef..565e9dc4bdef 100644 --- a/remove-text-encoding-menuitem.patch +++ b/13-remove-text-encoding-menuitem.patch diff --git a/add-various-menuitem.patch b/14-add-important-menuitems.patch index ce62264b6eb3..ce62264b6eb3 100644 --- a/add-various-menuitem.patch +++ b/14-add-important-menuitems.patch diff --git a/remove-gnome-menu.patch b/15-remove-GNOME-menu.patch index 672f4350cd0f..672f4350cd0f 100644 --- a/remove-gnome-menu.patch +++ b/15-remove-GNOME-menu.patch diff --git a/hide-fonts-and-style-tab.patch b/16-hide-the-fonts-and-styles-tab.patch index 4be6e7189099..6e8b0acda814 100644 --- a/hide-fonts-and-style-tab.patch +++ b/16-hide-the-fonts-and-styles-tab.patch @@ -2,16 +2,16 @@ diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog. index e2584996a..943af2552 100644 --- a/src/resources/gtk/prefs-dialog.ui +++ b/src/resources/gtk/prefs-dialog.ui -@@ -305,7 +305,7 @@ - </child> - <child> - <object class="GtkBox"> +@@ -393,7 +393,7 @@ + <object class="HdyPreferencesPage"> + <property name="icon_name">document-edit-symbolic</property> + <property name="title" translatable="yes">Fonts & Style</property> - <property name="visible">True</property> -+ <property name="visible">false</property> - <property name="border-width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> -@@ -459,16 +459,7 @@ ++ <property name="visible">False</property> + <style> + <class name="background"/> + </style> +@@ -557,16 +557,6 @@ <property name="position">1</property> </packing> </child> @@ -25,7 +25,6 @@ index e2584996a..943af2552 100644 - <property name="tab_fill">False</property> - </packing> - </child> -+ <child> - <object class="GtkBox"> - <property name="visible">True</property> + <object class="HdyPreferencesPage"> + <property name="icon_name">drive-harddisk-symbolic</property> diff --git a/notebook-margin.patch b/17-give-notebook-a-margin.patch index 5c3ee902a41b..5c3ee902a41b 100644 --- a/notebook-margin.patch +++ b/17-give-notebook-a-margin.patch diff --git a/24px-color-toolbar-icons-reduced.patch b/24px-color-toolbar-icons-reduced.patch deleted file mode 100644 index 69c845e3fed5..000000000000 --- a/24px-color-toolbar-icons-reduced.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c -index 00cb6f038..202962795 100644 ---- a/src/ephy-header-bar.c -+++ b/src/ephy-header-bar.c -@@ -750,7 +750,7 @@ ephy_header_bar_constructed (GObject *object) - button = gtk_menu_button_new (); - header_bar->page_menu_button = button; - gtk_button_set_image (GTK_BUTTON (button), -- gtk_image_new_from_icon_name ("open-menu-symbolic", GTK_ICON_SIZE_BUTTON)); -+ gtk_image_new_from_icon_name ("open-menu", GTK_ICON_SIZE_LARGE_TOOLBAR)); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - g_type_ensure (G_TYPE_THEMED_ICON); - /* FIXME: This is horrible, but it doesn't seem possible to hide a single menu item of an existing menu. ---- a/src/ephy-action-bar-start.c 2019-05-29 03:01:42.582080213 +0900 -+++ b/src/ephy-action-bar-start.c 2019-05-29 03:53:11.623159543 +0900 -@@ -576,14 +576,14 @@ - if (loading) { - gtk_image_set_from_icon_name (GTK_IMAGE (action_bar_start->combined_stop_reload_image), - "process-stop-symbolic", -- GTK_ICON_SIZE_BUTTON); -+ GTK_ICON_SIZE_LARGE_TOOLBAR); - /* Translators: tooltip for the stop button */ - gtk_widget_set_tooltip_text (action_bar_start->combined_stop_reload_button, - _("Stop loading the current page")); - } else { - gtk_image_set_from_icon_name (GTK_IMAGE (action_bar_start->combined_stop_reload_image), - "view-refresh-symbolic", -- GTK_ICON_SIZE_BUTTON); -+ GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_widget_set_tooltip_text (action_bar_start->combined_stop_reload_button, - _(REFRESH_BUTTON_TOOLTIP)); - } ---- a/src/resources/gtk/action-bar-end.ui 2019-05-29 03:01:42.504080211 +0900 -+++ b/src/resources/gtk/action-bar-end.ui 2019-05-29 04:06:05.002179404 +0900 -@@ -15,7 +15,7 @@ - <child> - <object class="GtkImage" id="bookmarks_image"> - <property name="visible">True</property> -- <property name="icon-name">ephy-bookmarks-symbolic</property> -+ <property name="icon-name">user-bookmarks</property> - <property name="icon-size">1</property> - </object> - </child> @@ -1,60 +1,59 @@ -# Maintainer: Que Quotion <quequotion at bugmenot dot com> +# Maintainer: Que Quotion <quequotion@bugmenot.com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=epiphany-pantheon -pkgver=3.32.2 +pkgver=3.34.1 pkgrel=1 pkgdesc="A GNOME web browser based on the WebKit rendering engine (with elementary OS patches)" url="https://wiki.gnome.org/Apps/Web" arch=(x86_64) license=(GPL) -depends=(webkit2gtk gcr icu libdazzle libhandy) #gst-libav +depends=(webkit2gtk gcr libdazzle libhandy) makedepends=(docbook-xml startup-notification lsb-release gobject-introspection yelp-tools - appstream-glib git meson) #autoconf-archive + appstream-glib git meson) checkdepends=(xorg-server-xvfb) groups=(pantheon) provides=(epiphany="${pkgver}" epiphany-sync) -_commit=d154e6cea18123576d511512827cd6308c9780e2 # tags/3.32.2^0 +_commit=fae9ef019e39c8ca420344c8c01416a3184bb8fc # tags/3.34.1^0 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit" epiphany-sync{,.service} - "full-width-url-bar-lesshandy.patch" - "24px-color-toolbar-icons-reduced.patch" - "tab-close-button-left.patch" - "new-tab-button-left.patch" - "use-real-name.patch" - "double-click-for-new-tab.patch" - "overlay-bar-style.patch" - "dodge-incognito-mode-style.patch" - "middle-click-close-tab.patch" - "add-preferences-menuitem.patch" - "fix-menu-margins.patch" - "remove-newtab-menuitem.patch" - "remove-text-encoding-menuitem.patch" - "add-various-menuitem.patch" - "remove-gnome-menu.patch" - "hide-fonts-and-style-tab.patch" - "notebook-margin.patch") - + "01-full-width-url-bar.patch" + "02-24px-color-toolbar-icons.patch" + "03-tab-close-buttons-on-the-left.patch" + "04-new-tab-button-on-the-left.patch" + "05-rename-to-epiphany.patch" + "06-double-click-for-new-tab.patch" + "07-overlay-bar-style.patch" + "08-rename-incongito-class-to-dodge-GNOME-style.patch" + "09-middle-click-closes-tab.patch" + "10-add-preferences-menuitem.patch" + "11-fix-menu-margins.patch" + "12-remove-tab-menuitem.patch" + "13-remove-text-encoding-menuitem.patch" + "14-add-important-menuitems.patch" + "15-remove-GNOME-menu.patch" + "16-hide-the-fonts-and-styles-tab.patch" + "17-give-notebook-a-margin.patch") sha1sums=('SKIP' '2a8fda153bf3fb2d9a14b632082329ed6e2d8fab' '2c1c89aee5e1ea2ca47d518690b93238213e73fd' - '66527476f0f7ef19eefdfd2c700748350c1e24b9' - '9ee462279ae5115535590ce6fb3318de7f7eeba1' - '6830e08ab8f2fc363768a3357544c5322f3f702a' + '96c7a159f357077150e320bfe39ca4acd610d357' + '3ebd0aadbf3ba145ccf5b5c07b810cc21c28f5a9' + '824c797de664a7d5a904b49d76636ab929f5e400' 'ec44a91a1693c664e55ef42c21ae2d9e27c75148' - '8be3e4ce2d2dd1226faaeb1937e93aedbfc5c7a9' - 'd1153085b4827a12aa3959ad6d7ab7e80b2a4754' + '7dbfdea116239bb3ee947e9175a43a6bdd768f1e' + '71fc912aee1e01bc6d17907d7bfa33852ef15fb2' 'cb88f86c9e44936993ab2e3a02f71874de422ae7' - '1588217c2f425172693b4c6430accbc03273a349' - 'fd94fe5b97a9e1d189f1f9e0310389831aa14e10' + '0f1085fb06e06298c7fb8feb12be0699d166dd2b' + '5c0d41eda4b449ceba4699e1a1e8b6359d12deb4' '2b07c438cdabe254a33b6b5f180f9359e3e21422' '8deb1718a29e157e888a1358048200cc5887b1f3' '58227528aa8bc1d1480fbd0f5e18a6eb11450ba8' '33246f87659164729c55a201151c368bd0f02b9c' '67f6d0c60cbf4ea9252c56d3ac37090fd18a534c' 'e125a6e6ca85ad06d192e1c200190438ca2b1f8a' - '5a0aa426e87cfb2943a68ca70e1b301b0e6f427a' + '0f3e50ecb72b9cf671dc75d5ac987f5e05b2ed66' 'cd1090f20a153d77060aa1d6304c4d5e621c125f') pkgver() { @@ -65,63 +64,27 @@ pkgver() { prepare() { cd $pkgname - msg2 "../full-width-url-bar-lesshandy.patch" - patch -Np1 < "../full-width-url-bar-lesshandy.patch" - #patch out libhandy sizing method. - - msg2 "../24px-color-toolbar-icons-reduced.patch" - patch -Np1 < "../24px-color-toolbar-icons-reduced.patch" - #New way of defining buttons; unclear if size specification is needed. - - msg2 "../tab-close-button-left.patch" - patch -Np1 < "../tab-close-button-left.patch" - - #msg2 "../new-tab-button-left.patch" - #patch -Np1 < "../new-tab-button-left.patch" - #Whole, terrible, new way of making interfaces. - - msg2 "../use-real-name.patch" - patch -Np1 < "../use-real-name.patch" - msg2 "../double-click-for-new-tab.patch" - patch -Np1 < "../double-click-for-new-tab.patch" - msg2 "../overlay-bar-style.patch" - patch -Np1 < "../overlay-bar-style.patch" - - #msg2 "../dodge-incognito-mode-style.patch" - #patch -Np1 < "../dodge-incognito-mode-style.patch" - #No longer posssible to do this only for header or defined elsewhere? - - msg2 "../middle-click-close-tab.patch" - patch -Np1 < "../middle-click-close-tab.patch" - msg2 "../add-preferences-menuitem.patch" - patch -Np1 < "../add-preferences-menuitem.patch" - msg2 "../fix-menu-margins.patch" - patch -Np1 < "../fix-menu-margins.patch" - - #msg2 "../remove-newtab-menuitem.patch" - #patch -Np1 < "../remove-newtab-menuitem.patch" - #Already removed upstream? - - #msg2 "../remove-text-encoding-menuitem.patch" - #patch -Np1 < "../remove-text-encoding-menuitem.patch" - #Already removed upstream? Replaced with "Override text encoding"? - - msg2 "../add-various-menuitem.patch" - patch -Np1 < "../add-various-menuitem.patch" - - #msg2 "../remove-gnome-menu.patch" - #patch -Np1 < "../remove-gnome-menu.patch" - #????? - - msg2 "../hide-fonts-and-style-tab.patch" - patch -Np1 < "../hide-fonts-and-style-tab.patch" - msg2 "../notebook-margin.patch" - patch -Np1 < "../notebook-margin.patch" + msg2 "full width url bar"; patch -Np1 < ../01-full-width-url-bar.patch + msg2 "24px color toolbar icons"; patch -Np1 < ../02-24px-color-toolbar-icons.patch + msg2 "tab close buttons on the left"; patch -Np1 < ../03-tab-close-buttons-on-the-left.patch + #msg2 "new tab button on the left"; patch -Np1 < ../04-new-tab-button-on-the-left.patch #COMPLICATED + msg2 "rename to epiphany"; patch -Np1 < ../05-rename-to-epiphany.patch + msg2 "double click for new tab"; patch -Np1 < ../06-double-click-for-new-tab.patch + msg2 "overlay bar style"; patch -Np1 < ../07-overlay-bar-style.patch + msg2 "rename incognito class"; patch -Np1 < ../08-rename-incongito-class-to-dodge-GNOME-style.patch + msg2 "middle click closes tab"; patch -Np1 < ../09-middle-click-closes-tab.patch + msg2 "add preferences menuitem"; patch -Np1 < ../10-add-preferences-menuitem.patch + msg2 "fix menu margins"; patch -Np1 < ../11-fix-menu-margins.patch + #msg2 "remove tab menuitem"; patch -Np1 < ../12-remove-tab-menuitem.patch #REMOVED UPSTREAM + #msg2 "remove text encoding menuitem"; patch -Np1 < ../13-remove-text-encoding-menuitem.patch #REMOVED UPSTREAM + msg2 "add important menuitems"; patch -Np1 < ../14-add-important-menuitems.patch + #msg2 "remove GNOME menu"; patch -Np1 < ../15-remove-GNOME-menu.patch #REMOVED UPSTREAM + msg2 "hide the fonts and styles tab"; patch -Np1 < ../16-hide-the-fonts-and-styles-tab.patch + msg2 "give notebook a margin"; patch -Np1 < ../17-give-notebook-a-margin.patch } build() { - arch-meson $pkgname build \ - -D distributor_name="Arch Linux®" + arch-meson $pkgname build ninja -C build } diff --git a/dodge-incognito-mode-style.patch b/dodge-incognito-mode-style.patch deleted file mode 100644 index 2b788ad52a6f..000000000000 --- a/dodge-incognito-mode-style.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ephy-window.c b/src/ephy-window.c -index 3d90f2610..279c9c358 100644 ---- a/src/ephy-window.c -+++ b/src/ephy-window.c -@@ -2965,7 +2965,7 @@ setup_header_bar (EphyWindow *window) - - app_mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()); - if (app_mode == EPHY_EMBED_SHELL_MODE_INCOGNITO) -- gtk_style_context_add_class (gtk_widget_get_style_context (header_bar), "incognito-mode"); -+ gtk_style_context_add_class (gtk_widget_get_style_context (header_bar), "incognito"); - - title_widget = ephy_header_bar_get_title_widget (EPHY_HEADER_BAR (header_bar)); - g_signal_connect (title_widget, "lock-clicked", diff --git a/full-width-url-bar-lesshandy.patch b/full-width-url-bar-lesshandy.patch deleted file mode 100644 index 1781a4ac3914..000000000000 --- a/full-width-url-bar-lesshandy.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/ephy-header-bar.c 2019-05-29 03:01:42.582080213 +0900 -+++ b/src/ephy-header-bar.c 2019-05-29 03:42:07.296142482 +0900 -@@ -183,13 +183,10 @@ - header_bar->title_widget = EPHY_TITLE_WIDGET (ephy_title_box_new ()); - else - header_bar->title_widget = EPHY_TITLE_WIDGET (ephy_location_entry_new ()); -- column = hdy_column_new (); -- gtk_widget_set_hexpand (GTK_WIDGET (column), TRUE); -- gtk_widget_show (GTK_WIDGET (column)); -- hdy_column_set_maximum_width (column, 860); -- hdy_column_set_linear_growth_width (column, 560); -- gtk_container_add (GTK_CONTAINER (column), GTK_WIDGET (header_bar->title_widget)); -- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), GTK_WIDGET (column)); -+ gtk_widget_set_hexpand (GTK_WIDGET (header_bar->title_widget), true); -+ gtk_widget_set_margin_start (GTK_WIDGET (header_bar->title_widget), 24); -+ gtk_widget_set_margin_end (GTK_WIDGET (header_bar->title_widget), 6); -+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), GTK_WIDGET (header_bar->title_widget)); - gtk_widget_show (GTK_WIDGET (header_bar->title_widget)); - - if (EPHY_IS_LOCATION_ENTRY (header_bar->title_widget)) { diff --git a/tab-close-button-left.patch b/tab-close-button-left.patch deleted file mode 100644 index 0443adb468fb..000000000000 --- a/tab-close-button-left.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c -index bddbaef23..6bb8e6086 100644 ---- a/src/ephy-notebook.c -+++ b/src/ephy-notebook.c -@@ -705,34 +705,6 @@ build_tab_label (EphyNotebook *nb, EphyEmbed *embed) - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_widget_show (box); - -- /* set hbox spacing and label padding (see below) so that there's an -- * equal amount of space around the label */ -- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); -- gtk_widget_show (hbox); -- gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER); -- gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0); -- -- /* setup load feedback */ -- spinner = gtk_spinner_new (); -- gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); -- -- /* setup site icon, empty by default */ -- icon = gtk_image_new (); -- gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); -- /* don't show the icon */ -- -- /* setup label */ -- label = gtk_label_new (NULL); -- gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); -- gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE); -- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); -- gtk_widget_show (label); -- -- /* setup speaker icon */ -- speaker_icon = gtk_image_new_from_icon_name ("audio-volume-high-symbolic", -- GTK_ICON_SIZE_MENU); -- gtk_box_pack_start (GTK_BOX (hbox), speaker_icon, FALSE, FALSE, 0); -- - /* setup close button */ - close_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (close_button), -@@ -754,6 +726,34 @@ build_tab_label (EphyNotebook *nb, EphyEmbed *embed) - gtk_box_pack_start (GTK_BOX (box), close_button, FALSE, FALSE, 0); - gtk_widget_show (close_button); - -+ /* set hbox spacing and label padding (see below) so that there's an -+ * equal amount of space around the label */ -+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); -+ gtk_widget_show (hbox); -+ gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER); -+ gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0); -+ -+ /* setup label */ -+ label = gtk_label_new (NULL); -+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); -+ gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE); -+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); -+ gtk_widget_show (label); -+ -+ /* setup speaker icon */ -+ speaker_icon = gtk_image_new_from_icon_name ("audio-volume-high-symbolic", -+ GTK_ICON_SIZE_MENU); -+ gtk_box_pack_start (GTK_BOX (hbox), speaker_icon, FALSE, FALSE, 0); -+ -+ /* setup load feedback */ -+ spinner = gtk_spinner_new (); -+ gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); -+ -+ /* setup site icon, empty by default */ -+ icon = gtk_image_new (); -+ gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); -+ /* don't show the icon */ -+ - /* Set minimal size */ - g_signal_connect (box, "style-set", - G_CALLBACK (tab_label_style_set_cb), NULL); |