Skip to content

Commit

Permalink
tootle: remove BROKEN, update to 1.0pl20210909
Browse files Browse the repository at this point in the history
This brings a lot of bugfixes; notably account infos are now properly
saved.

This required to tweak bleakgrey/tootle#322 to
make it build.
  • Loading branch information
julianaito committed Sep 21, 2021
1 parent d6fa93a commit f921d6a
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 37 deletions.
16 changes: 7 additions & 9 deletions net/tootle/Makefile
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
# $OpenBSD: Makefile.template,v 1.88 2020/05/15 01:32:48 abieber Exp $

BROKEN=hard depend on libadwaita-1.0-alpha2, that is not in CVS yet.

COMMENT = GTK+ mastodon client

GH_ACCOUNT = bleakgrey
GH_PROJECT = tootle
# Follow HEAD since there are upstream bugs needing to be ironed out
GH_COMMIT = 1f3a8d24e3a31cd9d0e7f77bc26303923a029258
DISTNAME = ${GH_PROJECT}-1.0pl20210726
GH_COMMIT = 02f918d6377f78481de1b9d9485bfb4fa183aaaa
DISTNAME = ${GH_PROJECT}-1.0pl20210909

CATEGORIES = net

# GPLv3
PERMIT_PACKAGE = Yes

WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gtk-3 handy-1 json-glib-1.0 soup-2.4
WANTLIB += adwaita-1 c gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 graphene-1.0 gtk-4 json-glib-1.0 pango-1.0
WANTLIB += secret-1 soup-2.4 xml2

MODULES = devel/dconf \
devel/meson \
Expand All @@ -31,12 +30,11 @@ LIB_DEPENDS = devel/glib2 \
textproc/libxml \
x11/gnome/libadwaita \
x11/gnome/libsecret \
x11/gtk+4 \
x11/libhandy
x11/gtk+4
RUN_DEPENDS = devel/desktop-file-utils \
x11/gnome/keyring

# Open image in your favorite image viewer via xdg-mime(1)
# Open images in your favorite image viewer via xdg-mime(1)
RUN_DEPENDS += devel/xdg-utils

pre-configure:
Expand Down
4 changes: 2 additions & 2 deletions net/tootle/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (tootle-1.0pl20210726-1f3a8d24.tar.gz) = 6IfdetSW2iGkl+7N0UPdYgrP04tQHFYNpXX2Hxcbmj0=
SIZE (tootle-1.0pl20210726-1f3a8d24.tar.gz) = 839093
SHA256 (tootle-1.0pl20210909-02f918d6.tar.gz) = 9lNIIxzpkCn1Qbwqvmdpo2LIm1dDDaLJCMd+zGb9P8E=
SIZE (tootle-1.0pl20210909-02f918d6.tar.gz) = 807877
16 changes: 3 additions & 13 deletions net/tootle/patches/patch-meson_build
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
$OpenBSD$

Hunk #1: lower gtk+4 dependency, we don't ship unstable version ;)
Hunk #2: Don't run the post install script, it run commands on the build
machine that are expected to be run on users machines.
Don't run the post install script, it run commands on the build machine that
are expected to be run on users machines.

Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -26,7 +26,7 @@ asresources = gnome.compile_resources(
c_name: 'as'
)

-libgtk_dep = dependency('gtk4', version: '>=4.3.0', required: true)
+libgtk_dep = dependency('gtk4', version: '>=4.2.1', required: true)
libadwaita_dep = dependency('libadwaita-1', version: '>=1.0.0', required: true)

sources = files(
@@ -131,4 +131,4 @@ executable(
@@ -132,4 +132,4 @@ executable(
subdir('data')
subdir('po')

Expand Down
16 changes: 16 additions & 0 deletions net/tootle/patches/patch-src_Services_Cache_ImageCache_vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
$OpenBSD$

https://github.com/bleakgrey/tootle/pull/322

Index: src/Services/Cache/ImageCache.vala
--- src/Services/Cache/ImageCache.vala.orig
+++ src/Services/Cache/ImageCache.vala
@@ -7,7 +7,7 @@ public class Tootle.ImageCache : AbstractCache {
protected Paintable decode (owned Soup.Message msg) throws Error {
var code = msg.status_code;
if (code != Soup.Status.OK) {
- var error = network.describe_error (code);
+ var error = msg.reason_phrase;
throw new Oopsie.INSTANCE (@"Server returned $error");
}

27 changes: 27 additions & 0 deletions net/tootle/patches/patch-src_Services_Network_Network_vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
$OpenBSD$

https://github.com/bleakgrey/tootle/pull/322

Index: src/Services/Network/Network.vala
--- src/Services/Network/Network.vala.orig
+++ src/Services/Network/Network.vala
@@ -56,18 +56,13 @@ public class Tootle.Network : GLib.Object {
else if (status == Soup.Status.CANCELLED)
debug ("Message is cancelled. Ignoring callback invocation.");
else
- ecb ((int32) status, describe_error ((int32) status));
+ ecb ((int32) status, msg.reason_phrase);
});
}
catch (Error e) {
warning (@"Exception in network queue: $(e.message)");
ecb (0, e.message);
}
- }
-
- public string describe_error (uint code) {
- var reason = Soup.Status.get_phrase (code);
- return @"$code: $reason";
}

public void on_error (int32 code, string message) {
14 changes: 1 addition & 13 deletions net/tootle/pkg/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,10 @@ share/icons/hicolor/symbolic/apps/com.github.bleakgrey.tootle-symbolic.svg
share/locale/de_DE/
share/locale/de_DE/LC_MESSAGES/
share/locale/de_DE/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/es_ES/
share/locale/es_ES/LC_MESSAGES/
share/locale/es_ES/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/fr_FR/
share/locale/fr_FR/LC_MESSAGES/
share/locale/fr_FR/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/pl_PL/
share/locale/pl_PL/LC_MESSAGES/
share/locale/pl_PL/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/es/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/ru_RU/
share/locale/ru_RU/LC_MESSAGES/
share/locale/ru_RU/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/locale/zh_CN/LC_MESSAGES/com.github.bleakgrey.tootle.mo
share/metainfo/
share/metainfo/com.github.bleakgrey.tootle.appdata.xml
@tag update-desktop-database
Expand Down

0 comments on commit f921d6a

Please sign in to comment.