Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8237
Added Files:
Tag: pangocairo-branch
librarian.0-shlibs.patch
Log Message:
oops
--- NEW FILE: librarian.0-shlibs.patch ---
diff -Nurd -x'*~' rarian-0.6.0.orig/librarian/rarian-info.c
rarian-0.6.0/librarian/rarian-info.c
--- rarian-0.6.0.orig/librarian/rarian-info.c 2007-09-11 15:23:30.000000000
-0400
+++ rarian-0.6.0/librarian/rarian-info.c 2008-01-12 15:08:54.000000000
-0500
@@ -614,13 +614,13 @@
if (!section || (*section && l->reg->section && !strcmp
(l->reg->section, section))) {
return l->reg;
} else {
- best_result = l->reg;
+ best_result = l;
}
}
l = l->next;
}
- return best_result;
+ return best_result->reg;
}
diff -Nurd -x'*~' rarian-0.6.0.orig/librarian/rarian-reg-full.c
rarian-0.6.0/librarian/rarian-reg-full.c
--- rarian-0.6.0.orig/librarian/rarian-reg-full.c 2007-09-11
15:36:55.000000000 -0400
+++ rarian-0.6.0/librarian/rarian-reg-full.c 2008-01-12 15:08:54.000000000
-0500
@@ -59,6 +59,8 @@
reg->heritage = NULL;
reg->lang = NULL;
reg->children = NULL;
+
+ return (reg);
}
RrnRegFull *
diff -Nurd -x'*~' rarian-0.6.0.orig/librarian/rarian-reg-utils.c
rarian-0.6.0/librarian/rarian-reg-utils.c
--- rarian-0.6.0.orig/librarian/rarian-reg-utils.c 2007-09-11
15:31:05.000000000 -0400
+++ rarian-0.6.0/librarian/rarian-reg-utils.c 2008-01-12 15:08:54.000000000
-0500
@@ -36,7 +36,7 @@
static void process_sect_pair (RrnSect *sect, char *key, char *value);
static int rrn_reg_add_sect (RrnReg *reg, RrnSect *sect);
static void process_path (RrnReg *reg);
-static char * process_section_path (char *owner_path, RrnSect *section);
+static void process_section_path (char *owner_path, RrnSect *section);
RrnReg *
@@ -58,6 +58,8 @@
reg->lang = NULL;
reg->ghelp_name = NULL;
reg->children = NULL;
+
+ return (reg);
}
RrnReg *
@@ -748,7 +750,7 @@
}
-static char *
+static void
process_section_path (char *owner_path, RrnSect *section)
{
char *tmp = NULL;
diff -Nurd -x'*~' rarian-0.6.0.orig/util/rarian-sk-update.in
rarian-0.6.0/util/rarian-sk-update.in
--- rarian-0.6.0.orig/util/rarian-sk-update.in 2007-09-01 13:22:35.000000000
-0400
+++ rarian-0.6.0/util/rarian-sk-update.in 2008-01-12 15:08:36.000000000
-0500
@@ -258,10 +258,7 @@
# They are inherited from scrollkeeper :(
# We use TEMP as set -- seems to nuke the return value of getopt
-TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
- --longoptions="clean-index,omf-dir:,resulting-dir:,help,version" -- "$@"` \
- || print_usage
-
+TEMP=`getopt "o:r:p:cvqnhV" "$@"`
if [ $? != 0 ] ; then
print_usage
exit 0
@@ -271,12 +268,12 @@
while true; do
case "$1" in
- -o | --omf-dir )
+ -o )
convert_dir=$2
update_output_dir=1
shift 2
;;
- -r | --result-dir )
+ -r )
output_dir=$2
overload_update=1
shift 2
@@ -288,7 +285,7 @@
-q )
shift
;;
- --clean-index )
+ -c )
clean_index=1
shift
;;
@@ -299,9 +296,9 @@
# Scrollkeeper compat. Actually do nothing
shift
;;
- -p )
- statedir=$2
- shift 2
+ -p )
+ statedir=$2
+ shift 2
;;
-V | --version )
print_version
@@ -416,4 +413,4 @@
fi
rm -rf $tmpdir
-fi # ENABLE_OMF_READ
\ No newline at end of file
+fi # ENABLE_OMF_READ
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
