Date: Thursday, December 27, 2018 @ 17:16:29 Author: bgyorgy Revision: 418516
archrelease: copy trunk to community-x86_64 Added: buoh/repos/community-x86_64/0001-Various-fixes-related-to-gtk3-port.patch (from rev 418515, buoh/trunk/0001-Various-fixes-related-to-gtk3-port.patch) buoh/repos/community-x86_64/PKGBUILD (from rev 418515, buoh/trunk/PKGBUILD) buoh/repos/community-x86_64/buoh.appdata.xml (from rev 418515, buoh/trunk/buoh.appdata.xml) Deleted: buoh/repos/community-x86_64/0001-Various-fixes-related-to-gtk3-port.patch buoh/repos/community-x86_64/PKGBUILD buoh/repos/community-x86_64/buoh.appdata.xml -----------------------------------------------+ 0001-Various-fixes-related-to-gtk3-port.patch | 262 ++++++++++++------------ PKGBUILD | 74 +++--- buoh.appdata.xml | 86 +++---- 3 files changed, 207 insertions(+), 215 deletions(-) Deleted: 0001-Various-fixes-related-to-gtk3-port.patch =================================================================== --- 0001-Various-fixes-related-to-gtk3-port.patch 2018-12-27 17:16:24 UTC (rev 418515) +++ 0001-Various-fixes-related-to-gtk3-port.patch 2018-12-27 17:16:29 UTC (rev 418516) @@ -1,131 +0,0 @@ -From 54ac563e431f3388845821b5618d222ac6e4c4c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> -Date: Sun, 2 Sep 2018 19:26:59 +0200 -Subject: [PATCH] Various fixes related to gtk3 port - -- Don't disable scrollbars, otherwise the window cannot be resized. -- Fix the alignment size of the intro text to make it visible. -- Set the default size of main window. -- Remove unimplemented Help Contents menu item. ---- - data/buoh-ui.xml | 1 - - src/buoh-view-comic.c | 33 --------------------------------- - src/buoh-view-message.c | 2 +- - src/buoh-window.c | 4 +--- - 4 files changed, 2 insertions(+), 38 deletions(-) - -diff --git a/data/buoh-ui.xml b/data/buoh-ui.xml -index 6531447..439b887 100644 ---- a/data/buoh-ui.xml -+++ b/data/buoh-ui.xml -@@ -28,7 +28,6 @@ - <menuitem action="GoLast" name="GoLastMenu"/> - </menu> - <menu action="Help" name="HelpMenu"> -- <menuitem action="HelpContents" name="HelpContentsMenu"/> - <menuitem action="HelpAbout" name="HelpAboutMenu"/> - </menu> - </menubar> -diff --git a/src/buoh-view-comic.c b/src/buoh-view-comic.c -index bd4338d..bad2fdf 100644 ---- a/src/buoh-view-comic.c -+++ b/src/buoh-view-comic.c -@@ -103,7 +103,6 @@ static void buoh_view_comic_prepare_load (BuohViewComic *c_view) - static void buoh_view_comic_load_finished (BuohViewComic *c_view, - gpointer gdata); - static void buoh_view_comic_load (BuohViewComic *c_view); --static void buoh_view_comic_update_scrollbar_policy (BuohViewComic *c_view); - static gdouble buoh_view_comic_get_scale_for_width (BuohViewComic *c_view, - gint width); - static gdouble buoh_view_comic_get_scale_for_height (BuohViewComic *c_view, -@@ -253,7 +252,6 @@ buoh_view_comic_set_property (GObject *object, - break; - case PROP_ZOOM_MODE: - c_view->priv->zoom_mode = g_value_get_enum (value); -- buoh_view_comic_update_scrollbar_policy (c_view); - - break; - case PROP_SCALE: -@@ -573,8 +571,6 @@ buoh_view_comic_prepare_load (BuohViewComic *c_view) - gtk_adjustment_set_value (hadjustment, 0.0); - gtk_adjustment_set_value (vadjustment, 0.0); - -- buoh_view_comic_update_scrollbar_policy (c_view); -- - if (gtk_widget_get_realized (GTK_WIDGET (c_view))) { - gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (c_view)), - NULL); -@@ -788,35 +784,6 @@ buoh_view_comic_load (BuohViewComic *c_view) - } - } - --static void --buoh_view_comic_update_scrollbar_policy (BuohViewComic *c_view) --{ -- GtkWidget *swindow; -- -- swindow = gtk_widget_get_parent (GTK_WIDGET (c_view)); -- if (!GTK_IS_SCROLLED_WINDOW (swindow)) { -- return; -- } -- -- switch (c_view->priv->zoom_mode) { -- case VIEW_ZOOM_FREE: -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), -- GTK_POLICY_AUTOMATIC, -- GTK_POLICY_AUTOMATIC); -- break; -- case VIEW_ZOOM_FIT_WIDTH: -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), -- GTK_POLICY_NEVER, -- GTK_POLICY_AUTOMATIC); -- break; -- case VIEW_ZOOM_BEST_FIT: -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), -- GTK_POLICY_NEVER, -- GTK_POLICY_NEVER); -- break; -- } --} -- - static gdouble - buoh_view_comic_get_scale_for_width (BuohViewComic *c_view, - gint width) -diff --git a/src/buoh-view-message.c b/src/buoh-view-message.c -index 69f9c5b..f82fd45 100644 ---- a/src/buoh-view-message.c -+++ b/src/buoh-view-message.c -@@ -81,7 +81,7 @@ buoh_view_message_init (BuohViewMessage *m_view) - TRUE, TRUE, 0); - gtk_widget_show (vbox); - -- align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); -+ align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - gtk_container_add (GTK_CONTAINER (align), hbox); - gtk_widget_show (hbox); - -diff --git a/src/buoh-window.c b/src/buoh-window.c -index 4859f07..038ed57 100644 ---- a/src/buoh-window.c -+++ b/src/buoh-window.c -@@ -209,9 +209,6 @@ static const GtkActionEntry menu_entries[] = { - G_CALLBACK (buoh_window_cmd_go_last) }, - - /* Help menu */ -- { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", -- N_("Display help for the Buoh online comic reader"), -- G_CALLBACK (buoh_window_cmd_help_contents) }, - { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, - N_("Display credits for the Buoh online comic reader creators"), - G_CALLBACK (buoh_window_cmd_help_about) } -@@ -255,6 +252,7 @@ buoh_window_init (BuohWindow *buoh_window) - - gtk_window_set_title (GTK_WINDOW (buoh_window), "Buoh"); - gtk_window_set_icon_name (GTK_WINDOW (buoh_window), "buoh"); -+ gtk_window_set_default_size (GTK_WINDOW (buoh_window), 800, 400); - - buoh_window->priv->properties = NULL; - buoh_window->priv->add_dialog = NULL; --- -2.18.0 - Copied: buoh/repos/community-x86_64/0001-Various-fixes-related-to-gtk3-port.patch (from rev 418515, buoh/trunk/0001-Various-fixes-related-to-gtk3-port.patch) =================================================================== --- 0001-Various-fixes-related-to-gtk3-port.patch (rev 0) +++ 0001-Various-fixes-related-to-gtk3-port.patch 2018-12-27 17:16:29 UTC (rev 418516) @@ -0,0 +1,131 @@ +From 54ac563e431f3388845821b5618d222ac6e4c4c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Sun, 2 Sep 2018 19:26:59 +0200 +Subject: [PATCH] Various fixes related to gtk3 port + +- Don't disable scrollbars, otherwise the window cannot be resized. +- Fix the alignment size of the intro text to make it visible. +- Set the default size of main window. +- Remove unimplemented Help Contents menu item. +--- + data/buoh-ui.xml | 1 - + src/buoh-view-comic.c | 33 --------------------------------- + src/buoh-view-message.c | 2 +- + src/buoh-window.c | 4 +--- + 4 files changed, 2 insertions(+), 38 deletions(-) + +diff --git a/data/buoh-ui.xml b/data/buoh-ui.xml +index 6531447..439b887 100644 +--- a/data/buoh-ui.xml ++++ b/data/buoh-ui.xml +@@ -28,7 +28,6 @@ + <menuitem action="GoLast" name="GoLastMenu"/> + </menu> + <menu action="Help" name="HelpMenu"> +- <menuitem action="HelpContents" name="HelpContentsMenu"/> + <menuitem action="HelpAbout" name="HelpAboutMenu"/> + </menu> + </menubar> +diff --git a/src/buoh-view-comic.c b/src/buoh-view-comic.c +index bd4338d..bad2fdf 100644 +--- a/src/buoh-view-comic.c ++++ b/src/buoh-view-comic.c +@@ -103,7 +103,6 @@ static void buoh_view_comic_prepare_load (BuohViewComic *c_view) + static void buoh_view_comic_load_finished (BuohViewComic *c_view, + gpointer gdata); + static void buoh_view_comic_load (BuohViewComic *c_view); +-static void buoh_view_comic_update_scrollbar_policy (BuohViewComic *c_view); + static gdouble buoh_view_comic_get_scale_for_width (BuohViewComic *c_view, + gint width); + static gdouble buoh_view_comic_get_scale_for_height (BuohViewComic *c_view, +@@ -253,7 +252,6 @@ buoh_view_comic_set_property (GObject *object, + break; + case PROP_ZOOM_MODE: + c_view->priv->zoom_mode = g_value_get_enum (value); +- buoh_view_comic_update_scrollbar_policy (c_view); + + break; + case PROP_SCALE: +@@ -573,8 +571,6 @@ buoh_view_comic_prepare_load (BuohViewComic *c_view) + gtk_adjustment_set_value (hadjustment, 0.0); + gtk_adjustment_set_value (vadjustment, 0.0); + +- buoh_view_comic_update_scrollbar_policy (c_view); +- + if (gtk_widget_get_realized (GTK_WIDGET (c_view))) { + gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (c_view)), + NULL); +@@ -788,35 +784,6 @@ buoh_view_comic_load (BuohViewComic *c_view) + } + } + +-static void +-buoh_view_comic_update_scrollbar_policy (BuohViewComic *c_view) +-{ +- GtkWidget *swindow; +- +- swindow = gtk_widget_get_parent (GTK_WIDGET (c_view)); +- if (!GTK_IS_SCROLLED_WINDOW (swindow)) { +- return; +- } +- +- switch (c_view->priv->zoom_mode) { +- case VIEW_ZOOM_FREE: +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), +- GTK_POLICY_AUTOMATIC, +- GTK_POLICY_AUTOMATIC); +- break; +- case VIEW_ZOOM_FIT_WIDTH: +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), +- GTK_POLICY_NEVER, +- GTK_POLICY_AUTOMATIC); +- break; +- case VIEW_ZOOM_BEST_FIT: +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), +- GTK_POLICY_NEVER, +- GTK_POLICY_NEVER); +- break; +- } +-} +- + static gdouble + buoh_view_comic_get_scale_for_width (BuohViewComic *c_view, + gint width) +diff --git a/src/buoh-view-message.c b/src/buoh-view-message.c +index 69f9c5b..f82fd45 100644 +--- a/src/buoh-view-message.c ++++ b/src/buoh-view-message.c +@@ -81,7 +81,7 @@ buoh_view_message_init (BuohViewMessage *m_view) + TRUE, TRUE, 0); + gtk_widget_show (vbox); + +- align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); ++ align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + gtk_container_add (GTK_CONTAINER (align), hbox); + gtk_widget_show (hbox); + +diff --git a/src/buoh-window.c b/src/buoh-window.c +index 4859f07..038ed57 100644 +--- a/src/buoh-window.c ++++ b/src/buoh-window.c +@@ -209,9 +209,6 @@ static const GtkActionEntry menu_entries[] = { + G_CALLBACK (buoh_window_cmd_go_last) }, + + /* Help menu */ +- { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", +- N_("Display help for the Buoh online comic reader"), +- G_CALLBACK (buoh_window_cmd_help_contents) }, + { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, + N_("Display credits for the Buoh online comic reader creators"), + G_CALLBACK (buoh_window_cmd_help_about) } +@@ -255,6 +252,7 @@ buoh_window_init (BuohWindow *buoh_window) + + gtk_window_set_title (GTK_WINDOW (buoh_window), "Buoh"); + gtk_window_set_icon_name (GTK_WINDOW (buoh_window), "buoh"); ++ gtk_window_set_default_size (GTK_WINDOW (buoh_window), 800, 400); + + buoh_window->priv->properties = NULL; + buoh_window->priv->add_dialog = NULL; +-- +2.18.0 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-12-27 17:16:24 UTC (rev 418515) +++ PKGBUILD 2018-12-27 17:16:29 UTC (rev 418516) @@ -1,37 +0,0 @@ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=buoh -pkgver=0.8.2 -pkgrel=11 -pkgdesc="Online strips comics reader for GNOME" -arch=(x86_64) -url="http://buoh.steve-o.org/" -license=(GPL) -depends=(gtk3 libsoup) -makedepends=(git meson) -_commit=5aed558ce52b53830f06e7328b3f38cb7db0d6f0 # master -source=("git+https://gitlab.gnome.org/GNOME/buoh.git#commit=$_commit" - buoh.appdata.xml - 0001-Various-fixes-related-to-gtk3-port.patch) -sha256sums=('SKIP' - 'a9193bfab6775079bc59f223c2f63c698130ad81bd9c6a5c5bf163d9b5014586' - '1597fb8507421e5a85e8bc89243ede8bbf027cf2d87e58ad84dd63ccf6054eb4') - -prepare() { - cd $pkgname - - # Various fixes related to gtk3 port - patch -Np1 -i ../0001-Various-fixes-related-to-gtk3-port.patch -} - -build() { - arch-meson $pkgname build - ninja -C build -} - -package() { - DESTDIR="$pkgdir" meson install -C build - install -Dm644 $pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" -} Copied: buoh/repos/community-x86_64/PKGBUILD (from rev 418515, buoh/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-12-27 17:16:29 UTC (rev 418516) @@ -0,0 +1,37 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=buoh +pkgver=0.8.2 +pkgrel=12 +pkgdesc="Online strips comics reader for GNOME" +arch=(x86_64) +url="http://buoh.steve-o.org/" +license=(GPL) +depends=(gtk3 libsoup) +makedepends=(git meson) +_commit=5aed558ce52b53830f06e7328b3f38cb7db0d6f0 # master +source=("git+https://gitlab.gnome.org/GNOME/buoh.git#commit=$_commit" + buoh.appdata.xml + 0001-Various-fixes-related-to-gtk3-port.patch) +sha256sums=('SKIP' + '883bdf97f0db99ad41d27eed19e235126aed1e7a128774b01af96c0441fea67c' + '1597fb8507421e5a85e8bc89243ede8bbf027cf2d87e58ad84dd63ccf6054eb4') + +prepare() { + cd $pkgname + + # Various fixes related to gtk3 port + patch -Np1 -i ../0001-Various-fixes-related-to-gtk3-port.patch +} + +build() { + arch-meson $pkgname build + ninja -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build + install -Dm644 $pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" +} Deleted: buoh.appdata.xml =================================================================== --- buoh.appdata.xml 2018-12-27 17:16:24 UTC (rev 418515) +++ buoh.appdata.xml 2018-12-27 17:16:29 UTC (rev 418516) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component type="desktop-application"> - <id>buoh</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0</project_license> - <name>Buoh</name> - <summary>Read your favorite comic strips</summary> - - <description> - <p> - Buoh is a reader for online strips comics. It is free software, designed to - work well under the GNOME Desktop. - </p> - <p>Buoh has a number of features, including:</p> - <ul> - <li>Select your favorites comic through a list of more than 130 comics</li> - <li>Easy, simple an eye-candy view of an online comic</li> - <li>Browsing over the comic strip archives</li> - <li>Saving a comic to disk</li> - <li>Integration with GNOME (respecting the lockdowns and HIG compliance)</li> - </ul> - </description> - - <launchable type="desktop-id">buoh.desktop</launchable> - - <screenshots> - <screenshot type="default"> - <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh.png</image> - </screenshot> - <screenshot> - <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh-1.png</image> - </screenshot> - <screenshot> - <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh-2.png</image> - </screenshot> - <screenshot> - <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh-3.png</image> - </screenshot> - </screenshots> - <url type="homepage">http://buoh.steve-o.org/</url> - <provides> - <binary>buoh</binary> - </provides> - - <translation type="gettext">buoh</translation> - <update_contact>esteban AT steve-o DOT org</update_contact> -</component> Copied: buoh/repos/community-x86_64/buoh.appdata.xml (from rev 418515, buoh/trunk/buoh.appdata.xml) =================================================================== --- buoh.appdata.xml (rev 0) +++ buoh.appdata.xml 2018-12-27 17:16:29 UTC (rev 418516) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>org.gnome.buoh</id> + <launchable type="desktop-id">buoh.desktop</launchable> + <name>Buoh</name> + <summary>Read your favorite comic strips</summary> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> + <developer_name>Esteban Sanchez</developer_name> + <description> + <p>Buoh is a reader for online strips comics. It is free software, designed to work well under the GNOME Desktop.</p> + <p>Buoh has a number of features, including:</p> + <ul> + <li>Select your favorites comic through a list of more than 130 comics</li> + <li>Easy, simple an eye-candy view of an online comic</li> + <li>Browsing over the comic strip archives</li> + <li>Saving a comic to disk</li> + <li>Integration with GNOME (respecting the lockdowns and HIG compliance)</li> + </ul> + </description> + <screenshots> + <screenshot type="default"> + <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh.png</image> + </screenshot> + <screenshot> + <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh-1.png</image> + </screenshot> + <screenshot> + <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh-2.png</image> + </screenshot> + <screenshot> + <image>http://buoh.steve-o.org/buoh-images/Screenshot-Buoh-3.png</image> + </screenshot> + </screenshots> + <url type="bugtracker">https://gitlab.gnome.org/GNOME/buoh/issues</url> + <url type="homepage">http://buoh.steve-o.org/</url> + <update_contact>este...@steve-o.org</update_contact> + <translation type="gettext">buoh</translation> +</component>