Accepting request 99281 from GNOME:Apps
Update to 2.4.8 + fix build against new glib (forwarded request 99268 from vuntz) OBS-URL: https://build.opensuse.org/request/show/99281 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=41
This commit is contained in:
parent
69f2dc3d54
commit
2c637bf03b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e
|
||||
size 9297876
|
3
gnucash-2.4.8.tar.bz2
Normal file
3
gnucash-2.4.8.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4aa11e7746bb5105682a223f9baf97200ecf2a1fcddbf871626805ac097fee19
|
||||
size 9345232
|
14
gnucash-glib-2.31.patch
Normal file
14
gnucash-glib-2.31.patch
Normal file
@ -0,0 +1,14 @@
|
||||
Index: gnucash-2.4.8/src/gnome-utils/gnc-frequency.c
|
||||
===================================================================
|
||||
--- gnucash-2.4.8.orig/src/gnome-utils/gnc-frequency.c
|
||||
+++ gnucash-2.4.8/src/gnome-utils/gnc-frequency.c
|
||||
@@ -25,8 +25,8 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtk.h>
|
||||
-#include <glib/gtypes.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
|
@ -18,19 +18,6 @@ Index: gnucash-2.4.6/src/import-export/aqbanking/Makefile.am
|
||||
${AQBANKING_CFLAGS}
|
||||
|
||||
uidir = $(GNC_UI_DIR)
|
||||
Index: gnucash-2.4.6/src/guile-mappings.h
|
||||
===================================================================
|
||||
--- gnucash-2.4.6.orig/src/guile-mappings.h
|
||||
+++ gnucash-2.4.6/src/guile-mappings.h
|
||||
@@ -17,7 +17,7 @@
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
|
||||
\********************************************************************/
|
||||
|
||||
-#include <libguile/version.h> /* for SCM_MAJOR_VERSION etc */
|
||||
+#include <libguile.h> /* for SCM_MAJOR_VERSION etc */
|
||||
|
||||
/* Give Guile 1.6 and 1.8 a 2.0-like interface */
|
||||
#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6)
|
||||
Index: gnucash-2.4.6/src/plugins/bi_import/Makefile.am
|
||||
===================================================================
|
||||
--- gnucash-2.4.6.orig/src/plugins/bi_import/Makefile.am
|
||||
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 6 14:50:31 UTC 2012 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.4.8:
|
||||
+ Various code changes.
|
||||
+ Bugs fixed:
|
||||
- bgo#644977: Add new Quicken Check 21 format.
|
||||
- bgo#655901: Fix build with guile 2.0.
|
||||
- bgo#365928, bgo#553432, bgo#612562, bgo#626970, bgo#645216,
|
||||
bgo#651522, bgo#658244, bgo#661721
|
||||
- Rebase gnucash-guile-2.0.patch.
|
||||
- Add gnucash-glib-2.31.patch: fix build with glib 2.31.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 2 06:25:28 UTC 2011 - coolo@suse.com
|
||||
|
||||
|
@ -15,14 +15,15 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: gnucash
|
||||
Version: 2.4.7
|
||||
Version: 2.4.8
|
||||
Release: 0
|
||||
Summary: Personal Finance Manager
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Office/Finance
|
||||
Url: http://www.gnucash.org/
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.4.8/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-rpmlintrc
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
|
||||
Patch: gnucash-desktop.patch
|
||||
@ -30,6 +31,8 @@ Patch: gnucash-desktop.patch
|
||||
Patch3: gnucash-cpan-warning.patch
|
||||
# PATCH-FIX-UPSTREAM gnucash-guile-2.0.patch bgo#655901 pgajdos@novell.com -- Fix build with guile 2.0
|
||||
Patch4: gnucash-guile-2.0.patch
|
||||
# PATCH-FIX-UPSTREAM gnucash-glib-2.31.patch bgo#667417 vuntz@opensuse.org -- Fix build with glib 2.31 (single include)
|
||||
Patch5: gnucash-glib-2.31.patch
|
||||
BuildRequires: automake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
@ -102,6 +105,7 @@ balanced books.
|
||||
# This patch must be applied:
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
%configure\
|
||||
|
Loading…
Reference in New Issue
Block a user