summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-07-29 19:51:32 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-07-29 19:51:32 +0000
commitc9ed765123f7ffaadef5fbdd3d08b37966304160 (patch)
tree2e93bf9a5af66c6125e362ce8539eabc97dba776
parentdevel/py-pytest-flakes: Update 4.0.0 -> 4.0.1 (diff)
x11/wofi: update to 1.2.1
Changes: https://hg.sr.ht/~scoopta/wofi/log Reported by: Repology
-rw-r--r--x11/wofi/Makefile5
-rw-r--r--x11/wofi/distinfo6
-rw-r--r--x11/wofi/files/patch-glib-2.5622
-rw-r--r--x11/wofi/pkg-plist2
4 files changed, 22 insertions, 13 deletions
diff --git a/x11/wofi/Makefile b/x11/wofi/Makefile
index bf86d66acfc5..8c48ab3a3e49 100644
--- a/x11/wofi/Makefile
+++ b/x11/wofi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wofi
DISTVERSIONPREFIX= v
-DISTVERSION= 1.1.2
+DISTVERSION= 1.2.1
CATEGORIES= x11
#MASTER_SITES= https://hg.sr.ht/~scoopta/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
MASTER_SITES+= LOCAL/jbeich # https://todo.sr.ht/~sircmpwn/hg.sr.ht/33
@@ -16,8 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md
LIB_DEPENDS= libwayland-client.so:graphics/wayland
USES= gnome meson pkgconfig
-USE_CSTD= gnu99 # https://lists.sr.ht/~scoopta/wofi/patches/10055
-USE_GNOME= gdkpixbuf2 gtk30
+USE_GNOME= cairo gdkpixbuf2 gtk30
post-patch:
@${REINPLACE_CMD} 's,/usr/local,${PREFIX},g' \
diff --git a/x11/wofi/distinfo b/x11/wofi/distinfo
index ce018377ed82..200ef3d200ac 100644
--- a/x11/wofi/distinfo
+++ b/x11/wofi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583818656
-SHA256 (wofi-v1.1.2.tar.gz) = c7f952e49bf52d3519b52c9f7c88c8d83a800297d16076f7eaefddf0cb6f8371
-SIZE (wofi-v1.1.2.tar.gz) = 64813
+TIMESTAMP = 1595978324
+SHA256 (wofi-v1.2.1.tar.gz) = d1a2c6bf7a193566c87bc95b6ad02241da22aa7623a740dfc80a140b1a1e0ec9
+SIZE (wofi-v1.2.1.tar.gz) = 71357
diff --git a/x11/wofi/files/patch-glib-2.56 b/x11/wofi/files/patch-glib-2.56
index d0057e833751..0e010bb48e23 100644
--- a/x11/wofi/files/patch-glib-2.56
+++ b/x11/wofi/files/patch-glib-2.56
@@ -9,9 +9,17 @@ ld: error: undefined symbol: g_app_info_launch_uris_finish
>>> referenced by drun.c
>>> wofi@exe/modes_drun.c.o:(launch_done)
---- modes/drun.c.orig 2020-03-10 05:37:36 UTC
+--- modes/drun.c.orig 2020-07-28 23:18:44 UTC
+++ modes/drun.c
-@@ -315,6 +315,7 @@ struct widget* wofi_drun_get_widget(void) {
+@@ -19,6 +19,7 @@
+ #include <libgen.h>
+
+ #include <sys/stat.h>
++#include <errno.h>
+
+ #include <map.h>
+ #include <utils.h>
+@@ -373,6 +374,7 @@ struct widget* wofi_drun_get_widget(void) {
return NULL;
}
@@ -19,18 +27,18 @@ ld: error: undefined symbol: g_app_info_launch_uris_finish
static void launch_done(GObject* obj, GAsyncResult* result, gpointer data) {
GError* err = NULL;
if(g_app_info_launch_uris_finish(G_APP_INFO(obj), result, &err)) {
-@@ -329,6 +330,7 @@ static void launch_done(GObject* obj, GAsyncResult* re
+@@ -387,6 +389,7 @@ static void launch_done(GObject* obj, GAsyncResult* re
}
exit(1);
}
+#endif
- void wofi_drun_exec(const gchar* cmd) {
- GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(cmd);
-@@ -338,7 +340,14 @@ void wofi_drun_exec(const gchar* cmd) {
- printf("%s\n", g_app_info_get_commandline(G_APP_INFO(info)));
+ static void set_dri_prime(GDesktopAppInfo* info) {
+ bool dri_prime = g_desktop_app_info_get_boolean(info, "PrefersNonDefaultGPU");
+@@ -404,7 +407,14 @@ void wofi_drun_exec(const gchar* cmd) {
exit(0);
} else {
+ set_dri_prime(info);
+#if GLIB_CHECK_VERSION(2, 60, 0)
g_app_info_launch_uris_async(G_APP_INFO(info), NULL, NULL, NULL, launch_done, (gchar*) cmd);
+#else
diff --git a/x11/wofi/pkg-plist b/x11/wofi/pkg-plist
index 3ab521dd8a8d..b4828b733553 100644
--- a/x11/wofi/pkg-plist
+++ b/x11/wofi/pkg-plist
@@ -2,6 +2,8 @@ bin/wofi
include/wofi-1/config.h
include/wofi-1/map.h
include/wofi-1/utils.h
+include/wofi-1/utils_g.h
+include/wofi-1/widget_builder_api.h
include/wofi-1/wofi_api.h
libdata/pkgconfig/wofi.pc
man/man1/wofi.1.gz