gmrun: update to 1.4w, adopt

closes: #55680 [via git-merge-pr]
This commit is contained in:
zenobit 2025-06-09 18:38:38 +02:00 committed by classabbyamp
parent b4468cd84e
commit da351f9556
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
3 changed files with 11 additions and 139 deletions

View file

@ -1,51 +0,0 @@
--- a/src/gtkcompletionline.cc 2003-11-16 11:55:07.000000000 +0100
+++ b/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200
@@ -29,6 +29,7 @@
#include <set>
#include <sstream>
#include <string>
+#include <cstring>
#include <vector>
using namespace std;
--- a/src/ci_string.h 2001-05-16 16:39:31.000000000 +0200
+++ b/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200
@@ -7,6 +7,7 @@
#define __CI_STRING_H__
#include <string>
+#include <cstring>
#include <ctype.h>
struct ci_char_traits : public std::char_traits<char>
--- a/src/prefs.cc 2002-08-16 12:48:22.000000000 +0200
+++ b/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200
@@ -13,6 +13,7 @@
#include <fstream>
#include <iostream>
#include <stdio.h>
+#include <stdlib.h>
#include <list>
--- a/src/main.cc 2003-11-16 11:55:07.000000000 +0100
+++ b/src/main.cc 2008-05-08 09:03:11.000000000 +0200
@@ -14,6 +14,7 @@
#include <gdk/gdkkeysyms.h>
#include <string>
+#include <cstring>
#include <iostream>
#include <sstream>
#include <vector>
--- a/src/gtkcompletionline.cc 2009-06-19 22:38:14.000000000 +0400
+++ b/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400
@@ -376,7 +377,7 @@
return 0;
}
-int my_alphasort(const void* va, const void* vb) {
+int my_alphasort(const dirent** va, const dirent** vb) {
const struct dirent** a = (const struct dirent**)va;
const struct dirent** b = (const struct dirent**)vb;

View file

@ -1,77 +0,0 @@
From 6a0ea012a7f51fdc5639bedabe446c9035461cda Mon Sep 17 00:00:00 2001
From: Henning Schild <henning@hennsch.de>
Date: Sun, 3 Dec 2017 12:14:00 +0100
Subject: [PATCH] gtk: replace deprecated gtk_type_new and _unique
Calling these causes segfaults.
This fix is based on
https://launchpadlibrarian.net/295253441/gmrun-tdp-patch.diff
---
src/gtkcompletionline.cc | 26 +++++++++++++++-----------
src/gtkcompletionline.h | 2 +-
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git src/gtkcompletionline.cc src/gtkcompletionline.cc
index c21f7e3..5211a87 100644
--- a/src/gtkcompletionline.cc
+++ b/src/gtkcompletionline.cc
@@ -77,22 +77,26 @@ static gboolean
on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
/* get_type */
-guint gtk_completion_line_get_type(void)
+GType gtk_completion_line_get_type(void)
{
- static guint type = 0;
+ static GType type = 0;
if (type == 0)
{
- GtkTypeInfo type_info =
+ static const GTypeInfo type_info =
{
- "GtkCompletionLine",
- sizeof(GtkCompletionLine),
sizeof(GtkCompletionLineClass),
- (GtkClassInitFunc)gtk_completion_line_class_init,
- (GtkObjectInitFunc)gtk_completion_line_init,
- /*(GtkArgSetFunc)*/NULL /* reserved */,
- /*(GtkArgGetFunc)*/NULL /* reserved */
+ NULL,
+ NULL,
+ (GClassInitFunc)gtk_completion_line_class_init,
+ NULL,
+ NULL,
+ sizeof(GtkCompletionLine),
+ 0,
+ (GInstanceInitFunc)gtk_completion_line_init,
+ NULL
};
- type = gtk_type_unique(gtk_entry_get_type(), &type_info);
+ type = g_type_register_static(GTK_TYPE_ENTRY, "GtkCompletionLine",
+ &type_info, (GTypeFlags)0);
}
return type;
}
@@ -745,7 +749,7 @@ complete_line(GtkCompletionLine *object)
GtkWidget *
gtk_completion_line_new()
{
- return GTK_WIDGET(gtk_type_new(gtk_completion_line_get_type()));
+ return GTK_WIDGET(g_object_new(gtk_completion_line_get_type(), NULL));
}
static void
diff --git src/gtkcompletionline.h src/gtkcompletionline.h
index 5e14cd7..0d7f2dc 100644
--- a/src/gtkcompletionline.h
+++ b/src/gtkcompletionline.h
@@ -76,7 +76,7 @@ extern "C++" {
void (* cancel)(GtkCompletionLine *cl);
};
- guint gtk_completion_line_get_type(void);
+ GType gtk_completion_line_get_type(void);
GtkWidget *gtk_completion_line_new();
void gtk_completion_line_last_history_item(GtkCompletionLine*);

View file

@ -1,18 +1,18 @@
# Template file for 'gmrun'
pkgname=gmrun
version=0.9.2
revision=5
version=1.4w
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel popt-devel"
short_desc="A simple program which provides an X 'run program' window"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://sf.net/projects/gmrun"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0
makedepends="gtk+3-devel"
short_desc="Run utility featuring a slim design and bash style auto-completion"
maintainer="zenobit <zenobit@disroot.org>"
license="ISC"
homepage="https://github.com/wdlkmpx/gmrun"
changelog="https://raw.githubusercontent.com/wdlkmpx/gmrun/refs/heads/master/ChangeLog"
distfiles="https://github.com/wdlkmpx/gmrun/releases/download/${version}/gmrun-${version}.tar.xz"
checksum=eaeb68c4ef9da383b0966420fdf1515eb86654673463dfc70124c880dbadf800
post_install() {
vlicense COPYING
vdoc README
vlicense LICENSE
}