diff options
| author | Mike Sullivan <mksully22@gmail.com> | 2019-03-18 17:44:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-03-18 20:16:16 +0000 |
| commit | f2d94bccf2aabcf8d185defebddd8663a53929f7 (patch) | |
| tree | 3872a61596240048b4d87d14035ad902118ffe3a | |
| parent | 0d069327e8274116f93dd8bb59866249a6172e25 (diff) | |
| download | aports-f2d94bccf2aabcf8d185defebddd8663a53929f7.tar.bz2 aports-f2d94bccf2aabcf8d185defebddd8663a53929f7.tar.xz | |
community/nx-libs: fix build break by FontEncDirectory return of const char *
| -rw-r--r-- | community/nx-libs/APKBUILD | 4 | ||||
| -rw-r--r-- | community/nx-libs/fix-const-char.patch | 28 |
2 files changed, 31 insertions, 1 deletions
diff --git a/community/nx-libs/APKBUILD b/community/nx-libs/APKBUILD index 98c0c100bc..cd09273420 100644 --- a/community/nx-libs/APKBUILD +++ b/community/nx-libs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=nx-libs pkgver=3.5.0.32 -pkgrel=0 +pkgrel=1 pkgdesc="NoMachine libraries (redistributed by x2go)" url="http://x2go.org" arch="all" @@ -15,6 +15,7 @@ install="" subpackages="$pkgname-dev $pkgname-doc" source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver-full.tar.gz xf86bigfont.patch + fix-const-char.patch fix-musl-headers-x86.patch" builddir="$srcdir"/$pkgname-$pkgver @@ -37,4 +38,5 @@ package() { sha512sums="8b4a042993d45e1aee3e13e8b86f68cd5b2a8b52e9299de6129abd8e3bb89d73cf2b44b03d3c7fabbd8329abc06dc912ac95bbf936b6478b05fc202cc29a090f nx-libs-3.5.0.32-full.tar.gz ee090f4e7f5933cbea6398ac461539cbdc8b7fd62f32934c78298c1e217d2a60e7f796bffdb88d36816bbfa9becd810846f5b988b5191e5a5b9da5def5d730fa xf86bigfont.patch +3eba6a605357c0c40c1144ae296d732426c4c9c7399f7ac3d30a10eba25d7396af28af7244a55ebb27f859ce6a13af1541ec2f665991b71be9158f0cb134a6bf fix-const-char.patch d4a881b66f0258d6d9fb947a526868944e58217d534316dfa3f0837035415467a1e8841bf6c5b821ccedcc0c9e07b425f05243ddbd22aaec7ea2165c87d9211e fix-musl-headers-x86.patch" diff --git a/community/nx-libs/fix-const-char.patch b/community/nx-libs/fix-const-char.patch new file mode 100644 index 0000000000..404612cd63 --- /dev/null +++ b/community/nx-libs/fix-const-char.patch @@ -0,0 +1,28 @@ +--- a/nx-X11/lib/font/fontfile/encparse.c ++++ b/nx-X11/lib/font/fontfile/encparse.c +@@ -785,13 +785,13 @@ + return 0; + } + +-char* ++const char* + FontEncDirectory() + { +- static char* dir = NULL; ++ static const char* dir = NULL; + + if(dir == NULL) { +- char *c = getenv("FONT_ENCODINGS_DIRECTORY"); ++ const char *c = getenv("FONT_ENCODINGS_DIRECTORY"); + if(c) { + dir = malloc(strlen(c) + 1); + if(!dir) +@@ -899,7 +899,7 @@ + { + FontEncPtr encoding; + char dir[MAXFONTFILENAMELEN], dirname[MAXFONTFILENAMELEN]; +- char *d; ++ const char *d; + + if(fontFileName) { + parseFontFileName(fontFileName, dirname, dir); |