diff --git a/genius-1.0.12.tar.bz2 b/genius-1.0.12.tar.bz2 deleted file mode 100644 index 41d5a5f..0000000 --- a/genius-1.0.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e94f92474140d1549f44cd84a09e62760f4e0e6af555c565559d132556f5fde4 -size 1698688 diff --git a/genius-1.0.13.tar.bz2 b/genius-1.0.13.tar.bz2 new file mode 100644 index 0000000..dd80124 --- /dev/null +++ b/genius-1.0.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5da8c1c5af7985eddf69831912bb7890fe46ca1ced2b4d0b6eced465b5ca768 +size 2964623 diff --git a/genius-fix-warnings.patch b/genius-fix-warnings.patch new file mode 100644 index 0000000..6259bfe --- /dev/null +++ b/genius-fix-warnings.patch @@ -0,0 +1,131 @@ +Index: genius-1.0.13/src/eval.c +=================================================================== +--- genius-1.0.13.orig/src/eval.c ++++ genius-1.0.13/src/eval.c +@@ -5641,7 +5641,7 @@ iter_equalsop(GelETree *n) + + if (index->type == GEL_VALUE_NODE || + index->type == GEL_MATRIX_NODE) { +- int *regx, *regy; ++ int *regx = NULL, *regy = NULL; + int lx, ly; + int i; + +Index: genius-1.0.13/src/funclib.c +=================================================================== +--- genius-1.0.13.orig/src/funclib.c ++++ genius-1.0.13/src/funclib.c +@@ -5339,7 +5339,6 @@ static GelETree * + Permutations_op (GelCtx *ctx, GelETree * * a, gboolean *exception) + { + GelETree *r; +- GQueue queue = G_QUEUE_INIT; + long k, n, len; + int *comb; + int *perm; +Index: genius-1.0.13/src/dict.c +=================================================================== +--- genius-1.0.13.orig/src/dict.c ++++ genius-1.0.13/src/dict.c +@@ -439,7 +439,6 @@ d_lookup_local(GelToken *id) + GelEFunc * + d_lookup_global_up1(GelToken *id) + { +- GelEFunc *func; + GSList *li; + + if G_UNLIKELY (id == NULL || id->refs == NULL) +@@ -485,7 +484,6 @@ d_lookup_only_global (GelToken *id) + GelEFunc * + d_lookup_global (GelToken *id) + { +- GelEFunc *func; + GSList *li; + + if G_UNLIKELY (id == NULL || id->refs == NULL) +Index: genius-1.0.13/src/matrixw.c +=================================================================== +--- genius-1.0.13.orig/src/matrixw.c ++++ genius-1.0.13/src/matrixw.c +@@ -593,9 +593,9 @@ gel_matrixw_incr_element (GelMatrixW *m, + { + GelETree *t; + +- g_return_if_fail (m != NULL); +- g_return_if_fail (x >= 0); +- g_return_if_fail (y >= 0); ++ g_return_val_if_fail (m != NULL, FALSE); ++ g_return_val_if_fail (x >= 0, FALSE); ++ g_return_val_if_fail (y >= 0, FALSE); + #ifdef MATRIX_DEBUG + /*debug*/printf ("%s\n", G_GNUC_PRETTY_FUNCTION); + #endif +@@ -670,8 +670,8 @@ gel_matrixw_incr_velement (GelMatrixW *m + GelETree *t; + int x, y; + +- g_return_if_fail (m != NULL); +- g_return_if_fail (i >= 0); ++ g_return_val_if_fail (m != NULL, FALSE); ++ g_return_val_if_fail (i >= 0, FALSE); + + if (m->tr) { + if (m->regw == 1) { +@@ -726,6 +726,8 @@ gel_matrixw_incr_region (GelMatrixW *m, + gel_matrixw_incr_element (m, destx[i], desty[j], by); + } + } ++ ++ return TRUE; + } + + int +@@ -741,6 +743,8 @@ gel_matrixw_incr (GelMatrixW *m, mpw_ptr + gel_matrixw_incr_element (m, i, j, by); + } + } ++ ++ return TRUE; + } + + int +@@ -752,6 +756,8 @@ gel_matrixw_incr_vregion (GelMatrixW *m, + for (i = 0; i < len; i++) { + gel_matrixw_incr_velement (m, desti[i], by); + } ++ ++ return TRUE; + } + + /*make sure it's in range first!*/ +Index: genius-1.0.13/src/calc.c +=================================================================== +--- genius-1.0.13.orig/src/calc.c ++++ genius-1.0.13/src/calc.c +@@ -1997,7 +1997,7 @@ load_compiled_fp (const char *file, FILE + GelToken *tok, *symbolic_tok = NULL; + int size, nargs, vararg, propagate_mod, no_mod_all_args; + int local_all, never_on_subst_list, built_subst_dict; +- GSList *local_idents, *subst_dict; ++ GSList *local_idents = NULL, *subst_dict = NULL; + gboolean extra_dict = FALSE; + gboolean parameter = FALSE; + int i; +Index: genius-1.0.13/src/inter.c +=================================================================== +--- genius-1.0.13.orig/src/inter.c ++++ genius-1.0.13/src/inter.c +@@ -257,12 +257,11 @@ extern const char *genius_operators[]; + static char * + command_generator (const char *text, int state) + { +- static int oi,ti,pi,len; ++ static int oi,ti,len; + static GSList *fli; + + if(!state) { + oi = 0; +- pi = 0; + if(addtoplevels) + ti = 0; + else diff --git a/genius.changes b/genius.changes index 4582516..abae0fc 100644 --- a/genius.changes +++ b/genius.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Jul 29 08:36:37 CEST 2011 - vuntz@opensuse.org + +- Update to version 1.0.13: + + Add ShuffleVector + + Add increment and swapwith operators + + Require gtk 2.18 and fix up some deprecated function usage + + Slightly more cache friendly matrix traversal + + Optimize Combinations, Permutations, SortVector, + IntegerQuotient + + Lots of tiny random optimizations + + Open help even if the URI api is broken + + Make pngs in the distribution smaller yet + + Make the compiled library slightly smaller + + Some more vector functions accept null properly + + Minor portability fixes + + Updated translations. +- Add gnome-doc-utils-devel BuildRequires for new dependency. +- Add genius-fix-warnings.patch: fix build warnings that make the + build fail. + ------------------------------------------------------------------- Thu Apr 28 12:57:23 CEST 2011 - vuntz@opensuse.org diff --git a/genius.spec b/genius.spec index 3448631..306510a 100644 --- a/genius.spec +++ b/genius.spec @@ -19,15 +19,17 @@ Name: genius -Version: 1.0.12 -Release: 13 +Version: 1.0.13 +Release: 1 License: GPLv3+ Summary: General purpose calculator and mathematics tool Group: Productivity/Scientific/Math Url: http://www.jirka.org/genius.html -Source: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: http://download.gnome.org/sources/genius/1.0/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM genius-fix-warnings.patch vuntz@opensuse.org -- Fix build warnings, sent upstream by mail +Patch0: genius-fix-warnings.patch BuildRequires: fdupes +BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: mpfr-devel BuildRequires: ncurses-devel @@ -40,6 +42,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtksourceview-2.0) BuildRequires: pkgconfig(vte) Recommends: %{name}-lang +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Genius is a general purpose calculator program similar in some aspects @@ -88,6 +91,7 @@ genius functions are written in GEL itself. %prep %setup -q translation-update-upstream +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"