[Gsrc-commit] trunk r9729: update xforms to master

[Carl Hansen]

------------------------------------------------------------
revno: 9729
revision-id: carlhansen@gnu.org-20231129074652-ehb172ywfhrhjkhe
parent: carlhansen@gnu.org-20231129065437-3b31567shx2kqrza
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Tue 2023-11-28 23:46:52 -0800
message:
  update xforms to master
removed:
  pkg/other/xforms/files/        files-20211122013617-obqlk9a0zfdj2bbk-1
  pkg/other/xforms/files/xforms1.3.16.static.patch 
xforms1.3.16.static.-20211122013617-obqlk9a0zfdj2bbk-2
modified:
  pkg/other/xforms/Makefile      makefile-20180420074016-nivd16bjprux88i8-4

=== modified file 'pkg/other/xforms/Makefile'
--- a/pkg/other/xforms/Makefile 2023-05-23 05:32:42 +0000
+++ b/pkg/other/xforms/Makefile 2023-11-29 07:46:52 +0000
@@ -33,17 +33,22 @@
 #   
https://download.savannah.nongnu.org/releases/xforms/development/1.3/xforms-1.3.16.tar.gz
 #   https://git.savannah.gnu.org/cgit/xforms.git/snapshot/xforms-master.tar.gz
 
-MASTER_SITES =  https://git.savannah.gnu.org/
-MASTER_SUBDIR = cgit/xforms.git/snapshot/
-DISTFILES = $(DISTNAME).tar.gz 
-#SIGFILES  = $(DISTNAME).tar.gz.sig 
-#PATCHFILES = xforms1.3.16.static.patch
-#PATCHOPTS = -p2
+MASTER_SITES =  https://git.savannah.gnu.org
+MASTER_SUBDIR = git
+GIT_PATH = $(MASTER_SITES)/$(MASTER_SUBDIR)/$(GARNAME).git
+
 LICENSE = LGPLv2
 
+GIT_REVISION = master  
+WORKSRC =   $(DOWNLOADDIRGIT)/$(GARNAME)
+#WORKOBJ =  $(WORKDIR)/$(DISTNAME)-build
+WORKOBJ =  $(WORKSRC)
+# not ideal
+
+
 BUILDDEPS = autoconf automake libtool
 LIBDEPS =
-# todo: get git
+USE_AUTORECONF = y
 ######################################################################
 
 include ../../../gar/gar.lib/autotools.mk
@@ -51,7 +56,14 @@
 
 .PHONY: pre-configure
 
+fetch: fetch-git
+
+
+#post-extract:
+#      mkdir -p $(WORKOBJ)
+#      cp -a $(WORKSRC)/*    $(WORKOBJ)
+
 pre-configure: extract
-       cd $(WORKSRC) && ./autogen.sh
+       cd $(WORKOBJ) && ./autogen.sh
        $(MAKECOOKIE)
 

=== removed directory 'pkg/other/xforms/files'
=== removed file 'pkg/other/xforms/files/xforms1.3.16.static.patch'
--- a/pkg/other/xforms/files/xforms1.3.16.static.patch  2021-11-22 01:37:00 
+0000
+++ b/pkg/other/xforms/files/xforms1.3.16.static.patch  1970-01-01 00:00:00 
+0000
@@ -1,24 +0,0 @@
-diff -x config.log -x config.status -ru tmp/xforms-1.3.16/fdesign/sp_spinner.c 
work/xforms-1.3.16/fdesign/sp_spinner.c
---- tmp/xforms-1.3.16/fdesign/sp_spinner.c     2013-12-14 05:26:25.000000000 
-0800
-+++ work/xforms-1.3.16/fdesign/sp_spinner.c    2021-11-21 15:46:30.391955345 
-0800
-@@ -29,7 +29,7 @@
- #include "spec/spinner_spec.h"
- 
- static FD_spinnerattrib * spn_attrib;
--FL_OBJECT *curobj;
-+static FL_OBJECT *curobj;
- 
- 
- /***************************************
-diff -x config.log -x config.status -ru tmp/xforms-1.3.16/fdesign/sp_twheel.c 
work/xforms-1.3.16/fdesign/sp_twheel.c
---- tmp/xforms-1.3.16/fdesign/sp_twheel.c      2014-07-09 15:15:49.000000000 
-0700
-+++ work/xforms-1.3.16/fdesign/sp_twheel.c     2021-11-21 15:46:22.332914633 
-0800
-@@ -37,7 +37,7 @@
- #include "spec/twheel_spec.h"
- 
- static FD_twheelattrib * twheel_attrib;
--FL_OBJECT * curobj;
-+static FL_OBJECT * curobj;
- 
- 
- /***************************************