[arch-commits] Commit in gmrun/repos/community-x86_64 (6 files)
Balló György
bgyorgy at archlinux.org
Mon Jan 29 12:49:49 UTC 2018
Date: Monday, January 29, 2018 @ 12:49:48
Author: bgyorgy
Revision: 287768
archrelease: copy trunk to community-x86_64
Added:
gmrun/repos/community-x86_64/PKGBUILD
(from rev 287767, gmrun/trunk/PKGBUILD)
gmrun/repos/community-x86_64/gcc43.patch
(from rev 287767, gmrun/trunk/gcc43.patch)
gmrun/repos/community-x86_64/history_string.patch
(from rev 287767, gmrun/trunk/history_string.patch)
gmrun/repos/community-x86_64/return-type-gtk_completion_line_get_type.patch
(from rev 287767, gmrun/trunk/return-type-gtk_completion_line_get_type.patch)
Deleted:
gmrun/repos/community-x86_64/PKGBUILD
gmrun/repos/community-x86_64/gcc43.patch
------------------------------------------------+
PKGBUILD | 71 +++++++++-------
gcc43.patch | 102 +++++++++++------------
history_string.patch | 26 +++++
return-type-gtk_completion_line_get_type.patch | 31 ++++++
4 files changed, 149 insertions(+), 81 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-29 12:49:39 UTC (rev 287767)
+++ PKGBUILD 2018-01-29 12:49:48 UTC (rev 287768)
@@ -1,30 +0,0 @@
-# Contributor: Jeff Mickey <j at codemac.net>
-# Contributor: Woody Gilk aka Shadowhand <woody.gilk at gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=gmrun
-pkgver=0.9.2
-pkgrel=6
-pkgdesc="A simple program which provides a run program window"
-arch=('i686' 'x86_64')
-url="http://sf.net/projects/gmrun"
-license=('GPL')
-depends=('gtk2' 'popt')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
- gcc43.patch)
-md5sums=('6cef37a968006d9496fc56a7099c603c'
- '3a0b69d8c2cac6cfb551b9d235441ecb')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p0 -i "$srcdir/gcc43.patch"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
Copied: gmrun/repos/community-x86_64/PKGBUILD (from rev 287767, gmrun/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-29 12:49:48 UTC (rev 287768)
@@ -0,0 +1,41 @@
+# Contributor: Jeff Mickey <j at codemac.net>
+# Contributor: Woody Gilk aka Shadowhand <woody.gilk at gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=gmrun
+pkgver=0.9.2
+pkgrel=7
+pkgdesc="A simple program which provides a run program window"
+arch=('x86_64')
+url="http://sf.net/projects/gmrun"
+license=('GPL')
+depends=('gtk2' 'popt')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+ gcc43.patch
+ return-type-gtk_completion_line_get_type.patch
+ history_string.patch)
+md5sums=('6cef37a968006d9496fc56a7099c603c'
+ '3a0b69d8c2cac6cfb551b9d235441ecb'
+ '0b467e3cdb14ca9f93176d3193659af7'
+ 'f33450f3fae35ed6111aec8417c4d3d6')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p0 -i "$srcdir/gcc43.patch"
+ patch -p1 -i "$srcdir/return-type-gtk_completion_line_get_type.patch"
+ patch -p1 -i "$srcdir/history_string.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: gcc43.patch
===================================================================
--- gcc43.patch 2018-01-29 12:49:39 UTC (rev 287767)
+++ gcc43.patch 2018-01-29 12:49:48 UTC (rev 287768)
@@ -1,51 +0,0 @@
---- src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100
-+++ 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;
-
---- src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200
-+++ 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>
---- src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200
-+++ 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>
-
---- src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100
-+++ 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>
-
---- src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400
-+++ 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;
Copied: gmrun/repos/community-x86_64/gcc43.patch (from rev 287767, gmrun/trunk/gcc43.patch)
===================================================================
--- gcc43.patch (rev 0)
+++ gcc43.patch 2018-01-29 12:49:48 UTC (rev 287768)
@@ -0,0 +1,51 @@
+--- src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100
++++ 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;
+
+--- src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200
++++ 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>
+--- src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200
++++ 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>
+
+--- src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100
++++ 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>
+
+--- src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400
++++ 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;
Copied: gmrun/repos/community-x86_64/history_string.patch (from rev 287767, gmrun/trunk/history_string.patch)
===================================================================
--- history_string.patch (rev 0)
+++ history_string.patch 2018-01-29 12:49:48 UTC (rev 287768)
@@ -0,0 +1,26 @@
+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();
Copied: gmrun/repos/community-x86_64/return-type-gtk_completion_line_get_type.patch (from rev 287767, gmrun/trunk/return-type-gtk_completion_line_get_type.patch)
===================================================================
--- return-type-gtk_completion_line_get_type.patch (rev 0)
+++ return-type-gtk_completion_line_get_type.patch 2018-01-29 12:49:48 UTC (rev 287768)
@@ -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 <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*);
More information about the arch-commits
mailing list