From 54c4133a0634a0fe31371a93961fed51d00daaa8 Mon Sep 17 00:00:00 2001 From: "Edinaldo P.Silva" Date: Mon, 23 Jul 2018 09:23:41 +0100 Subject: desktop/gmrun: Updated for version 0.9.4w. Signed-off-by: David Spencer --- desktop/gmrun/gmrun.SlackBuild | 22 +++------ desktop/gmrun/gmrun.info | 8 ++-- desktop/gmrun/patches/100-gmrunrc.patch | 25 ---------- .../gmrun/patches/60-fix_gtkcompletionline.patch | 56 ---------------------- desktop/gmrun/patches/70-cmdline.patch | 18 ------- desktop/gmrun/patches/80-selectoption.patch | 31 ------------ desktop/gmrun/patches/90-window_placement.patch | 50 ------------------- .../return-type-gtk_completion_line_get_type.patch | 31 ++++++++++++ desktop/gmrun/slack-desc | 2 +- 9 files changed, 43 insertions(+), 200 deletions(-) delete mode 100644 desktop/gmrun/patches/100-gmrunrc.patch delete mode 100644 desktop/gmrun/patches/60-fix_gtkcompletionline.patch delete mode 100644 desktop/gmrun/patches/70-cmdline.patch delete mode 100644 desktop/gmrun/patches/80-selectoption.patch delete mode 100644 desktop/gmrun/patches/90-window_placement.patch create mode 100644 desktop/gmrun/patches/return-type-gtk_completion_line_get_type.patch (limited to 'desktop/gmrun') diff --git a/desktop/gmrun/gmrun.SlackBuild b/desktop/gmrun/gmrun.SlackBuild index ebb00e79e3..ad6e7d58e5 100644 --- a/desktop/gmrun/gmrun.SlackBuild +++ b/desktop/gmrun/gmrun.SlackBuild @@ -4,7 +4,7 @@ # # Copyright 2010 Binh Nguyen # Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org -# Copyright 2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2017-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. # # All rights reserved. # @@ -26,8 +26,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gmrun -VERSION=${VERSION:-0.9.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.4w} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,18 +73,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Apply some patches from Debian: +# Some patches (most from Debian): +for i in $CWD/patches/* ; do patch -p1 < $i; done -patch -p1 < $CWD/patches/10-escaping.patch -patch -p1 < $CWD/patches/20-includes.patch -patch -p1 < $CWD/patches/30-fix-gcc-4.3-build.patch -patch -p1 < $CWD/patches/40-history_string.patch -patch -p1 < $CWD/patches/50-empty-history.patch -patch -p1 < $CWD/patches/60-fix_gtkcompletionline.patch -patch -p1 < $CWD/patches/70-cmdline.patch -patch -p1 < $CWD/patches/80-selectoption.patch -patch -p1 < $CWD/patches/90-window_placement.patch -patch -p1 < $CWD/patches/100-gmrunrc.patch +autoreconf -fiv CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -109,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS COPYING ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/gmrun/gmrun.info b/desktop/gmrun/gmrun.info index 2430361f4e..eed8e7665e 100644 --- a/desktop/gmrun/gmrun.info +++ b/desktop/gmrun/gmrun.info @@ -1,8 +1,8 @@ PRGNAM="gmrun" -VERSION="0.9.2" -HOMEPAGE="https://sourceforge.net/projects/gmrun/" -DOWNLOAD="https://downloads.sourceforge.net/gmrun/gmrun-0.9.2.tar.gz" -MD5SUM="6cef37a968006d9496fc56a7099c603c" +VERSION="0.9.4w" +HOMEPAGE="https://github.com/wdlkmpx/gmrun/" +DOWNLOAD="https://github.com/wdlkmpx/gmrun/archive/0.9.4w/gmrun-0.9.4w.tar.gz" +MD5SUM="e3fa3ebfa6d81675ba59152372fb2f7b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/gmrun/patches/100-gmrunrc.patch b/desktop/gmrun/patches/100-gmrunrc.patch deleted file mode 100644 index 3614f42e8d..0000000000 --- a/desktop/gmrun/patches/100-gmrunrc.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Description: Use x-terminal-emulator and x-www-browser -# Author: Vincent Legout - -Index: gmrun-0.9.2/config/gmrunrc -=================================================================== ---- gmrun-0.9.2.orig/config/gmrunrc 2010-02-04 22:00:30.944468499 +0800 -+++ gmrun-0.9.2/config/gmrunrc 2010-02-04 22:01:31.508469387 +0800 -@@ -3,7 +3,7 @@ - # GPL v2.0 applies - - # Set terminal --Terminal = gnome-terminal --start-factory-server --use-factory -+Terminal = x-terminal-emulator - TermExec = ${Terminal} -e - AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man - -@@ -30,7 +30,7 @@ - # - %u gets replaced with the whole URL ("http://www.google.com") - # - %s gets replaced with "//www.google.com". This is useful for URL-s - # like "man:printf" --> %s will get replaced with "printf" --URL_http = mozilla -remote "openURL(%u, new-window)" -+URL_http = x-www-browser '%u' - URL_mailto = mozilla -remote "mailto(%s)" - URL_man = ${TermExec} 'man %s' - URL_info = ${TermExec} 'info %s' diff --git a/desktop/gmrun/patches/60-fix_gtkcompletionline.patch b/desktop/gmrun/patches/60-fix_gtkcompletionline.patch deleted file mode 100644 index 7ce7dd33b2..0000000000 --- a/desktop/gmrun/patches/60-fix_gtkcompletionline.patch +++ /dev/null @@ -1,56 +0,0 @@ -# Description: Fixes FTBFS -# Author: Rafael Cunha de Almeida - -Index: gmrun-0.9.2/src/gtkcompletionline.cc -=================================================================== ---- gmrun-0.9.2.orig/src/gtkcompletionline.cc 2010-03-07 14:53:19.000000000 +0000 -+++ gmrun-0.9.2/src/gtkcompletionline.cc 2010-03-07 14:53:53.000000000 +0000 -@@ -374,30 +374,6 @@ - return 0; - } - --int my_alphasort(const void* va, const void* vb) { -- const struct dirent** a = (const struct dirent**)va; -- const struct dirent** b = (const struct dirent**)vb; -- -- const char* s1 = (*a)->d_name; -- const char* s2 = (*b)->d_name; -- -- int l1 = strlen(s1); -- int l2 = strlen(s2); -- int result = strcmp(s1, s2); -- -- if (result == 0) return 0; -- -- if (l1 < l2) { -- int res2 = strncmp(s1, s2, l1); -- if (res2 == 0) return -1; -- } else { -- int res2 = strncmp(s1, s2, l2); -- if (res2 == 0) return 1; -- } -- -- return result; --} -- - static void - generate_execs() - { -@@ -405,7 +381,7 @@ - - for (StrSet::iterator i = path.begin(); i != path.end(); i++) { - struct dirent **eps; -- int n = scandir(i->c_str(), &eps, select_executables_only, my_alphasort); -+ int n = scandir(i->c_str(), &eps, select_executables_only, alphasort); - if (n >= 0) { - for (int j = 0; j < n; j++) { - execs.insert(eps[j]->d_name); -@@ -505,7 +481,7 @@ - dirlist.clear(); - struct dirent **eps; - prefix = filename; -- n = scandir(dest.c_str(), &eps, select_executables_only, my_alphasort); -+ n = scandir(dest.c_str(), &eps, select_executables_only, alphasort); - if (n >= 0) { - for (int j = 0; j < n; j++) { - { diff --git a/desktop/gmrun/patches/70-cmdline.patch b/desktop/gmrun/patches/70-cmdline.patch deleted file mode 100644 index 05bac80ae3..0000000000 --- a/desktop/gmrun/patches/70-cmdline.patch +++ /dev/null @@ -1,18 +0,0 @@ -# Description: add support for command line argument as initial content -# Author: Fernando Vezzosi - -Index: gmrun-0.9.2/src/main.cc -=================================================================== ---- gmrun-0.9.2.orig/src/main.cc 2010-02-03 12:36:13.483769799 +0800 -+++ gmrun-0.9.2/src/main.cc 2010-02-03 12:37:21.895975382 +0800 -@@ -619,6 +619,10 @@ - gtk_completion_line_last_history_item(GTK_COMPLETION_LINE(compline)); - } - -+ if(argc == 2 && argv[1]){ -+ gtk_entry_set_text(GTK_ENTRY(compline), argv[1]); -+ } -+ - gtk_box_pack_start(GTK_BOX(hbox), compline, TRUE, TRUE, 0); - - int prefs_top = 80; diff --git a/desktop/gmrun/patches/80-selectoption.patch b/desktop/gmrun/patches/80-selectoption.patch deleted file mode 100644 index 86da288d14..0000000000 --- a/desktop/gmrun/patches/80-selectoption.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Description: add "Selected" config option -# Author: Fernando Vezzosi - -Index: gmrun-0.9.2/src/main.cc -=================================================================== ---- gmrun-0.9.2.orig/src/main.cc 2010-02-03 12:37:52.455767905 +0800 -+++ gmrun-0.9.2/src/main.cc 2010-02-03 12:38:46.801743816 +0800 -@@ -615,6 +615,10 @@ - if (!configuration.get_int("ShowLast", shows_last_history_item)) { - shows_last_history_item = 0; - } -+ int last_history_selected = 0; -+ if (!configuration.get_int("Selected", last_history_selected)) { -+ last_history_selected = 1; -+ } - if (shows_last_history_item) { - gtk_completion_line_last_history_item(GTK_COMPLETION_LINE(compline)); - } -@@ -662,7 +666,11 @@ - - gtk_widget_show(win); - -- gtk_window_set_focus(GTK_WINDOW(win), compline); -+ if(last_history_selected){ -+ gtk_entry_select_region(GTK_ENTRY(compline), 0, strlen(gtk_entry_get_text(GTK_ENTRY(compline)))); -+ }else{ -+ gtk_entry_set_position(GTK_ENTRY(compline), -1); -+ } - - gtk_main(); - } diff --git a/desktop/gmrun/patches/90-window_placement.patch b/desktop/gmrun/patches/90-window_placement.patch deleted file mode 100644 index e83addebea..0000000000 --- a/desktop/gmrun/patches/90-window_placement.patch +++ /dev/null @@ -1,50 +0,0 @@ -# Description: Update window placement -# If the user hasn't set any position prefs (Top or Left directives), then -# center the window -# Bug-Debian: http://bugs.debian.org/471319 -# Author: Vincent Legout - -Index: gmrun-0.9.2/config/gmrunrc -=================================================================== ---- gmrun-0.9.2.orig/config/gmrunrc 2010-02-04 21:55:11.968469321 +0800 -+++ gmrun-0.9.2/config/gmrunrc 2010-02-04 21:55:14.860466459 +0800 -@@ -9,8 +9,6 @@ - - # Set window geometry (except height) - Width = 400 --Top = 100 --Left = 200 - - # History size - History = 256 -Index: gmrun-0.9.2/src/main.cc -=================================================================== ---- gmrun-0.9.2.orig/src/main.cc 2010-02-04 21:55:22.104464288 +0800 -+++ gmrun-0.9.2/src/main.cc 2010-02-04 21:56:42.232468582 +0800 -@@ -629,8 +629,8 @@ - - gtk_box_pack_start(GTK_BOX(hbox), compline, TRUE, TRUE, 0); - -- int prefs_top = 80; -- int prefs_left = 100; -+ int prefs_top = -1; -+ int prefs_left = -1; - configuration.get_int("Top", prefs_top); - configuration.get_int("Left", prefs_left); - -@@ -659,10 +659,14 @@ - geo_parsed = gtk_window_parse_geometry (GTK_WINDOW (win), - geoptr); - } -- else -+ else if (prefs_top != -1 && prefs_left != -1) - { - gtk_widget_set_uposition(win, prefs_left, prefs_top); - } -+ else -+ { -+ gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_CENTER); -+ } - - gtk_widget_show(win); - diff --git a/desktop/gmrun/patches/return-type-gtk_completion_line_get_type.patch b/desktop/gmrun/patches/return-type-gtk_completion_line_get_type.patch new file mode 100644 index 0000000000..96e2915516 --- /dev/null +++ b/desktop/gmrun/patches/return-type-gtk_completion_line_get_type.patch @@ -0,0 +1,31 @@ +Description: fix return type of gtk_completion_line_get_type + Patch from fedora was slightly modified (parts dropped, fuzz fixed) to apply on + top of Debian package by Andreas Henriksson +Origin: https://src.fedoraproject.org/cgit/rpms/gmrun.git/plain/gmrun-0.9.2-f12.patch +Bug-Debian: https://bugs.debian.org/857065 + +--- a/src/gtkcompletionline.cc ++++ b/src/gtkcompletionline.cc +@@ -77,9 +77,9 @@ + on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data); + + /* get_type */ +-guint gtk_completion_line_get_type(void) ++GtkType gtk_completion_line_get_type(void) + { +- static guint type = 0; ++ static GtkType type = 0; + if (type == 0) + { + GtkTypeInfo type_info = +--- a/src/gtkcompletionline.h ++++ b/src/gtkcompletionline.h +@@ -76,7 +76,7 @@ + void (* cancel)(GtkCompletionLine *cl); + }; + +- guint gtk_completion_line_get_type(void); ++ GtkType gtk_completion_line_get_type(void); + GtkWidget *gtk_completion_line_new(); + + void gtk_completion_line_last_history_item(GtkCompletionLine*); diff --git a/desktop/gmrun/slack-desc b/desktop/gmrun/slack-desc index 5615a4bdc4..1284eca02b 100644 --- a/desktop/gmrun/slack-desc +++ b/desktop/gmrun/slack-desc @@ -12,7 +12,7 @@ gmrun: gmrun is a simple GTK program which provides a "run program" window. gmrun: It features a bash-like TAB completion, Ctrl-R/Ctrl-S for searching gmrun: through the history and URL handlers for any user defined prefix. gmrun: -gmrun: Home page: https://sourceforge.net/projects/gmrun/ +gmrun: Home page: https://github.com/wdlkmpx/gmrun/ gmrun: gmrun: gmrun: -- cgit v1.2.3