Update recommended gnulib commit

[pspp] / README.Git

diff --git a/README.Git b/README.Git
index 70a29ecd525fcd3a9a9e28d11ea9ed55985b6341..809bfe87116ce75f2cdc21a6656834984145d7fd 100644 (file)
--- a/README.Git
+++ b/README.Git
@@ -21,7 +21,9 @@ following:
 
        * libtool 1.5.22 (or later).
 
 
        * libtool 1.5.22 (or later).
 

-       * Texinfo 4.7 or later, to build the documentation.
+       * Texinfo 5.2 or later, to build the documentation.
+
+       * Gimp --  2.8.2 is known to work

 
 After you install PSPP's prerequisites, you must obtain a copy of
 Gnulib, then bootstrap the tree, as described in the sections below.
 
 After you install PSPP's prerequisites, you must obtain a copy of
 Gnulib, then bootstrap the tree, as described in the sections below.


@@ -35,13 +37,14 @@ Gnulib does not maintain a stable API or ABI, so it is possible that
 PSPP will not work with older or newer versions of Gnulib.
 
 
 PSPP will not work with older or newer versions of Gnulib.
 
 

-  commit 52a32bbd66601d12627e104cd82d9b9094d942c3
+  commit 1e972a8a37c153ddc15e604592f84f939eb3c2ad

   Author: Bruno Haible <bruno@clisp.org>
   Author: Bruno Haible <bruno@clisp.org>

-  Date:   Fri Sep 24 14:36:26 2010 +0200
+  Date:   Sat Jun 6 10:14:24 2020 +0200
+
+    calloc-gnu tests: Avoid a test failure with clang.

 
 

-      unistr/u8-strchr: Fix a test failure on i586 glibc systems.
-    
-      * tests/unistr/test-strchr.h (test_strchr): Disable an invalid check.
+    * tests/test-calloc-gnu.c (main): Mark the pointer variable as
+    'volatile', to defeat compiler optimizations.

 
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 
 
 To clone Gnulib into a directory named "gnulib" using Git, and then


@@ -78,3 +81,58 @@ Once PSPP is built, you may run its self-tests with:
        make check
 or for a more thorough test:
        make distcheck
        make check
 or for a more thorough test:
        make distcheck

+
+Glade UI Design
+---------------
+
+The ui files in src/ui/gui may be viewed (maybe changed) with Glade. For this
+you need
+
+       * libgladeui 2.0 or later
+
+Then you need to run
+
+        configure --with-gui-tools
+       make
+       make install
+
+psppire uses some self defined widgets. To use glade these widgets have
+to be announced to glade such that you can view the interface.
+The install process will install the psppire glade library, icons and
+psppire.xml files in the appropriate system locations. You cannot override
+this with --prefix. After that you can run "glade" and open the ui files.
+
+Building from git on Mac OS
+---------------------------
+
+You can build on MacOS in the macports environment. After installing all
+required packages to resolve library dependencies and autotools e.t.c, you
+run make -f Smake as described above.
+
+The macports system provides the libraries and header files in a separate
+location from the MacOS system libraries. The typical locations are
+
+Libraries: /opt/local/lib
+Headers:   /opt/local/include
+
+pspp under macports will be linked against the macports libraries. The configure
+script has to be informed about the library and header locations. Assume the following
+directory structure for an out of tree build:
+
+~/mypspp
+  |----pspp    (This is the pspp git directory)
+  |----install (The install location containing also ui files for psppire)
+  |----build   (The build directory)
+  |----gnulib  (The gnulib directory as described above)
+
+Then you can build with the following commands:
+
+    cd ~/mypspp/pspp
+    make -f Smake
+    cd ../build
+    ../pspp/configure --prefix=/Users/USER/mypspp/install \
+                  LDFLAGS=-L/opt/local/lib \
+                 CPPFLAGS=-I/opt/local/include
+    make
+    make install
+    ../install/bin/psppire (If everything worked, you should see psppire...)