Replace lesstiff with motif

diff --git a/config/packages-list b/config/packages-list
index a95d9d7..09be9d0 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -207,7 +207,6 @@ LAME="lame-3.99.5"
 LCMS="lcms-1.19"
 LCMS2="lcms2-2.6"
 LESS="less-444"
-LESSTIF="lesstif-0.95.2"
 LFS_BOOTSCRIPTS="lfs-bootscripts-20070813"
 LIBA52="a52dec-0.7.4"
 LIBART="libart_lgpl-2.3.21"
@@ -285,8 +284,8 @@ MIDORI="midori-0.5.9"
 MILTER_GREYLIST="milter-greylist-4.0"
 MILTER_SPF="smf-spf-2.0.2"
 MOC="moc-2.4.4"
-
 MMM_MODE="mmm-mode-purcell-2012-09-21"
+MOTIF="motif-2.3.4"
 MPC="mpc-1.0.2"
 MPFR="mpfr-3.1.2"
 MSMTP="msmtp-1.4.29"

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 5829337..22a0af6 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -45,8 +45,8 @@ ipkg ${XCB_PROTO} ${XORG_CONFIG}
 ipkg ${LIBXCB} ${XORG_CONFIG}
 install_xorg_modules lib
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
-ipkg -m acnb ${LESSTIF}
 ipkg_xorg ${XBITMAPS}
+ipkg -m acnb -j ${MOTIF}
 ipkg ${LIBDRM} "\
     --enable-udev \
     --enable-nouveau-experimental-api"

diff --git a/stage4/packages-update b/stage4/packages-update
index c6aec96..e1af18b 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -33,7 +33,7 @@ done
 fpkg -m xorg -s util ${XORG_UTIL_MACROS}
 fpkg -m xorg -s lib ${LIBXAU}
 fpkg -m xorg -s lib ${LIBXDMCP}
-fpkg -m sf ${LESSTIF}
+fpkg -m sf -e "tgz" -f "${MOTIF}-src" ${MOTIF}
 fpkg -m xorg -s data ${XBITMAPS}
 
 fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}

