Hello community,
here is the log from the commit of package gle-graphics for openSUSE:Factory
checked in at 2015-07-05 18:02:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gle-graphics (Old)
and /work/SRC/openSUSE:Factory/.gle-graphics.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gle-graphics"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gle-graphics/gle-graphics.changes
2015-01-20 12:32:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gle-graphics.new/gle-graphics.changes
2015-07-05 18:02:36.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jul 2 15:14:09 UTC 2015 - t...@physics.org
+
+- Fix build break re string.class and accessing it as a 'char *'
+ * string-gledir.patch
+ * string-gledir-filemenu.patch
+
+-------------------------------------------------------------------
+Sat Jun 27 07:33:50 UTC 2015 - t...@physics.org
+
+- do string properly
+
+-------------------------------------------------------------------
New:
----
string-gledir-filemenu.patch
string-gledir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gle-graphics.spec ++++++
--- /var/tmp/diff_new_pack.or6jGQ/_old 2015-07-05 18:02:37.000000000 +0200
+++ /var/tmp/diff_new_pack.or6jGQ/_new 2015-07-05 18:02:37.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gle-graphics
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,8 @@
Source1000: gle-graphics-rpmlintrc
# PATCH-UPSTREAM: needs for build with gcc4.4 - was sent to upstream
Patch0: gle-graphics-gcc44.patch
+Patch1: string-gledir.patch
+Patch2: string-gledir-filemenu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: c++_compiler
@@ -119,6 +121,8 @@
%setup -q
%patch0 -b .gcc44
+%patch1 -p0
+%patch2 -p0
cp %{SOURCE3} .
++++++ string-gledir-filemenu.patch ++++++
--- src/manip/filemenu.cpp.orig 2015-06-27 08:09:46.453309007 +0100
+++ src/manip/filemenu.cpp 2015-06-27 08:10:44.853826542 +0100
@@ -404,10 +404,10 @@
gotoxy(1,1);
wprintf("Manip help on topic {%s}, sub topic {%s}",k1,k2);
scr_menubg();
- hfile = fopen(gledir(hfilename),"r");
+ hfile = fopen(gledir(hfilename).c_str(),"r");
if (hfile==NULL) {
gotoxy(1,3);
- wprintf("Unable to open {%s} \n",gledir(hfilename));
+ wprintf("Unable to open {%s} \n",gledir(hfilename).c_str());
text_inkey();
return;
}
++++++ string-gledir.patch ++++++
--- src/manip/all.h.orig 2015-06-27 07:47:13.153406985 +0100
+++ src/manip/all.h 2015-06-27 07:47:58.768601507 +0100
@@ -143,7 +143,7 @@
typedef unsigned char uchar;
typedef double dbl;
char *unquote(char *s);
-const char *gledir(const char *s);
+string gledir(const char *s);
int set_missing(int x, int y);
double vcell(int x, int y);
void var_find_rc(int *idx, int *var, int *nd, int c);
