summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkfg2020-05-24 23:21:41 +0200
committerkfg2020-05-24 23:29:16 +0200
commite24c2cd4eedc1c1ed2e1a637d4120fba8967a97d (patch)
tree5654ec03702482c7664666d8cb4c8ea0dbd1c0c4
parent37c58d48d974c0d82b44bf6f58c15ed9c4c7b22b (diff)
downloadaur-e24c2cd4eedc1c1ed2e1a637d4120fba8967a97d.tar.gz
Do not run make_hash.exe in package function
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--tools.patch10
3 files changed, 20 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d97fee342d..89ff3cc7505 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
-# Generated by mksrcinfo v8
-# Thu Oct 3 10:57:07 UTC 2019
pkgbase = mingw-w64-enca
pkgdesc = Charset analyser and converter (mingw-w64)
pkgver = 1.19
- pkgrel = 3
+ pkgrel = 4
url = https://cihar.com/software/enca/
arch = any
license = GPL
makedepends = mingw-w64-gcc
- makedepends = wine
+ makedepends = mingw-w64-wine
depends = mingw-w64-crt
depends = mingw-w64-recode
options = !strip
@@ -23,7 +21,7 @@ pkgbase = mingw-w64-enca
sha256sums = 3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8
sha256sums = 270c7c0abaea5f3d10173b58849200d4106675d3127a0b9b8ce1fc3dcf775acb
sha256sums = 4092b2cfb4125419d7e93513b8a02a3d7c9dcc7423329d9b704f029f89dda084
- sha256sums = 721918fd8ee4fc426c6cf279e99fc95e21fff86d4ec7125aa2b8bcf931e3aa6b
+ sha256sums = 5c4d992ec9e0723b23ccb75bb06fad619aabd7c0d5981f89e3bd6deffbf3105b
sha256sums = 7e6c95b6b62c02b0ed50df9b1fb0c730ee0bd7108d04cd0f40d55035cb781b40
pkgname = mingw-w64-enca
diff --git a/PKGBUILD b/PKGBUILD
index 80ec460bc96..b792790e143 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=mingw-w64-enca
pkgver=1.19
-pkgrel=3
+pkgrel=4
pkgdesc="Charset analyser and converter (mingw-w64)"
arch=('any')
url="https://cihar.com/software/enca/"
options=('!strip' '!buildflags' 'staticlibs' '!makeflags')
license=('GPL')
depends=('mingw-w64-crt' 'mingw-w64-recode')
-makedepends=('mingw-w64-gcc' 'wine')
+makedepends=('mingw-w64-gcc' 'mingw-w64-wine')
source=("https://dl.cihar.com/enca/enca-${pkgver}.tar.xz"
'enca-bad-file-descriptor.patch'
'configure.patch'
@@ -19,7 +19,7 @@ source=("https://dl.cihar.com/enca/enca-${pkgver}.tar.xz"
sha256sums=('3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8'
'270c7c0abaea5f3d10173b58849200d4106675d3127a0b9b8ce1fc3dcf775acb'
'4092b2cfb4125419d7e93513b8a02a3d7c9dcc7423329d9b704f029f89dda084'
- '721918fd8ee4fc426c6cf279e99fc95e21fff86d4ec7125aa2b8bcf931e3aa6b'
+ '5c4d992ec9e0723b23ccb75bb06fad619aabd7c0d5981f89e3bd6deffbf3105b'
'7e6c95b6b62c02b0ed50df9b1fb0c730ee0bd7108d04cd0f40d55035cb781b40')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -41,11 +41,20 @@ build() {
mkdir -p ${srcdir}/build-${_arch} && cd ${srcdir}/build-${_arch}
${srcdir}/enca-${pkgver}/configure --host=${_arch} \
+ --target=${_arch} \
--prefix=/usr/${_arch} \
--libexecdir=/usr/${_arch}/lib \
--mandir=/usr/${_arch}/share/man \
--with-librecode=/usr/${_arch} \
--enable-external
+
+ # Do not run all/all-am in install/install-am of the tools/Makefile
+ # since there is nothing to install and running make_hash.exe causes
+ # the package function to fail with:
+ # "wine: for some mysterious reason, the wine server failed to run."
+ sed -i -e "/^install:.*$/ {N; s/^install: \$(BUILT_SOURCES)\n\t\$(MAKE) \$(AM_MAKEFLAGS) install-am/install:\n\t@echo \"install unnecessary\"/g}" "${srcdir}/build-${_arch}/tools/Makefile"
+ sed -i -e "/^install-am:.*$/ {N; s/^install-am: all-am\n\t@\$(MAKE) \$(AM_MAKEFLAGS) install-exec-am install-data-am/install-am:\n\t@echo \"install unnecessary\"/g}" "${srcdir}/build-${_arch}/tools/Makefile"
+
make
done
}
diff --git a/tools.patch b/tools.patch
index 04ba596d3d4..89b17ec6b78 100644
--- a/tools.patch
+++ b/tools.patch
@@ -1,13 +1,13 @@
---- enca-1.14/tools/Makefile.am 2009-08-25 10:33:34.000000000 +0200
-+++ patched/tools/Makefile.am 2014-01-01 15:50:09.180753219 +0100
-@@ -31,7 +31,12 @@
+diff -ruN enca-1.19/tools/Makefile.am patched/tools/Makefile.am
+--- enca-1.19/tools/Makefile.am 2016-01-04 19:12:05.000000000 +0100
++++ patched/tools/Makefile.am 2020-05-23 19:25:02.733333268 +0200
+@@ -30,7 +30,11 @@
sed -e 's/^#define \([A-Z0-9_]*\) \(.*\)/@\1@ \2/' -e 's/"//g' -e 's/NULL$$//' -e 's/ /\//' -e 's/^\(.*\)$$/s\/\1\//' $(top_builddir)/iconvenc.h >encodings.sed
encodings.h: encodings.sed $(srcdir)/encodings.dat make_hash
- sed -f encodings.sed $(srcdir)/encodings.dat | ./make_hash >encodings.h
+ @if test "$(EXEEXT)" == ".exe"; then \
-+ mv make_hash make_hash.exe; \
-+ sed -f encodings.sed $(srcdir)/encodings.dat | wine make_hash.exe >encodings.h; \
++ sed -f encodings.sed $(srcdir)/encodings.dat | $(target_alias)-wine ./make_hash.exe >encodings.h; \
+ else \
+ sed -f encodings.sed $(srcdir)/encodings.dat | ./make_hash >encodings.h; \
+ fi