diff --git a/stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch b/stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch
deleted file mode 100644 (file)
index 6576ea9..0000000
--- a/stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2007-07-15
-Initial Package Version: 0.94.4
-Upstream Status:         Not submitted (LFS specific)
-Origin:                  Randy McMurchy
-Description:             Add minor changes to the testsuite so that something
-                         meaningful can be made by running the tests
-
-$Id: lesstif-0.95.0-testsuite_fix-1.patch 1848 2007-07-15 20:16:40Z randy $
-
-diff -Naur lesstif-0.94.4-orig/test/testall.in lesstif-0.94.4/test/testall.in
---- lesstif-0.94.4-orig/test/testall.in        2001-11-21 12:55:04.000000000 +0000
-+++ lesstif-0.94.4/test/testall.in     2005-04-16 22:43:17.000000000 +0000
-@@ -127,7 +127,7 @@
-             if [ $status -ne 0 ]
-             then
-                echo "failed $status"
--               echo "status" >>failed
-+               echo "$dir/$file $status" >>../failed
-                FAILED=`expr $FAILED + 1`
-             else
-                echo "okay"
-@@ -156,7 +156,7 @@
-    echo ""
-    diff failed failed.known
- else
--   echo "No change in the tests"
-+   echo "All failed tests were expected"
- fi
- 
- # Exiting. Return number of broken tests (?!)
-
-diff -Naur lesstif-0.94.4-orig/test/Xm/fonts/test3.c lesstif-0.94.4/test/Xm/fonts/test3.c
---- lesstif-0.94.4-orig/test/Xm/fonts/test3.c  2003-08-24 12:55:45.000000000 +0000
-+++ lesstif-0.94.4/test/Xm/fonts/test3.c       2005-04-17 02:27:15.000000000 +0000
-@@ -33,7 +33,7 @@
- 
-       XtRealizeWidget(toplevel);
- 
--      for (i=0; i<100; i++) {
-+      for (i=0; i<50; i++) {
-               fontlist = _XmGetDefaultFontList(label, XmBUTTON_FONTLIST);
-               XmFontListFree(fontlist);
-               sleep(1);
-
-diff -Naur lesstif-0.94.4-orig/test/Xm/pushbutton/test18.c lesstif-0.94.4/test/Xm/pushbutton/test18.c
---- lesstif-0.94.4-orig/test/Xm/pushbutton/test18.c    2004-10-03 13:26:50.000000000 +0000
-+++ lesstif-0.94.4/test/Xm/pushbutton/test18.c 2005-04-17 02:27:58.000000000 +0000
-@@ -72,6 +72,6 @@
-     /* End */
-     fprintf(stderr, "Finishing up\n");
- 
--    sleep(300);
-+    sleep(10);
-     exit(0);
- }
-
-diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test2.c lesstif-0.95.0/test/Xm-2.1/print/test2.c
---- lesstif-0.95.0-orig/test/Xm-2.1/print/test2.c      2001-03-09 16:20:34.000000000 +0000
-+++ lesstif-0.95.0/test/Xm-2.1/print/test2.c   2007-07-15 17:19:11.000000000 +0000
-@@ -180,8 +180,9 @@
-       /* Get data to calculate number of pages to print */
-       XtVaGetValues(tw,
-                       XmNrows,                &nrows,
--                      XmNtotalLines,          &nlines,
-               NULL);
-+                      /* XmNtotalLines,               &nlines,*/
-+      nlines = _XmTextGetTotalLines(tw);
- 
-       /* Calculate number of pages to print */
-       npages = nlines / nrows + 1;
-
-diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test4.c lesstif-0.95.0/test/Xm-2.1/print/test4.c
---- lesstif-0.95.0-orig/test/Xm-2.1/print/test4.c      2001-03-09 16:20:34.000000000 +0000
-+++ lesstif-0.95.0/test/Xm-2.1/print/test4.c   2007-07-15 17:20:26.000000000 +0000
-@@ -170,8 +170,9 @@
-       /* Get data to calculate number of pages to print */
-       XtVaGetValues(tw,
-                       XmNrows,                &nrows,
--                      XmNtotalLines,          &nlines,
-               NULL);
-+                        /* XmNtotalLines,               &nlines,*/
-+        nlines = _XmTextGetTotalLines(tw);
- 
-       /* Calculate number of pages to print */
-       npages = nlines / nrows + 1;
-
-diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test5.c lesstif-0.95.0/test/Xm-2.1/print/test5.c
---- lesstif-0.95.0-orig/test/Xm-2.1/print/test5.c      2001-01-19 19:17:45.000000000 +0000
-+++ lesstif-0.95.0/test/Xm-2.1/print/test5.c   2007-07-15 17:20:46.000000000 +0000
-@@ -256,8 +256,9 @@
-       /* Get data to calculate number of pages to print */
-       XtVaGetValues(tw,
-                       XmNrows,                &nrows,
--                      XmNtotalLines,          &nlines,
-               NULL);
-+                        /* XmNtotalLines,               &nlines,*/
-+        nlines = _XmTextGetTotalLines(tw);
- 
-       /* Calculate number of pages to print */
-       npages = nlines / nrows;
-
-diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test7.c lesstif-0.95.0/test/Xm-2.1/print/test7.c
---- lesstif-0.95.0-orig/test/Xm-2.1/print/test7.c      2001-01-19 19:17:45.000000000 +0000
-+++ lesstif-0.95.0/test/Xm-2.1/print/test7.c   2007-07-15 17:21:19.000000000 +0000
-@@ -147,8 +147,9 @@
-       /* Get data to calculate number of pages to print */
-       XtVaGetValues(tw,
-                       XmNrows,                &nrows,
--                      XmNtotalLines,          &nlines,
-               NULL);
-+                        /* XmNtotalLines,               &nlines,*/
-+        nlines = _XmTextGetTotalLines(tw);
- 
-       /* Calculate number of pages to print */
-       npages = nlines / nrows + 1;
-
-diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test8.c lesstif-0.95.0/test/Xm-2.1/print/test8.c
---- lesstif-0.95.0-orig/test/Xm-2.1/print/test8.c      2001-01-27 16:36:09.000000000 +0000
-+++ lesstif-0.95.0/test/Xm-2.1/print/test8.c   2007-07-15 17:20:59.000000000 +0000
-@@ -135,8 +135,9 @@
-       /* Get data to calculate number of pages to print */
-       XtVaGetValues(tw,
-                       XmNrows,                &nrows,
--                      XmNtotalLines,          &nlines,
-               NULL);
-+                        /* XmNtotalLines,               &nlines,*/
-+        nlines = _XmTextGetTotalLines(tw);
- 
-       /* Calculate number of pages to print */
-       npages = nlines / nrows + 1;
-
-diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test9.c lesstif-0.95.0/test/Xm-2.1/print/test9.c
---- lesstif-0.95.0-orig/test/Xm-2.1/print/test9.c      2001-01-27 16:36:09.000000000 +0000
-+++ lesstif-0.95.0/test/Xm-2.1/print/test9.c   2007-07-15 17:22:29.000000000 +0000
-@@ -184,8 +184,9 @@
-               /* Get data to calculate number of pages to print */
-               XtVaGetValues(tw,
-                               XmNrows,                &nrows,
--                              XmNtotalLines,          &nlines,
-                       NULL);
-+                        /* XmNtotalLines,               &nlines,*/
-+        nlines = _XmTextGetTotalLines(tw);
- 
-               /* Calculate number of pages to print */
-               npages = nlines / nrows + 1;
---- lesstif-0.95.0-orig/test/Xm/failed.known   1970-01-01 00:00:00.000000000 +0000
-+++ lesstif-0.95.0/test/Xm/failed.known        2007-07-15 17:53:39.000000000 +0000
-@@ -0,0 +1,102 @@
-+
-+bulletinboard/test1 1
-+bulletinboard/test2 1
-+bulletinboard/test4 1
-+cascadebutton/test2 1
-+cascadebutton/test6 131
-+cascadebutton/test7 1
-+cascadebuttong/test3 144
-+cascadebuttong/test4 1
-+cascadebuttong/test7 1
-+command/test3 131
-+drawnbutton/test10 1
-+drawnbutton/test6 144
-+filesb/test1 1
-+filesb/test10 1
-+filesb/test13 71
-+filesb/test2 1
-+filesb/test20 1
-+filesb/test3 1
-+filesb/test4 1
-+filesb/test6 1
-+filesb/test8 1
-+filesb/test9 1
-+form/test4 1
-+form/test50 1
-+form/test53 8
-+form/test56 1
-+form/test58 1
-+form/test6 1
-+frame/test10 1
-+frame/test8 2
-+frame/test9 1
-+label/test1 1
-+label/test10 1
-+label/test3 1
-+label/test4 1
-+labelg/test2 1
-+labelg/test4 144
-+list/test16 1
-+list/test21 3
-+mainw/test12 2
-+mainw/test13 1
-+mainw/test17 1
-+mainw/test9 1
-+menushell/test9 1
-+messagebox/test12 1
-+messagebox/test19 2
-+messagebox/test8 1
-+misc/test8 1
-+panedw/test1 1
-+panedw/test6 1
-+panedw/test7 3
-+panedw/test8 1
-+pushbg/test2 1
-+pushbg/test5 1
-+pushbg/test6 1
-+pushbg/test7 1
-+pushbg/test9 144
-+pushbutton/test13 1
-+pushbutton/test2 1
-+pushbutton/test6 1
-+pushbutton/test7 1
-+reptype/test1 2
-+rowcolumn/test18 1
-+rowcolumn/test50 7
-+rowcolumn/test51 99
-+rowcolumn/test58 1
-+rowcolumn/test60 1
-+rowcolumn/test62 1
-+rowcolumn/test63 2
-+rowcolumn/test65 1
-+scale/test17 144
-+scrolledwindow/test1 1
-+scrolledwindow/test13 1
-+scrolledwindow/test19 1
-+scrolledwindow/test20 1
-+scrolledwindow/test21 1
-+selectionbox/test11 1
-+selectionbox/test13 1
-+selectionbox/test9 169
-+text/test1 1
-+text/test10 1
-+text/test13 1
-+text/test16 55
-+text/test2 1
-+text/test22 1
-+text/test23 1
-+text/test7 1
-+text/test8 1
-+textf/test15 1
-+textf/test17 1
-+textf/test2 1
-+textf/test3 1
-+textf/test7 1
-+togglebg/test2 144
-+togglebutton/test7 144
-+tracking/test1 1
-+traversal/test1 1
-+traversal/test4 1
-+vendor/test5 1
-+xmstring/test10 1
-+xmstring/test8 1

diff --git a/stage4/patches/common/motif-2.3.4-freetype2.patch b/stage4/patches/common/motif-2.3.4-freetype2.patch
new file mode 100644 (file)
index 0000000..c0dc3dd
--- /dev/null
+++ b/stage4/patches/common/motif-2.3.4-freetype2.patch
@@ -0,0 +1,12 @@
+diff -Naur motif-2.3.4.orig/ac_find_xft.m4 motif-2.3.4.new/ac_find_xft.m4
+--- motif-2.3.4.orig/ac_find_xft.m4    2012-10-22 10:50:38.000000000 -0400
++++ motif-2.3.4.new/ac_find_xft.m4     2014-12-25 11:16:21.261334712 -0500
+@@ -75,7 +75,7 @@
+ LIBS="$LIBS $freetype_lib"
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+-AC_CHECK_HEADERS(freetype/freetype.h)
++AC_CHECK_HEADERS(ft2build.h)
+ 
+ FINDXFT_HAVE_FREETYPE="no"
+ case "$ac_cv_header_freetype_freetype_h" in

diff --git a/stage4/pkg/lesstif b/stage4/pkg/lesstif
deleted file mode 100644 (file)
index 2c9db5b..0000000
--- a/stage4/pkg/lesstif
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    CONFIGURE_OPTS+=" \
-        --prefix=/usr \
-        --sysconfdir=/etc/X11 \
-        --disable-debug \
-        --disable-build-tests \
-        --enable-production \
-        --with-xdnd \
-        --x-includes=/usr/include \
-        --x-libraries=/usr/lib"
-}
-
-hvconfig_post()
-{
-    sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" \
-        ${LFS_TMP}/${PACKAGE}/clients/Motif-2.1/mwm/Makefile
-}
-
-hvbuild()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    ${HVMAKE} rootdir=/usr/share/doc/${PACKAGE}
-    ${HVMAKE} rootdir=/usr/share/doc/${PACKAGE} install
-}
-
-hvbuild_post()
-{
-    # Applicatons that utilize Xorg libraries often, and incorrectly, expect to
-    # find configuration files in /usr/lib/X11. While still the root
-    # user, create a compatibility symlink with the following command:
-    ln -v -sf /etc/X11/mwm /usr/lib/X11
-}

diff --git a/stage4/pkg/motif b/stage4/pkg/motif
new file mode 100644 (file)
index 0000000..1d60065
--- /dev/null
+++ b/stage4/pkg/motif
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS="\
+        --prefix=/usr \
+        --sysconfdir=/etc/X11 \
+        --x-includes=/usr/include \
+        --x-libraries=/usr/lib \
+        --disable-motif22-compatibility \
+        --enable-xft \
+        --with-freetype-config=/usr/bin/freetype-config"
+}
+
+hvbuild_post()
+{
+    # Applications that utilize Xorg libraries often, and incorrectly,
+    # expect to find configuration files in /usr/lib/X11.
+    mkdir -p /etc/X11/mwm
+    mv /usr/lib/X11/system.mwmrc /etc/X11/mwm
+    ln -svfT /etc/X11/mwm/system.mwmrc /usr/lib/X11/system.mwmrc
+    rm -rf /etc/X11/mwm/bindings
+    mv /usr/lib/X11/bindings /etc/X11/mwm
+    ln -svfT /etc/X11/mwm/bindings /usr/lib/X11/bindings
+}