NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/xvkbd: bump to version 4.0

Browse Source 
- 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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-10-06 15:25:11 +02:00 committed by Thomas Petazzoni
parent 2a8a70da18
commit c23d0d8b7f
4 changed files with 33 additions and 2415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch Normal file
View File

@ -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 <VEF00200@nifty.com>
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

2400
package/xvkbd/0001-makefile.patch
View File

File diff suppressed because it is too large Load Diff

4
package/xvkbd/xvkbd.hash
View File

@ -1,4 +1,4 @@
# Locally calculated # Locally calculated
sha256 b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d xvkbd-3.9.tar.gz sha256 eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82 xvkbd-4.0.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 7f72a6f6e9a183efe65fb22c77f41bf076582f8a375881129461f50652af61e4 README sha256 af0d9b39a91d2779e9758d8dacc24d466bea124c1d401687bddc48543516cd68 README

17
package/xvkbd/xvkbd.mk
View File

@ -4,21 +4,12 @@
# #
################################################################################ ################################################################################
XVKBD_VERSION = 3.9 XVKBD_VERSION = 4.0
XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd
XVKBD_LICENSE = GPL-2.0+ XVKBD_LICENSE = GPL-2.0+
XVKBD_LICENSE_FILES = COPYING README XVKBD_LICENSE_FILES = COPYING README
# We're patching Makefile.am
# Passing USRLIBDIR ensures that the stupid Makefile doesn't add XVKBD_AUTORECONF = YES
# /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
XVKBD_DEPENDENCIES = \ XVKBD_DEPENDENCIES = \
xlib_libICE \ xlib_libICE \
@ -31,4 +22,4 @@ XVKBD_DEPENDENCIES = \
xlib_libXt \ xlib_libXt \
xlib_libXtst xlib_libXtst
$(eval $(generic-package)) $(eval $(autotools-package))