diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-23 03:47:53 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-23 03:47:53 +0000 |
| commit | 7d6c9921c76c884ffc6744aaf28a52b978ff9506 (patch) | |
| tree | aeff66f02076dd6b0bf67205da7bcd8810658ed4 | |
| parent | 5ab86fdbc4e00a7133f00b6b89639cf48b62e326 (diff) | |
| download | packages-7d6c9921c76c884ffc6744aaf28a52b978ff9506.tar.gz packages-7d6c9921c76c884ffc6744aaf28a52b978ff9506.tar.bz2 packages-7d6c9921c76c884ffc6744aaf28a52b978ff9506.tar.xz packages-7d6c9921c76c884ffc6744aaf28a52b978ff9506.zip | |
user/free42: fix desktop file, fix build on 32-bit
| -rw-r--r-- | user/free42/APKBUILD | 10 | ||||
| -rw-r--r-- | user/free42/free42.desktop | 2 | ||||
| -rw-r--r-- | user/free42/patch.patch | 17 |
3 files changed, 23 insertions, 6 deletions
diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD index 126880926..ba8814388 100644 --- a/user/free42/APKBUILD +++ b/user/free42/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=free42 pkgver=2.0.22 -pkgrel=0 +pkgrel=1 pkgdesc="Scientific programmable calculator" url="http://thomasokken.com/free42/" arch="all" @@ -11,7 +11,7 @@ license="GPL-2.0-only AND Public-Domain" depends="" makedepends="alsa-lib-dev gtk+2.0-dev libx11-dev libxmu-dev" subpackages="" -source="http://thomasokken.com/free42/upstream/free42-nologo-$pkgver.tgz +source="https://distfiles.adelielinux.org/source/free42-nologo-$pkgver.tgz free42.desktop libx11.patch patch.patch @@ -23,7 +23,7 @@ build() { local SAVE_CFLAGS SAVE_CFLAGS=$CFLAGS unset CFLAGS - ./build-intel-lib.sh + CC="gcc -D_WCHAR_T" ./build-intel-lib.sh CFLAGS=$SAVE_CFLAGS make BCD_MATH=1 AUDIO_ALSA=1 } @@ -36,6 +36,6 @@ package() { } sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz -3d0dee5b574e171692e341c09d2204a048888e5e34cc479ee4f23f4ac137134db7e9d94779765e0426642e3a3069f9b3d962b72ebcea495c1e0b20d32405640b free42.desktop +f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop f8434fd1c20f0dd40de5773615eaf798329870231f7ce66785a1bc8e208fa0a64919f48ac3eea5ab9ceb818570ae93f61b0e81baec4261bbdfbf04237108ab6a libx11.patch -b529bc68cbc84e3e698a16afe4b7a5ad52119125749d75d3392cc9281a3dfae7cba0a9637ac88fc96d6da89564225265b785a33b841708f14d6bf4b8c4be6f5d patch.patch" +7b48609bff5466d81f42ed65405cd09e98fa675c087837b22caebab2b97420a34d1156399c3b18608bcae42896c12aa63a6f87515f5677587dfff6ed135dc760 patch.patch" diff --git a/user/free42/free42.desktop b/user/free42/free42.desktop index 704fbe80c..568afc69b 100644 --- a/user/free42/free42.desktop +++ b/user/free42/free42.desktop @@ -6,4 +6,4 @@ GenericName=Scientific Calculator Comment=HP-42S Calculator Simulator Icon=accessories-calculator Exec=/usr/bin/free42dec -Category=Utility;Calculator;Science;Math; +Categories=Utility;Calculator;Science;Math; diff --git a/user/free42/patch.patch b/user/free42/patch.patch index 03e73a5f3..e84b3f7b8 100644 --- a/user/free42/patch.patch +++ b/user/free42/patch.patch @@ -63,3 +63,20 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) +--- gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 ++++ gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 +@@ -1727,3 +1727,14 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) ++--- LIBRARY/src/bid_functions.h.old 2011-07-12 05:30:53.000000000 +0000 +++++ LIBRARY/src/bid_functions.h 2019-01-23 03:45:35.660000000 +0000 ++@@ -42,7 +42,7 @@ ++ #include <ctype.h>
++
++ // Fix system header issue on Sun solaris and define required type by ourselves
++-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
+++#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(WCHAR_MAX)
++ typedef int wchar_t;
++ #endif
++
|