summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdinaldo P.Silva <edps.mundognu@gmail.com>2019-10-05 05:50:09 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-10-05 05:50:09 +0700
commit0cf8b42f069ce7f62e6b23462ca8d935f5535d99 (patch)
treef0c675ede5be9354319941634f1549c41b44258f
parentcf4918cea4979181c88f42b94ca2d556a032d459 (diff)
downloadslackbuilds-0cf8b42f069ce7f62e6b23462ca8d935f5535d99.tar.gz
desktop/gmrun: Updated for version 0.9.5w.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/gmrun/gmrun.SlackBuild7
-rw-r--r--desktop/gmrun/gmrun.info6
-rw-r--r--desktop/gmrun/patches/10-escaping.patch23
-rw-r--r--desktop/gmrun/patches/20-includes.patch15
-rw-r--r--desktop/gmrun/patches/30-fix-gcc-4.3-build.patch27
-rw-r--r--desktop/gmrun/patches/40-history_string.patch28
-rw-r--r--desktop/gmrun/patches/50-empty-history.patch36
-rw-r--r--desktop/gmrun/patches/return-type-gtk_completion_line_get_type.patch31
8 files changed, 5 insertions, 168 deletions
diff --git a/desktop/gmrun/gmrun.SlackBuild b/desktop/gmrun/gmrun.SlackBuild
index ad6e7d58e5..b221579f9c 100644
--- a/desktop/gmrun/gmrun.SlackBuild
+++ b/desktop/gmrun/gmrun.SlackBuild
@@ -4,7 +4,7 @@
#
# Copyright 2010 Binh Nguyen <binhvng@gmail.com>
# Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2017-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
#
# All rights reserved.
#
@@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gmrun
-VERSION=${VERSION:-0.9.4w}
+VERSION=${VERSION:-0.9.5w}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,9 +73,6 @@ 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 {} \;
-# Some patches (most from Debian):
-for i in $CWD/patches/* ; do patch -p1 < $i; done
-
autoreconf -fiv
CFLAGS="$SLKCFLAGS" \
diff --git a/desktop/gmrun/gmrun.info b/desktop/gmrun/gmrun.info
index eed8e7665e..7c6d2c2ee0 100644
--- a/desktop/gmrun/gmrun.info
+++ b/desktop/gmrun/gmrun.info
@@ -1,8 +1,8 @@
PRGNAM="gmrun"
-VERSION="0.9.4w"
+VERSION="0.9.5w"
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="https://github.com/wdlkmpx/gmrun/archive/0.9.5w/gmrun-0.9.5w.tar.gz"
+MD5SUM="8d7fdf893f15306df9bb9daca6cf897d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/desktop/gmrun/patches/10-escaping.patch b/desktop/gmrun/patches/10-escaping.patch
deleted file mode 100644
index b4bc2084b6..0000000000
--- a/desktop/gmrun/patches/10-escaping.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Description: Correct escaping of characters
-# Author: Luca Bedogni <me@lucabedogni.it>
-
-Index: gmrun-0.9.2/src/gtkcompletionline.cc
-===================================================================
---- gmrun-0.9.2.orig/src/gtkcompletionline.cc 2010-02-03 12:30:02.239774762 +0800
-+++ gmrun-0.9.2/src/gtkcompletionline.cc 2010-02-03 12:30:24.983767847 +0800
-@@ -226,12 +226,9 @@
- const char* i = str.c_str();
- while (*i) {
- char c = *i++;
-- switch (c) {
-- case ' ':
-- res += '\\';
-- default:
-- res += c;
-- }
-+ if (c == ' ' || c == '(' || c == ')' || c =='\'')
-+ res += '\\';
-+ res += c;
- }
- return res;
- }
diff --git a/desktop/gmrun/patches/20-includes.patch b/desktop/gmrun/patches/20-includes.patch
deleted file mode 100644
index c387bcd1dd..0000000000
--- a/desktop/gmrun/patches/20-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: include missing headers
-# Author: Martin Michlmayr <tbm@cyrius.com>
-
-Index: gmrun-0.9.2/src/prefs.cc
-===================================================================
---- gmrun-0.9.2.orig/src/prefs.cc 2010-02-03 12:30:57.407768496 +0800
-+++ gmrun-0.9.2/src/prefs.cc 2010-02-03 12:31:04.636318281 +0800
-@@ -10,6 +10,7 @@
- *****************************************************************************/
-
-
-+#include <cstdlib>
- #include <fstream>
- #include <iostream>
- #include <stdio.h>
diff --git a/desktop/gmrun/patches/30-fix-gcc-4.3-build.patch b/desktop/gmrun/patches/30-fix-gcc-4.3-build.patch
deleted file mode 100644
index bcdbc8acfe..0000000000
--- a/desktop/gmrun/patches/30-fix-gcc-4.3-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Description: include missing headers
-# Author: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-
-Index: gmrun-0.9.2/src/ci_string.h
-===================================================================
---- gmrun-0.9.2.orig/src/ci_string.h 2010-02-03 12:31:31.323767018 +0800
-+++ gmrun-0.9.2/src/ci_string.h 2010-02-03 12:31:38.822001700 +0800
-@@ -8,6 +8,7 @@
-
- #include <string>
- #include <ctype.h>
-+#include <cstring>
-
- struct ci_char_traits : public std::char_traits<char>
- {
-Index: gmrun-0.9.2/src/gtkcompletionline.cc
-===================================================================
---- gmrun-0.9.2.orig/src/gtkcompletionline.cc 2010-02-03 12:31:43.951768512 +0800
-+++ gmrun-0.9.2/src/gtkcompletionline.cc 2010-02-03 12:31:51.199767425 +0800
-@@ -30,6 +30,7 @@
- #include <sstream>
- #include <string>
- #include <vector>
-+#include <cstring>
- using namespace std;
-
- #include "gtkcompletionline.h"
diff --git a/desktop/gmrun/patches/40-history_string.patch b/desktop/gmrun/patches/40-history_string.patch
deleted file mode 100644
index ecfe1d303b..0000000000
--- a/desktop/gmrun/patches/40-history_string.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Description: Handle more than 256 characters in the history
-# Author: <bdefreese@bddebian3.bddebian.com>
-
-Index: gmrun-0.9.2/src/history.cc
-===================================================================
---- gmrun-0.9.2.orig/src/history.cc 2010-02-03 12:32:18.519767950 +0800
-+++ gmrun-0.9.2/src/history.cc 2010-02-03 12:32:43.586035039 +0800
-@@ -41,15 +41,14 @@
- ifstream f(filename);
- if (!f) return;
-
-+ string line_text;
-+
- while (!f.eof()) {
-- char line_text[256];
- string line_str;
-
-- f.getline(line_text, sizeof(line_text));
-- if (*line_text) {
-- line_str = line_text;
-- history.push_back(line_str);
-- }
-+ getline(f,line_text);
-+ line_str = line_text;
-+ history.push_back(line_str);
- }
-
- m_file_entries = history.size();
diff --git a/desktop/gmrun/patches/50-empty-history.patch b/desktop/gmrun/patches/50-empty-history.patch
deleted file mode 100644
index 7f9477f7b6..0000000000
--- a/desktop/gmrun/patches/50-empty-history.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# Description: Don't create an empty history file when History=0
-# Author: <bdefreese@bddebian3.bddebian.com>
-
-Index: gmrun-0.9.2/src/history.cc
-===================================================================
---- gmrun-0.9.2.orig/src/history.cc 2010-02-03 12:33:29.575767540 +0800
-+++ gmrun-0.9.2/src/history.cc 2010-02-03 12:34:47.349422238 +0800
-@@ -65,17 +65,19 @@
- if (!configuration.get_int("History", HIST_MAX_SIZE))
- HIST_MAX_SIZE = 20;
-
-- ofstream f(filename, ios::out);
-+ if (HIST_MAX_SIZE) {
-+ ofstream f(filename, ios::out);
-
-- int start = 0;
-- if (history.size() > (size_t)HIST_MAX_SIZE)
-- start = history.size() - HIST_MAX_SIZE;
-+ int start = 0;
-+ if (history.size() > (size_t)HIST_MAX_SIZE)
-+ start = history.size() - HIST_MAX_SIZE;
-+
-+ for (size_t i = start; i < history.size(); i++)
-+ if (history[i].length() != 0)
-+ f << history[i] << endl;
-
-- for (size_t i = start; i < history.size(); i++)
-- if (history[i].length() != 0)
-- f << history[i] << endl;
--
-- f.flush();
-+ f.flush();
-+ }
- }
-
- void
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
deleted file mode 100644
index 96e2915516..0000000000
--- a/desktop/gmrun/patches/return-type-gtk_completion_line_get_type.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 <andreas@fatal.se>
-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*);