[arch-commits] Commit in gmrun/trunk (3 files)

[Florian Pritz]

    Date: Thursday, September 12, 2019 @ 11:24:32
  Author: bluewind
Revision: 509530

upgpkg: gmrun 0.9.5w-1

upstream update

Modified:
  gmrun/trunk/PKGBUILD
Deleted:
  gmrun/trunk/history_string.patch
  gmrun/trunk/return-type-gtk_completion_line_get_type.patch

------------------------------------------------+
 PKGBUILD                                       |   19 ++------------
 history_string.patch                           |   26 -------------------
 return-type-gtk_completion_line_get_type.patch |   31 -----------------------
 3 files changed, 4 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-12 11:24:29 UTC (rev 509529)
+++ PKGBUILD	2019-09-12 11:24:32 UTC (rev 509530)
@@ -3,28 +3,17 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=gmrun
-pkgver=0.9.4w
-pkgrel=2
+pkgver=0.9.5w
+pkgrel=1
 pkgdesc="A simple program which provides a run program window"
 arch=('x86_64')
 url="https://github.com/wdlkmpx/gmrun"
 license=('GPL')
 depends=('gtk2' 'popt')
-source=($pkgname-$pkgver.tar.gz::https://github.com/wdlkmpx/gmrun/archive/$pkgver.tar.gz
-	return-type-gtk_completion_line_get_type.patch
-	history_string.patch)
-md5sums=('e3fa3ebfa6d81675ba59152372fb2f7b'
-         '0b467e3cdb14ca9f93176d3193659af7'
-         'f33450f3fae35ed6111aec8417c4d3d6')
+source=($pkgname-$pkgver.tar.gz::https://github.com/wdlkmpx/gmrun/archive/$pkgver.tar.gz)
+md5sums=('8d7fdf893f15306df9bb9daca6cf897d')
 backup=('etc/gmrunrc')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i "$srcdir/return-type-gtk_completion_line_get_type.patch"
-	patch -p1 -i "$srcdir/history_string.patch"
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: history_string.patch
===================================================================
--- history_string.patch	2019-09-12 11:24:29 UTC (rev 509529)
+++ history_string.patch	2019-09-12 11:24:32 UTC (rev 509530)
@@ -1,26 +0,0 @@
-Description: Handle more than 256 characters in the history
-Author: <bdefreese at bddebian3.bddebian.com>
-
---- a/src/history.cc
-+++ b/src/history.cc
-@@ -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();

Deleted: return-type-gtk_completion_line_get_type.patch
===================================================================
--- return-type-gtk_completion_line_get_type.patch	2019-09-12 11:24:29 UTC (rev 509529)
+++ return-type-gtk_completion_line_get_type.patch	2019-09-12 11:24:32 UTC (rev 509530)
@@ -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 at 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*);