Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=7129ef2730773a6ac1b0d175c1fef8d361cdddd7

commit 7129ef2730773a6ac1b0d175c1fef8d361cdddd7
Author: James Buren <r...@frugalware.org>
Date:   Tue May 4 08:55:01 2010 -0500

gmrun-0.9.2-2-i686
* fix building

diff --git a/source/xapps-extra/gmrun/FrugalBuild 
b/source/xapps-extra/gmrun/FrugalBuild
index 4cf7e5d..66df1f4 100644
--- a/source/xapps-extra/gmrun/FrugalBuild
+++ b/source/xapps-extra/gmrun/FrugalBuild
@@ -10,6 +10,8 @@ license="GPL"
groups=('xapps-extra')
depends=('gtk+2>=2.20.0-2' 'popt')
Finclude sourceforge
-sha1sums=('ced54e287fa5665893c41d0e32940b1672027a02')
+source=(${sour...@]} $pkgname-gcc-4.5.patch)
+sha1sums=('ced54e287fa5665893c41d0e32940b1672027a02' \
+          '39c180ea218955e4b9ca63a6972ac131b77b56d7')

# optimization OK
diff --git a/source/xapps-extra/gmrun/gmrun-gcc-4.5.patch 
b/source/xapps-extra/gmrun/gmrun-gcc-4.5.patch
new file mode 100644
index 0000000..f41e6b3
--- /dev/null
+++ b/source/xapps-extra/gmrun/gmrun-gcc-4.5.patch
@@ -0,0 +1,53 @@
+diff -aur gmrun-0.9.2/src/ci_string.h gmrun-0.9.2-2/src/ci_string.h
+--- gmrun-0.9.2/src/ci_string.h        2001-05-16 09:39:31.000000000 -0500
++++ gmrun-0.9.2-2/src/ci_string.h      2010-05-04 08:51:45.000000000 -0500
+@@ -7,6 +7,7 @@
+ #define __CI_STRING_H__
+
+ #include <string>
++#include <string.h>
+ #include <ctype.h>
+
+ struct ci_char_traits : public std::char_traits<char>
+Only in gmrun-0.9.2-2/src: ci_string.h~
+diff -aur gmrun-0.9.2/src/gtkcompletionline.cc 
gmrun-0.9.2-2/src/gtkcompletionline.cc
+--- gmrun-0.9.2/src/gtkcompletionline.cc       2003-11-16 04:55:07.000000000 
-0600
++++ gmrun-0.9.2-2/src/gtkcompletionline.cc     2010-05-04 08:51:27.000000000 
-0500
+@@ -30,6 +30,7 @@
+ #include <sstream>
+ #include <string>
+ #include <vector>
++#include <string.h>
+ using namespace std;
+
+ #include "gtkcompletionline.h"
+@@ -407,7 +408,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, (int (*) 
(const dirent**,const dirent**))my_alphasort);
+     if (n >= 0) {
+       for (int j = 0; j < n; j++) {
+         execs.insert(eps[j]->d_name);
+@@ -507,7 +508,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, (int (*) (const 
dirent**,const dirent**)) my_alphasort);
+   if (n >= 0) {
+     for (int j = 0; j < n; j++) {
+       {
+diff -aur gmrun-0.9.2/src/prefs.h gmrun-0.9.2-2/src/prefs.h
+--- gmrun-0.9.2/src/prefs.h    2002-08-16 05:30:18.000000000 -0500
++++ gmrun-0.9.2-2/src/prefs.h  2010-05-04 08:53:48.000000000 -0500
+@@ -15,6 +15,7 @@
+
+ #include "ci_string.h"
+ #include <map>
++#include <stdlib.h>
+ #include <list>
+
+ class Prefs
+Only in gmrun-0.9.2-2/src: prefs.h~
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to