From: <no...@us...> - 2008-08-22 07:43:21
|
Revision: 1337 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1337&view=rev Author: nonsea Date: 2008-08-22 07:43:28 +0000 (Fri, 22 Aug 2008) Log Message: ----------- 2008-08-22 Halton Huo <no...@us...> * SFEgnucash.spec: Add use SS12 note. * base-specs/gnucash.spec: Add patch solaris-sh.diff * patches/gnucash-07-solaris-sh.diff: (added) fix bugzilla #548218 * patches/gnucash-04-inline.diff: rework Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEgnucash.spec spec-files-extra/trunk/base-specs/gnucash.spec spec-files-extra/trunk/patches/gnucash-04-inline.diff Added Paths: ----------- spec-files-extra/trunk/patches/gnucash-07-solaris-sh.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2008-08-22 03:53:03 UTC (rev 1336) +++ spec-files-extra/trunk/ChangeLog 2008-08-22 07:43:28 UTC (rev 1337) @@ -1,3 +1,10 @@ +2008-08-22 Halton Huo <no...@us...> + + * SFEgnucash.spec: Add use SS12 note. + * base-specs/gnucash.spec: Add patch solaris-sh.diff + * patches/gnucash-07-solaris-sh.diff: (added) fix bugzilla #548218 + * patches/gnucash-04-inline.diff: rework + 2008-08-21 Brian Cameron <bri...@su...> * patches/libcanberra-01-solaris.diff: Update patch based on @@ -5,6 +12,17 @@ 2008-08-21 Halton Huo <no...@us...> + * SFEgnucash.spec: + * base-specs/gnucash.spec: + * patches/gnucash-07-solaris-sh.diff: + +2008-08-21 Brian Cameron <bri...@su...> + + * patches/libcanberra-01-solaris.diff: Update patch based on + maintainers comments. + +2008-08-21 Halton Huo <no...@us...> + * patches/anjuta-04-miss-vala-sgml.diff: (rework) 2008-08-20 Michal Bielicki <michal.bielicki <at> voiceworks.pl> Modified: spec-files-extra/trunk/SFEgnucash.spec =================================================================== --- spec-files-extra/trunk/SFEgnucash.spec 2008-08-22 03:53:03 UTC (rev 1336) +++ spec-files-extra/trunk/SFEgnucash.spec 2008-08-22 07:43:28 UTC (rev 1337) @@ -8,6 +8,8 @@ # package are under the same license as the package itself. # # Owner: halton +# NOTE: You need build this spec with SS12, check +# http://bugzilla.gnome.org/show_bug.cgi?id=548956 for detail. # %include Solaris.inc Modified: spec-files-extra/trunk/base-specs/gnucash.spec =================================================================== --- spec-files-extra/trunk/base-specs/gnucash.spec 2008-08-22 03:53:03 UTC (rev 1336) +++ spec-files-extra/trunk/base-specs/gnucash.spec 2008-08-22 07:43:28 UTC (rev 1337) @@ -31,6 +31,8 @@ Patch5: %{name}-05-libgoffice-0.8.diff # date:2008-06-27 owner:halton type:bug bugzilla:539942 Patch6: %{name}-06-configure-fail.diff +# date:2008-08-22 owner:halton type:bug bugzilla:548218 +Patch7: %{name}-07-solaris-sh.diff BuildRoot: %{tmpdir}/%{name}-%{version}-root Requires: libgnomeui >= %{libgnomeui_version} @@ -72,6 +74,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %ifos linux @@ -165,6 +168,8 @@ %{_includedir}/gnucash %changelog +* Fri Aug 22 2008 - no...@us... +- solaris-sh.diff to fix bugzilla #548218 * Mon Aug 18 2008 - no...@us... - Bump to 2.2.6 - Use .bz2 Modified: spec-files-extra/trunk/patches/gnucash-04-inline.diff =================================================================== --- spec-files-extra/trunk/patches/gnucash-04-inline.diff 2008-08-22 03:53:03 UTC (rev 1336) +++ spec-files-extra/trunk/patches/gnucash-04-inline.diff 2008-08-22 07:43:28 UTC (rev 1337) @@ -1,13 +1,13 @@ Index: trunk/lib/libqof/qof/qofmath128.c =================================================================== ---- trunk/lib/libqof/qof/qofmath128.c (revision 17250) +--- trunk/lib/libqof/qof/qofmath128.c (revision 17477) +++ trunk/lib/libqof/qof/qofmath128.c (working copy) @@ -37,7 +37,7 @@ /** Multiply a pair of signed 64-bit numbers, * returning a signed 128-bit number. */ -inline qofint128 -+static inline qofint128 ++G_INLINE_FUNC qofint128 mult128 (gint64 a, gint64 b) { qofint128 prod; @@ -16,34 +16,88 @@ /** Shift right by one bit (i.e. divide by two) */ -inline qofint128 -+static inline qofint128 ++G_INLINE_FUNC qofint128 shift128 (qofint128 x) { guint64 sbit = x.hi & 0x1; +@@ -127,7 +127,7 @@ + } + + /** Shift leftt by one bit (i.e. multiply by two) */ +-inline qofint128 ++G_INLINE_FUNC qofint128 + shiftleft128 (qofint128 x) + { + guint64 sbit; +@@ -149,7 +149,7 @@ + } + + /** increment a 128-bit number by one */ +-inline qofint128 ++G_INLINE_FUNC qofint128 + inc128 (qofint128 a) + { + if (0 == a.isneg) @@ -176,7 +176,7 @@ /** Divide a signed 128-bit number by a signed 64-bit, * returning a signed 128-bit number. */ -inline qofint128 -+static inline qofint128 ++G_INLINE_FUNC qofint128 div128 (qofint128 n, gint64 d) { qofint128 quotient; +@@ -215,7 +215,7 @@ + * I beleive that ths algo is overflow-free, but should be + * audited some more ... + */ +-inline gint64 ++G_INLINE_FUNC gint64 + rem128 (qofint128 n, gint64 d) + { + qofint128 quotient = div128 (n,d); @@ -228,7 +228,7 @@ } /** Return true of two numbers are equal */ -inline gboolean -+static inline gboolean ++G_INLINE_FUNC gboolean equal128 (qofint128 a, qofint128 b) { if (a.lo != b.lo) return 0; +@@ -238,7 +238,7 @@ + } + + /** Return returns 1 if a>b, -1 if b>a, 0 if a == b */ +-inline int ++G_INLINE_FUNC int + cmp128 (qofint128 a, qofint128 b) + { + if ((0 == a.isneg) && b.isneg) return 1; +@@ -260,7 +260,7 @@ + } + + /** Return the greatest common factor of two 64-bit numbers */ +-inline guint64 ++G_INLINE_FUNC guint64 + gcf64(guint64 num, guint64 denom) + { + guint64 t; @@ -281,7 +281,7 @@ } /** Return the least common multiple of two 64-bit numbers. */ -inline qofint128 -+static inline qofint128 ++G_INLINE_FUNC qofint128 lcm128 (guint64 a, guint64 b) { guint64 gcf = gcf64 (a,b); +@@ -290,7 +290,7 @@ + } + + /** Add a pair of 128-bit numbers, returning a 128-bit number */ +-inline qofint128 ++G_INLINE_FUNC qofint128 + add128 (qofint128 a, qofint128 b) + { + qofint128 sum; Added: spec-files-extra/trunk/patches/gnucash-07-solaris-sh.diff =================================================================== --- spec-files-extra/trunk/patches/gnucash-07-solaris-sh.diff (rev 0) +++ spec-files-extra/trunk/patches/gnucash-07-solaris-sh.diff 2008-08-22 07:43:28 UTC (rev 1337) @@ -0,0 +1,57 @@ +Index: trunk/configure.in +=================================================================== +--- trunk/configure.in (revision 17477) ++++ trunk/configure.in (working copy) +@@ -37,8 +37,9 @@ + # --enable-debug: + USER_OPTIMIZATION="" + for flag in $CFLAGS; do +- if test -z $(echo $flag | sed -e 's,-O.,,'); then +- USER_OPTIMIZATION="$USER_OPTIMIZATION ${flag}" ++ tmp_flag=`echo $flag | sed -e 's,-O.,,'` ++ if test -z "$tmp_flag"; then ++ USER_OPTIMIZATION="$USER_OPTIMIZATION ${tmp_flag}" + fi + done + +@@ -684,13 +685,14 @@ + + AC_ARG_ENABLE( debug, + [ --enable-debug compile with debugging flags set], ++ [ + # remove any optimization flags... +- CFLAGS=$(echo $CFLAGS | sed -e 's,-O.,,g') ++ CFLAGS=`echo ${CFLAGS} | sed -e 's,-O.,,g'` + # ...except for those the user wants. + CFLAGS="${CFLAGS} -g ${USER_OPTIMIZATION}" + LDFLAGS="${LDFLAGS} -g" + AC_DEFINE(DEBUG_MEMORY,1,Enable debug memory), +- AC_DEFINE(DEBUG_MEMORY,0,Enable debug memory) ) ++ AC_DEFINE(DEBUG_MEMORY,0,Enable debug memory)]) + + AC_ARG_ENABLE( profile, + [ --enable-profile compile with profiling set], +@@ -1162,8 +1164,8 @@ + dnl GIVEN_CFLAGS=$(echo $GIVEN_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;") + case $host_os in + darwin*) +- GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include ;;" | ${SED} -e "s;-I/sw/include$;;") +- GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include/gtkhtml ;;" | ${SED} -e "s;-I/sw/includ/gtkhtmle$;;") ++ GTKHTML_CFLAGS=`echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include ;;" | ${SED} -e "s;-I/sw/include$;;"` ++ GTKHTML_CFLAGS=`echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include/gtkhtml ;;" | ${SED} -e "s;-I/sw/includ/gtkhtmle$;;"` + ;; + esac + AC_SUBST(GTKHTML_CFLAGS) +Index: trunk/macros/as-scrub-include.m4 +=================================================================== +--- trunk/macros/as-scrub-include.m4 (revision 17477) ++++ trunk/macros/as-scrub-include.m4 (working copy) +@@ -26,7 +26,7 @@ + dnl line + INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'` + for dir in $INCLUDE_DIRS; do +- GIVEN_CFLAGS=$(echo $GIVEN_CFLAGS | sed -e "s;-I$dir ;;" | sed -e "s;-I$dir$;;") ++ GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s;-I$dir ;;" | sed -e "s;-I$dir$;;"` + done + [$1]=$GIVEN_CFLAGS + ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |