Skip to contentSkip to conversation

package/xvkbd: bump to version 4.0

PATCH New Fabrice Fontaine 1 participant 1 message Oct 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/xvkbd: bump to version 4.0

- Update hash of README: lots of updates (year, changelog, ...)
- Drop patch and switch to autotools infrastructure to use the new configure script added in this release
- Add patch to fix install

---
 ...01-Makefile-am-fix-install-data-hook.patch |   27 +
 package/xvkbd/0001-makefile.patch             | 2400 -----------------
 package/xvkbd/xvkbd.hash                      |    4 +-
 package/xvkbd/xvkbd.mk                        |   17 +-
 4 files changed, 33 insertions(+), 2415 deletions(-)
 create mode 100644 package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch
 delete mode 100644 package/xvkbd/0001-makefile.patch
package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch new file +27 -0
new file mode 100644
index 0000000000..b275760de1
@@ -0,0 +1,27 @@
+Makefile.am: fix install-data-hook
+
+- Prefix $(appdefaultdir) and $(datarootdir) with $(DESTDIR) to allow
+  cross-compilation
+- Create $(DESTDIR)$(appdefaultdir) if it doesn't exist
+
+Upstream status: sent to Tom Sato <[email protected]>
+
+diff -Nuar xvkbd-4.0-orig/Makefile.am xvkbd-4.0/Makefile.am
+--- xvkbd-4.0-orig/Makefile.am	2019-10-06 11:27:13.692243604 +0200
++++ xvkbd-4.0/Makefile.am	2019-10-06 11:35:15.872263440 +0200
+@@ -17,11 +17,12 @@
+ 	[ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
+ 
+ install-data-hook:
++	[ -d $(DESTDIR)$(appdefaultdir) ] || mkdir $(DESTDIR)$(appdefaultdir)
+ 	for file in *.ad; do \
+-		$(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \
++		$(INSTALL_DATA) $$file $(DESTDIR)$(appdefaultdir)/$${file%.ad}; \
+ 	done
+-	[ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/
+-	$(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english
++	[ -d $(DESTDIR)$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)$(datarootdir)/xvkbd/
++	$(INSTALL_DATA) words.english $(DESTDIR)$(datarootdir)/xvkbd/words.english
+ 
+ EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english
+ 
package/xvkbd/0001-makefile.patch deleted +0 -2400

2,400 lines not on this page · raw message

package/xvkbd/xvkbd.hash +2 -2
index 402d3179ab..dd6ed79b93 100644
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256	b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d	xvkbd-3.9.tar.gz
+sha256	eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82	xvkbd-4.0.tar.gz
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
-sha256	7f72a6f6e9a183efe65fb22c77f41bf076582f8a375881129461f50652af61e4	README
+sha256	af0d9b39a91d2779e9758d8dacc24d466bea124c1d401687bddc48543516cd68	README
package/xvkbd/xvkbd.mk +4 -13
index 4c2befe962..1d056c1c4c 100644
@@ -4,21 +4,12 @@
 #
 ################################################################################
 
-XVKBD_VERSION = 3.9
+XVKBD_VERSION = 4.0
 XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd
 XVKBD_LICENSE = GPL-2.0+
 XVKBD_LICENSE_FILES = COPYING README
-
-# Passing USRLIBDIR ensures that the stupid Makefile doesn't add
-# /usr/lib to the library search path.
-define XVKBD_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
-		USRLIBDIR="$(STAGING_DIR)/usr/lib"
-endef
-
-define XVKBD_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
-endef
+# We're patching Makefile.am
+XVKBD_AUTORECONF = YES
 
 XVKBD_DEPENDENCIES = \
 	xlib_libICE \
@@ -31,4 +22,4 @@ XVKBD_DEPENDENCIES = \
 	xlib_libXt \
 	xlib_libXtst
 
-$(eval $(generic-package))
+$(eval $(autotools-package))
Signature · 1 line
2.23.0