![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package rarian checked in at Thu May 8 02:19:48 CEST 2008. -------- --- GNOME/rarian/rarian.changes 2008-04-24 14:16:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/rarian/rarian.changes 2008-05-07 13:45:24.545167000 +0200 @@ -1,0 +2,11 @@ +Wed May 7 13:50:35 CEST 2008 - vuntz@suse.de + +- Add rarian-help-bundle.patch to fetch help from + /usr/share/gnome/help-bundle when it's living there. + +------------------------------------------------------------------- +Wed May 7 08:07:50 CEST 2008 - coolo@suse.de + +- return in non-void functions + +------------------------------------------------------------------- New: ---- rarian-0.7.1-return.patch rarian-help-bundle.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rarian.spec ++++++ --- /var/tmp/diff_new_pack.i14208/_old 2008-05-08 02:19:30.000000000 +0200 +++ /var/tmp/diff_new_pack.i14208/_new 2008-05-08 02:19:30.000000000 +0200 @@ -13,14 +13,17 @@ Name: rarian BuildRequires: docbook_4 gcc-c++ intltool libxslt-devel perl-XML-Parser pkg-config sgml-skel -Summary: Rarian is designed to be a replacement for scrollkeeper. +Summary: Rarian is designed to be a replacement for scrollkeeper Version: 0.7.1 -Release: 12 +Release: 16 Source0: %{name}-%{version}.tar.bz2 Patch1: rarian-0.5.6-reg-parse-bugs.patch +Patch2: rarian-0.7.1-return.patch Patch3: rarian-0.5.6-docs-from-desktop-entries-and-bundles.patch # PATCH-FIX-OPENSUSE rarian-opensuse-manuals.patch vuntz@novell.com -- Find openSUSE manuals Patch4: rarian-opensuse-manuals.patch +# PATCH-FIX-OPENSUSE rarian-help-bundle.patch vuntz@novell.com -- Grab manual in /usr/share/gnome/help-bundle when it makes sense +Patch5: rarian-help-bundle.patch License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,8 +70,10 @@ %setup -q #%setup -q -a 1 %patch1 -p1 +%patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %configure --disable-scrollkeeper-compat @@ -102,6 +107,11 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed May 07 2008 vuntz@suse.de +- Add rarian-help-bundle.patch to fetch help from + /usr/share/gnome/help-bundle when it's living there. +* Wed May 07 2008 coolo@suse.de +- return in non-void functions * Thu Apr 24 2008 vuntz@suse.de - Add rarian-opensuse-manuals.patch to list openSUSE manuals. This is a temporary fix, until we can get the manuals packages to ++++++ rarian-0.7.1-return.patch ++++++ --- librarian/rarian-reg-utils.c.orig 2008-05-07 08:03:00.000000000 +0200 +++ librarian/rarian-reg-utils.c 2008-05-07 08:03:02.000000000 +0200 @@ -561,6 +561,7 @@ rrn_sect_new () sect->children = NULL; sect->owner = NULL; sect->priority = 0; + return sect; } RrnSect * --- librarian/rarian-main.c.orig 2008-05-07 08:01:45.000000000 +0200 +++ librarian/rarian-main.c 2008-05-07 08:02:21.000000000 +0200 @@ -579,6 +579,7 @@ reverse_child (RrnSect *child) } iter = iter->prev; } + return iter; } static void ++++++ rarian-help-bundle.patch ++++++ diff -aurp rarian-0.7.1/librarian/rarian-omf.cpp rarian-0.7.1-patched/librarian/rarian-omf.cpp --- rarian-0.7.1/librarian/rarian-omf.cpp 2008-01-07 23:21:51.000000000 +0100 +++ rarian-0.7.1-patched/librarian/rarian-omf.cpp 2008-05-07 13:31:07.910658000 +0200 @@ -186,6 +186,33 @@ rrn_omf_parse_file (char *path) return NULL; } + if (reg->uri && strncmp (reg->uri, "file://", strlen ("file://")) == 0) { + char *path; + path = reg->uri + strlen ("file://"); + if (access (path, R_OK) != 0) { + if (strncmp (path, "/usr/share/gnome/help/", strlen ("/usr/share/gnome/help/")) == 0) { + char *new_uri; + + new_uri = (char *) malloc (sizeof(char) * (strlen (reg->uri) + strlen ("-bundle") + 1)); + sprintf (new_uri, "file:///usr/share/gnome/help-bundle/%s", path + strlen ("/usr/share/gnome/help/")); + free (reg->uri); + reg->uri = NULL; + path = new_uri + strlen ("file://"); + + if (access (path, R_OK) == 0) { + reg->uri = new_uri; + } else { + free (new_uri); + } + } + } + } + + if (!reg->uri) { + rrn_reg_free (reg); + return NULL; + } + if (!reg->identifier) { reg->identifier = (char *) malloc (sizeof(char) * 35); sprintf (reg->identifier, "org.scrollkeeper.unknown%d", rand()); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de