[ITP] xforms 1.2.4

[ITP] xforms 1.2.4

[Ken Brown]

[-- Attachment #1: Type: text/plain, Size: 1858 bytes --]

xforms is in Debian and Fedora:

  https://packages.debian.org/source/jessie/libforms
  https://apps.fedoraproject.org/packages/xforms

My cygport file and patches are attached.

Package files:

http://sanibeltranquility.com/cygwin/x86/release/xforms/xforms-1.2.4-1-src.tar.xz
http://sanibeltranquility.com/cygwin/x86/release/xforms/xforms-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86/release/xforms/xforms-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86/release/xforms/libforms-devel/libforms-devel-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86/release/xforms/libforms-devel/libforms-devel-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86/release/xforms/libforms-doc/libforms-doc-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86/release/xforms/libforms-doc/libforms-doc-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86/release/xforms/libforms2/libforms2-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86/release/xforms/libforms2/libforms2-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/xforms-1.2.4-1-src.tar.xz
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/xforms-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/xforms-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/libforms-devel/libforms-devel-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/libforms-devel/libforms-devel-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/libforms-doc/libforms-doc-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/libforms-doc/libforms-doc-1.2.4-1.tar.xz
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/libforms2/libforms2-1.2.4-1.hint
http://sanibeltranquility.com/cygwin/x86_64/release/xforms/libforms2/libforms2-1.2.4-1.tar.xz

License: LGPL

Ken

[-- Attachment #2: xforms.cygport --]
[-- Type: text/plain, Size: 1695 bytes --]

NAME="xforms"
VERSION=1.2.4
RELEASE=1

SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz"

PATCH_URI="fdesign.patch"
PATCH_URI+=" texi2dvi_needs_pdf.patch"
PATCH_URI+=" html_doc.patch"

HOMEPAGE="http://xforms-toolkit.org/"
SUMMARY="The XForms graphical interface widget library"

DESCRIPTION="This is a GUI toolkit based on the X library for X Window Systems.  It
features a rich set of objects, such as buttons, sliders, and menus
etc.  integrated into an easy and efficient object/event callback
execution model that allows fast and easy construction of
X-applications.  In addition, the library is extensible and new
objects can easily be created and added to the library."

# There's no "x" in the non-source package names, per libforms.spec.
PKG_NAMES="${PN} libforms2 libforms-devel libforms-doc"

xforms_CATEGORY="X11 Libs"
libforms2_CATEGORY="X11 Libs"
libforms_devel_CATEGORY="X11 Devel"
libforms_doc_CATEGORY="X11 Doc"

xforms_CONTENTS=		# source only

libforms2_CONTENTS="
  usr/bin/cyg*-2.dll
  usr/share/doc/xforms/ChangeLog
  usr/share/doc/xforms/COPYING.LIB
  usr/share/doc/xforms/README
"

libforms_devel_CONTENTS="
  usr/bin/fd2ps.exe
  usr/bin/fdesign.exe
  usr/include
  usr/lib
  usr/share/man
"

libforms_doc_CONTENTS="
  usr/share/doc/xforms/html
  usr/share/doc/xforms/xforms.pdf
  usr/share/info
"

CYGCONF_ARGS="--enable-docs TEXI2HTML=yes MAKEINFO=makeinfo"

DEPEND="libXpm-devel libGL-devel libjpeg-devel texinfo-tex ImageMagick"

DIFF_EXCLUDES="*.info*"

# An out-of-tree build fails because generated headers in the build
# directory aren't found.
src_compile() {
    cd ${S}
    cygautoreconf
    lndirs
    cd ${B}
    cygconf
    cygmake
}

[-- Attachment #3: fdesign.patch --]
[-- Type: text/plain, Size: 501 bytes --]

--- origsrc/xforms-1.2.4/fdesign/Makefile.am	2014-06-28 16:34:29.000000000 -0400
+++ src/xforms-1.2.4/fdesign/Makefile.am	2017-06-10 21:29:25.023089200 -0400
@@ -15,7 +15,7 @@ INCLUDES = -I./xpm $(X_CFLAGS)
 
 bin_PROGRAMS = fdesign
 
-fdesign_LDADD = $(top_srcdir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fdesign_LDADD = $(top_builddir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
 
 fdesign_SOURCES = \
 	fd_attribs.c \

[-- Attachment #4: texi2dvi_needs_pdf.patch --]
[-- Type: text/plain, Size: 419 bytes --]

--- origsrc/xforms-1.2.4/doc/Makefile.am	2013-12-19 06:21:15.000000000 -0500
+++ src/xforms-1.2.4/doc/Makefile.am	2017-06-10 21:51:32.881871500 -0400
@@ -92,7 +92,7 @@ uninstall-local:
 	cp -r xforms_images xforms.html
 
 .texi.pdf:
-	if [ $(TEXI2DVI_NEEDS_PDF) = "yes" ]; then \
+	if [ x$(TEXI2DVI_NEEDS_PDF) = "xyes" ]; then \
 		$(MAKE) -C xforms_images create_pdf_files; \
 	fi
 	texi2dvi --pdf --batch xforms.texi

[-- Attachment #5: html_doc.patch --]
[-- Type: text/plain, Size: 1188 bytes --]

--- origsrc/xforms-1.2.4/doc/Makefile.am	2017-06-12 11:39:49.015374200 -0400
+++ src/xforms-1.2.4/doc/Makefile.am	2017-06-12 11:55:16.688690400 -0400
@@ -85,11 +85,10 @@ uninstall-local:
 # Makefile in 'xforms_images' will also copy the required figures into it
 
 .texi.html:
-	$(TEXI2HTML) --init-file xforms.init xforms.texi
-	/bin/mkdir -p xforms.html
-	mv index.html xforms_*.html xforms.html
-	cp -r xforms.css xforms.html
-	cp -r xforms_images xforms.html
+	$(MAKEINFOHTML) --init-file xforms.init --force xforms.texi
+	mv -f xforms xforms.html
+	cp -L xforms.css xforms.html
+	cp -rL xforms_images xforms.html
 
 .texi.pdf:
 	if [ x$(TEXI2DVI_NEEDS_PDF) = "xyes" ]; then \
--- origsrc/xforms-1.2.4/doc/xforms.texi	2014-06-28 16:34:29.000000000 -0400
+++ src/xforms-1.2.4/doc/xforms.texi	2017-06-12 11:40:21.885784900 -0400
@@ -90,8 +90,9 @@
 * Index of Constants::
 @end ifnothtml
 
+@c Avoid producing Index.html, which conflicts with index.html.
 @ifhtml
-* Index::
+* Combined Index::
 @end ifhtml
 @end menu
 
@@ -176,8 +177,8 @@
 @syncodeindex vr fn
 @syncodeindex tp fn
 
-@node Index
-@unnumbered Index
+@node Combined Index
+@unnumbered Combined Index
 
 @printindex fn
 

Re: [ITP] xforms 1.2.4

[Jon Turney]

On 12/06/2017 19:25, Ken Brown wrote:
> xforms is in Debian and Fedora:
> 
>   https://packages.debian.org/source/jessie/libforms
>   https://apps.fedoraproject.org/packages/xforms
> 
> My cygport file and patches are attached.
I get:

>>>> Checking packages for missing or duplicate files
> *** Warning: Packages are missing files:
> -usr/share/doc/xforms/COPYRIGHT

so either include that or PKG_IGNORE it.

Apart from that, looks good.  I added this to your uploads.

Re: [ITP] xforms 1.2.4

[Ken Brown]

On 6/14/2017 9:28 AM, Jon Turney wrote:
> On 12/06/2017 19:25, Ken Brown wrote:
>> xforms is in Debian and Fedora:
>>
>>   https://packages.debian.org/source/jessie/libforms
>>   https://apps.fedoraproject.org/packages/xforms
>>
>> My cygport file and patches are attached.
> I get:
> 
>>>>> Checking packages for missing or duplicate files
>> *** Warning: Packages are missing files:
>> -usr/share/doc/xforms/COPYRIGHT

This is an interesting glitch.  The file is actually called Copyright, 
and I have my system set up to be case sensitive.  But cygport only 
checks for COPYRIGHT (see src_postinst.cygpart:439).  So Copyright never 
made it into the destination directory.  I'll add it manually.

Ken