Author: bdubbs Date: 2005-03-22 09:20:29 -0700 (Tue, 22 Mar 2005) New Revision: 887
Added: trunk/GConf/ trunk/GConf/GConf-1.0.9-db43-2.patch trunk/Guppi/Guppi-0.40.3-legend_fix-1.patch trunk/pilot-link/ trunk/pilot-link/pilot-link-0.11.8-bindings_fix-1.patch trunk/slib/ trunk/slib/slib-3a1-automate_install-1.patch Log: Third set of BLFS patches Added: trunk/GConf/GConf-1.0.9-db43-2.patch =================================================================== --- trunk/GConf/GConf-1.0.9-db43-2.patch 2005-03-22 16:12:39 UTC (rev 886) +++ trunk/GConf/GConf-1.0.9-db43-2.patch 2005-03-22 16:20:29 UTC (rev 887) @@ -0,0 +1,84 @@ +Submitted By: Igor Zivkovic <[EMAIL PROTECTED]> +Date: 2005-01-10 +Initial Package Version: 1.0.9 +Upstream Status: Not submitted. +Origin: http://www.sleepycat.com/docs/ref/upgrade.4.0/lock.html + http://www.sleepycat.com/docs/ref/upgrade.4.1/fop.html +Description: Adds support for Berkeley DB-4.3.x. + +$LastChangedBy: igor $ +$Date: 2005-01-20 13:14:59 -0600 (Thu, 20 Jan 2005) $ + +--- GConf-1.0.9/configure.orig 2005-01-10 16:11:34.673838384 +0000 ++++ GConf-1.0.9/configure 2005-01-10 16:11:48.740699896 +0000 +@@ -7945,7 +7945,7 @@ + BDB_LIBS= + BDB_CFLAGS= + +-for dblib in db-3.3 db-3.2 db-3.1 db-3; do ++for dblib in db db-3.3 db-3.2 db-3.1 db-3; do + as_ac_Lib=`echo "ac_cv_lib_$dblib''_db_env_create" | $as_tr_sh` + echo "$as_me:7950: checking for db_env_create in -l$dblib" >&5 + echo $ECHO_N "checking for db_env_create in -l$dblib... $ECHO_C" >&6 +@@ -8010,7 +8010,7 @@ + echo "$as_me: WARNING: No db3 library found. Not building bdb backend." >&2;} + else + +-for ac_header in db3/db.h ++for ac_header in db.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:8016: checking for $ac_header" >&5 +--- GConf-1.0.9/backends/bdb.h.orig 2005-01-10 16:13:16.876301248 +0000 ++++ GConf-1.0.9/backends/bdb.h 2005-01-10 16:13:35.797424800 +0000 +@@ -116,11 +116,7 @@ + + #ifndef BDB_H + +-#ifdef HAVE_DB3_DB_H +-#include <db3/db.h> +-#else + #include <db.h> +-#endif + #include <glib.h> + #include <gconf/gconf.h> + +--- GConf-1.0.9/backends/bdb.c.orig 2001-10-17 03:43:01.000000000 +0000 ++++ GConf-1.0.9/backends/bdb.c 2005-01-10 21:24:49.676852808 +0000 +@@ -154,7 +154,7 @@ + dbname); + #endif + } +- if ((ret = dbp->open (dbp, dbname, NULL, DB_BTREE, flags, 0664)) != 0) ++ if ((ret = dbp->open (dbp, NULL, dbname, NULL, DB_BTREE, flags, 0664)) != 0) + { + dbp->err (dbp, ret, "%s: open", dbname); + goto err1; +@@ -433,7 +433,7 @@ + + if (!inited) + { +- lock_id (bdb_db_env, &id); ++ bdb_db_env->lock_id(bdb_db_env, &id); + inited = 1; + } + return id; +@@ -455,8 +455,7 @@ + init_dbt_int (&kdir_id, &dir_id); + + #if LOCKING +- if (lock_get +- (bdb_db_env, get_lock_id (), 0, &dir, DB_LOCK_WRITE, &lock) != 0) ++ if (bdb_db_env->lock_get(bdb_db_env, get_lock_id(), 0, &dir, DB_LOCK_WRITE, &lock) != 0) + { + /* TODO: error failed to lock id row of DB_DIR table */ + #ifdef GCONF_ERROR_VERBOSE +@@ -541,7 +540,7 @@ + ret = dir_id; + unlock_and_return: + #ifdef LOCKING +- if (lock_put (bdb_db_env, &lock) != 0) ++ if (bdb_db_env->lock_put(bdb_db_env, &lock) != 0) + { + #ifdef GCONF_ERROR_VERBOSE + fprintf (stderr, "%s: CRITICAL failed to unlock BDB dir database\n", Added: trunk/Guppi/Guppi-0.40.3-legend_fix-1.patch =================================================================== --- trunk/Guppi/Guppi-0.40.3-legend_fix-1.patch 2005-03-22 16:12:39 UTC (rev 886) +++ trunk/Guppi/Guppi-0.40.3-legend_fix-1.patch 2005-03-22 16:20:29 UTC (rev 887) @@ -0,0 +1,99 @@ +Submitted By: BLFS Book <[email protected]> +Date: 2005-01-03 +Initial Package Version: 0.40.3 +Upstream Status: Not submitted - package is no longer maintained +Origin: GnuCash-1.8.10 sources +Description: Fixes a problem with reversed legends in stacked + barcharts + +$LastChangedBy: randy $ +$Date: 2005-01-03 17:29:38 -0600 (Mon, 03 Jan 2005) $ + +--- Guppi-0.40.3/libguppitank/guppi-object-barchart.c 2003-05-30 21:21:16.000000000 +0200 ++++ Guppi-0.40.4/libguppitank/guppi-object-barchart.c 2003-05-30 21:21:26.000000000 +0200 +@@ -410,6 +410,7 @@ + GuppiElementState *left_axis_state = NULL; + GuppiElementState *frame_state = NULL; + GuppiColorPalette *color_palette = NULL; ++ GuppiColorPalette *color_palette_legend = NULL; + GuppiDataTable *data_table; + GnomeFont *font; + +@@ -446,11 +447,13 @@ + /* FIXME: check for construction of legends. */ + + if (obar->legend_view && obar->col_labels) { +- add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, FALSE); ++ add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, ++ obar->legend_reversed); + } + + if (obar->col_colors) { + color_palette = build_bar_colors (obar, FALSE); ++ color_palette_legend = build_bar_colors (obar, obar->legend_reversed); + } + + guppi_element_state_set (barchart_state, +@@ -497,7 +500,7 @@ + + guppi_element_state_set (legend_state, + "labels", data_table, +- "swatch_colors", color_palette, ++ "swatch_colors", color_palette_legend, + "label_font", font, + NULL); + } +@@ -505,6 +508,8 @@ + + /* clean up */ + ++ guppi_unref (color_palette); ++ guppi_unref (color_palette_legend); + guppi_unref (barchart_state); + guppi_unref (legend_state); + guppi_unref (bottom_axis_state); +@@ -525,6 +530,7 @@ + + GuppiDataTable *data_table; + GuppiColorPalette *color_palette = NULL; ++ GuppiColorPalette *color_palette_legend = NULL; + + GuppiElementState *barchart_state; + GuppiElementState *legend_state = NULL; +@@ -560,7 +566,8 @@ + } + + if (obar->col_labels) { +- add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, FALSE); ++ add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, ++ obar->legend_reversed); + } + + +@@ -568,6 +575,7 @@ + + if (obar->col_colors) { + color_palette = build_bar_colors (obar, FALSE); ++ color_palette_legend = build_bar_colors (obar, obar->legend_reversed); + } + + barchart_state = guppi_element_state_new ("barchart", +@@ -620,7 +628,8 @@ + + legend_state = guppi_element_state_new ("legend", + "labels", data_table, +- "swatch_colors", color_palette, ++ "swatch_colors", ++ color_palette_legend, + "label_font", font, + NULL); + +@@ -669,6 +678,8 @@ + /* Clean up after ourselves... */ + + guppi_unref (data_table); ++ guppi_unref (color_palette); ++ guppi_unref (color_palette_legend); + + guppi_unref (barchart_state); + guppi_unref (bottom_axis_state); Added: trunk/pilot-link/pilot-link-0.11.8-bindings_fix-1.patch =================================================================== --- trunk/pilot-link/pilot-link-0.11.8-bindings_fix-1.patch 2005-03-22 16:12:39 UTC (rev 886) +++ trunk/pilot-link/pilot-link-0.11.8-bindings_fix-1.patch 2005-03-22 16:20:29 UTC (rev 887) @@ -0,0 +1,35 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2004-11-24 +Initial Package Version: 0.11.8 +Upstream Status: Not submitted +Origin: Randy McMurchy +Description: Fixes the Perl and Python bindings installation + +$LastChangedBy: randy $ +$Date: 2004-11-24 16:48:39 -0600 (Wed, 24 Nov 2004) $ + +diff -Naur pilot-link-0.11.8-orig/bindings/Makefile.in pilot-link-0.11.8/bindings/Makefile.in +--- pilot-link-0.11.8-orig/bindings/Makefile.in 2003-07-01 19:09:05.000000000 +0000 ++++ pilot-link-0.11.8/bindings/Makefile.in 2004-11-24 20:58:11.834533112 +0000 +@@ -344,7 +344,11 @@ + cd $(srcdir)/Python && $(PYTHON) setup.py build + + python-install: python-build +- cd $(srcdir)/Python && $(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) ++ if test -z $(DESTDIR); then \ ++ cd $(srcdir)/Python && $(PYTHON) setup.py install --prefix=$(prefix); \ ++ else \ ++ cd $(srcdir)/Python && $(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR); \ ++ fi + + python-clean: Python/setup.py + -cd $(srcdir)/Python && $(PYTHON) setup.py clean +@@ -355,7 +359,7 @@ + # + + Perl/Makefile: Perl/Makefile.PL +- cd Perl && $(PERL) Makefile.PL INSTALLDIRS=vendor ++ cd Perl && $(PERL) Makefile.PL + + perl-build: Perl/Makefile + cd Perl && $(MAKE) PREFIX=$(DESTDIR)$(prefix) Added: trunk/slib/slib-3a1-automate_install-1.patch =================================================================== --- trunk/slib/slib-3a1-automate_install-1.patch 2005-03-22 16:12:39 UTC (rev 886) +++ trunk/slib/slib-3a1-automate_install-1.patch 2005-03-22 16:20:29 UTC (rev 887) @@ -0,0 +1,59 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2004-09-08 +Initial Package Version: 3a1 +Upstream Status: Not submitted +Origin: Randy McMurchy +Description: Adds installation commands to the Makefile to install + the package + +$LastChangedBy: randy $ +$Date: 2004-09-08 18:19:08 -0500 (Wed, 08 Sep 2004) $ + +--- slib-orig/Makefile 2003-12-01 04:44:11.000000000 +0000 ++++ slib/Makefile 2004-09-08 19:35:21.380844048 +0000 +@@ -26,6 +26,7 @@ + bindir = $(exec_prefix)bin/ + libdir = $(exec_prefix)lib/ + infodir = $(prefix)info/ ++guiledir = $(prefix)share/guile/ + + PREVDOCS = prevdocs/ + +@@ -80,17 +81,23 @@ + install: + test -d $(bindir) || mkdir $(bindir) + echo '#! /bin/sh' > $(bindir)slib +- echo export SCHEME_LIBRARY_PATH=$(libdir)slib/ >> $(bindir)slib ++ echo export SCHEME_LIBRARY_PATH=$(guiledir)slib/ >> $(bindir)slib + echo VERSION=$(VERSION) >> $(bindir)slib + cat slib.sh >> $(bindir)slib + chmod +x $(bindir)slib ++ install -d -m755 -oroot -groot $(guiledir)slib ++ install -m644 -oroot -groot ANNOUNCE COPYING ChangeLog FAQ Makefile README \ ++ grapheps.ps slib.spec srcdir.mk *.xyz *.txt *.texi *.info *.txi *.init *.scm \ ++ $(guiledir)slib ++ install -m755 -oroot -groot *.sh $(guiledir)slib ++ + + #### Stuff for maintaining SLIB below #### + + ver = $(VERSION) + version.txi: Makefile + echo @set SLIBVERSION $(ver) > version.txi +- echo @set SLIBDATE `date +"%B %Y"` >> version.txi ++ echo @set SLIBDATE November 2003 >> version.txi + + scheme = scm + +@@ -206,8 +213,10 @@ + installinfo: $(infodir)slib.info + $(infodir)slib.info: slib.info + cp -a slib.info $(infodir)slib.info ++ chown root:root $(infodir)slib.info + -install-info $(infodir)slib.info $(infodir)dir +- -rm $(infodir)slib.info.gz ++ if [ -f $(infodir)slib.info.gz ]; \ ++ then rm $(infodir)slib.info.gz; fi + infoz: installinfoz + installinfoz: $(infodir)slib.info.gz + $(infodir)slib.info.gz: $(infodir)slib.info -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
