cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to rofi-1.6.0

Browse Source
This commit is contained in:
jasper 2020-09-12 07:57:05 +00:00
parent 7315efd0f7
commit 0cd654cd3d
5 changed files with 7 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/rofi/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2020/08/07 08:34:46 jasper Exp $
# $OpenBSD: Makefile,v 1.32 2020/09/12 07:57:05 jasper Exp $
COMMENT = window switcher, run dialog and dmenu replacement
V = 1.5.4
V = 1.6.0
DISTNAME = rofi-${V}
REVISION = 1
CATEGORIES = sysutils x11
HOMEPAGE = https://github.com/davatorium/rofi
@ -20,7 +19,7 @@ WANTLIB += c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
WANTLIB += pthread rsvg-2 startup-notification-1 xcb xcb-ewmh
WANTLIB += xcb-icccm xcb-randr xcb-render xcb-util xcb-xinerama
WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11 jpeg
BUILD_DEPENDS += devel/bison
LIB_DEPENDS = devel/startup-notification \

4
sysutils/rofi/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (rofi-1.5.4.tar.gz) = Z0IauP9frlCvOqFm5GZk0fwnEWii6lAt1WcXWD84Ibw=
SIZE (rofi-1.5.4.tar.gz) = 524977
SHA256 (rofi-1.6.0.tar.gz) = BS/ypMS/MfaiUizWVov8yYgGJjgwMWvz0PiH3sYYn50=
SIZE (rofi-1.6.0.tar.gz) = 558808

25
sysutils/rofi/patches/patch-source_dialogs_combi_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-source_dialogs_combi_c,v 1.3 2018/12/31 10:27:16 jasper Exp $
Use strcspn(3) instead of non-portable strchrnul(3).
Index: source/dialogs/combi.c
--- source/dialogs/combi.c.orig
+++ source/dialogs/combi.c
@@ -156,7 +156,7 @@ static ModeMode combi_mode_result ( Mode *sw, int mret
if ( input[0][0] == '!' ) {
int switcher = -1;
- char *eob = strchrnul ( input[0], ' ' );
+ const char *eob = input[0] + strcspn( input[0], " " );
ssize_t bang_len = g_utf8_pointer_to_offset ( input[0], eob ) - 1;
if ( bang_len > 0 ) {
for ( unsigned i = 0; switcher == -1 && i < pd->num_switchers; i++ ) {
@@ -277,7 +277,7 @@ static char * combi_preprocess_input ( Mode *sw, const
pd->switchers[i].disable = FALSE;
}
if ( input != NULL && input[0] == '!' ) {
- char *eob = strchrnul ( input, ' ' );
+ const char *eob = input + strcspn( input, " " );
ssize_t bang_len = g_utf8_pointer_to_offset ( input, eob ) - 1;
if ( bang_len > 0 ) {
for ( unsigned i = 0; i < pd->num_switchers; i++ ) {

30
sysutils/rofi/patches/patch-source_dialogs_script_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-source_dialogs_script_c,v 1.3 2020/04/08 12:33:32 edd Exp $
Fix a crash in dmenu mode:
https://github.com/davatorium/rofi/issues/1083
Index: source/dialogs/script.c
--- source/dialogs/script.c.orig
+++ source/dialogs/script.c
@@ -78,10 +78,10 @@ typedef struct
void dmenuscript_parse_entry_extras ( G_GNUC_UNUSED Mode *sw, DmenuScriptEntry *entry, char *buffer, size_t length )
{
size_t length_key = 0;//strlen ( line );
- while ( length_key <= length && buffer[length_key] != '\x1f' ) {
+ while ( length_key < length && buffer[length_key] != '\x1f' ) {
length_key++;
}
- if ( length_key < length ) {
+ if ( (length_key+1) < length ) {
buffer[length_key] = '\0';
char *value = buffer + length_key + 1;
if ( strcasecmp(buffer, "icon" ) == 0 ) {
@@ -98,7 +98,7 @@ static void parse_header_entry ( Mode *sw, char *line,
{
ScriptModePrivateData *pd = (ScriptModePrivateData *) sw->private_data;
ssize_t length_key = 0;//strlen ( line );
- while ( length_key <= length && line[length_key] != '\x1f' ) {
+ while ( length_key < length && line[length_key] != '\x1f' ) {
length_key++;
}

3
sysutils/rofi/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2019/07/06 20:26:45 jasper Exp $
@comment $OpenBSD: PLIST,v 1.11 2020/09/12 07:57:05 jasper Exp $
@bin bin/rofi
bin/rofi-sensible-terminal
bin/rofi-theme-selector
@ -12,6 +12,7 @@ lib/pkgconfig/rofi.pc
@man man/man1/rofi-sensible-terminal.1
@man man/man1/rofi-theme-selector.1
@man man/man1/rofi.1
@man man/man5/rofi-script.5
@man man/man5/rofi-theme.5
share/examples/rofi/
share/examples/rofi/i3_empty_workspace.sh