sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imlib2: update patches

Browse Source
This commit is contained in:
Leonid Pliushch 2019-12-16 15:10:09 +02:00
parent d2d786f212
commit bf20ce4475
8 changed files with 64 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/imlib2/imlib2-1.5.1_src_bin_imlib2_show.c.patch → packages/imlib2/0000-fix-mblen.patch
View File

@ -1,8 +1,8 @@
diff -uNr imlib2-1.5.1/src/bin/imlib2_show.c imlib2-1.5.1.mod/src/bin/imlib2_show.c
--- imlib2-1.5.1/src/bin/imlib2_show.c 2018-03-16 17:29:59.000000000 +0200
+++ imlib2-1.5.1.mod/src/bin/imlib2_show.c 2018-11-14 19:08:41.689118629 +0200
@@ -23,6 +23,11 @@
*/
diff -uNr imlib2-1.6.1/src/bin/imlib2_show.c imlib2-1.6.1.mod/src/bin/imlib2_show.c
--- imlib2-1.6.1/src/bin/imlib2_show.c 2019-12-03 18:26:24.000000000 +0200
+++ imlib2-1.6.1.mod/src/bin/imlib2_show.c 2019-12-16 14:53:36.307439115 +0200
@@ -12,6 +12,11 @@
#include "Imlib2.h"
+static int android_mblen(const char *s, size_t n)
@ -12,8 +12,8 @@ diff -uNr imlib2-1.5.1/src/bin/imlib2_show.c imlib2-1.5.1.mod/src/bin/imlib2_sho
+
Display *disp;
Window win;
Visual *vis;
@@ -1276,7 +1281,7 @@
@@ -1262,7 +1267,7 @@
char tmp[16];
int len;

6
packages/imlib2/imlib2-1.5.1_src_lib_ximage.c.patch → packages/imlib2/0001-dlopen-libandroid-shmem.patch
View File

@ -1,6 +1,6 @@
diff -uNr imlib2-1.5.1/src/lib/ximage.c imlib2-1.5.1.mod/src/lib/ximage.c
--- imlib2-1.5.1/src/lib/ximage.c 2018-03-10 21:31:39.000000000 +0200
+++ imlib2-1.5.1.mod/src/lib/ximage.c 2019-09-10 22:24:51.561058349 +0300
diff -uNr imlib2-1.6.1/src/lib/ximage.c imlib2-1.6.1.mod/src/lib/ximage.c
--- imlib2-1.6.1/src/lib/ximage.c 2019-11-08 21:08:08.000000000 +0200
+++ imlib2-1.6.1.mod/src/lib/ximage.c 2019-12-16 14:55:16.041906425 +0200
@@ -9,7 +9,8 @@
#include <sys/mman.h>
#endif

54
packages/imlib2/0002-fix-hardcoded-paths.patch Normal file
View File

@ -0,0 +1,54 @@
diff -uNr imlib2-1.6.1/src/modules/loaders/loader_bz2.c imlib2-1.6.1.mod/src/modules/loaders/loader_bz2.c
--- imlib2-1.6.1/src/modules/loaders/loader_bz2.c 2019-12-12 17:33:39.000000000 +0200
+++ imlib2-1.6.1.mod/src/modules/loaders/loader_bz2.c 2019-12-16 14:57:48.727610807 +0200
@@ -52,7 +52,7 @@
FILE *fp;
int dest, res;
const char *s, *p, *q;
- char tmp[] = "/tmp/imlib2_loader_bz2-XXXXXX";
+ char tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_bz2-XXXXXX";
char *file, *real_ext;
/* make sure this file ends in ".bz2" and that there's another ext
diff -uNr imlib2-1.6.1/src/modules/loaders/loader_id3.c imlib2-1.6.1.mod/src/modules/loaders/loader_id3.c
--- imlib2-1.6.1/src/modules/loaders/loader_id3.c 2019-12-12 17:33:39.000000000 +0200
+++ imlib2-1.6.1.mod/src/modules/loaders/loader_id3.c 2019-12-16 14:58:12.922721393 +0200
@@ -505,7 +505,7 @@
if (loader)
{
- char *ofile, tmp[] = "/tmp/imlib2_loader_id3-XXXXXX";
+ char *ofile, tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_id3-XXXXXX";
int dest;
if ((dest = mkstemp(tmp)) < 0)
diff -uNr imlib2-1.6.1/src/modules/loaders/loader_xpm.c imlib2-1.6.1.mod/src/modules/loaders/loader_xpm.c
--- imlib2-1.6.1/src/modules/loaders/loader_xpm.c 2019-12-12 17:33:39.000000000 +0200
+++ imlib2-1.6.1.mod/src/modules/loaders/loader_xpm.c 2019-12-16 14:58:43.882862535 +0200
@@ -55,11 +55,11 @@
/* look in rgb txt database */
if (!rgb_txt)
- rgb_txt = fopen("/usr/share/X11/rgb.txt", "r");
+ rgb_txt = fopen("@TERMUX_PREFIX@/share/X11/rgb.txt", "r");
if (!rgb_txt)
- rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
+ rgb_txt = fopen("@TERMUX_PREFIX@/X11R6/lib/X11/rgb.txt", "r");
if (!rgb_txt)
- rgb_txt = fopen("/usr/openwin/lib/X11/rgb.txt", "r");
+ rgb_txt = fopen("@TERMUX_PREFIX@/openwin/lib/X11/rgb.txt", "r");
if (!rgb_txt)
goto done;
diff -uNr imlib2-1.6.1/src/modules/loaders/loader_zlib.c imlib2-1.6.1.mod/src/modules/loaders/loader_zlib.c
--- imlib2-1.6.1/src/modules/loaders/loader_zlib.c 2019-12-12 17:33:39.000000000 +0200
+++ imlib2-1.6.1.mod/src/modules/loaders/loader_zlib.c 2019-12-16 14:59:48.137154277 +0200
@@ -45,7 +45,7 @@
FILE *fp;
int dest, res;
const char *s, *p, *q;
- char tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX";
+ char tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_zlib-XXXXXX";
char *file, *real_ext;
/* make sure this file ends in ".gz" and that there's another ext

12
packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_bz2.c.patch
View File

@ -1,12 +0,0 @@
diff -uNr imlib2-1.5.1/src/modules/loaders/loader_bz2.c imlib2-1.5.1.mod/src/modules/loaders/loader_bz2.c
--- imlib2-1.5.1/src/modules/loaders/loader_bz2.c 2017-12-16 15:03:10.000000000 +0200
+++ imlib2-1.5.1.mod/src/modules/loaders/loader_bz2.c 2018-11-14 19:06:26.991364123 +0200
@@ -52,7 +52,7 @@
ImlibLoader *loader;
FILE *fp;
int dest, res;
- char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_bz2-XXXXXX";
+ char *file, *p, *q, tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_bz2-XXXXXX";
char *real_ext;
assert(im);

12
packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_id3.c.patch
View File

@ -1,12 +0,0 @@
diff -uNr imlib2-1.5.1/src/modules/loaders/loader_id3.c imlib2-1.5.1.mod/src/modules/loaders/loader_id3.c
--- imlib2-1.5.1/src/modules/loaders/loader_id3.c 2018-03-10 21:31:39.000000000 +0200
+++ imlib2-1.5.1.mod/src/modules/loaders/loader_id3.c 2018-11-14 19:06:26.994697483 +0200
@@ -507,7 +507,7 @@
if (loader)
{
- char *ofile, tmp[] = "/tmp/imlib2_loader_id3-XXXXXX";
+ char *ofile, tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_id3-XXXXXX";
int dest;
if ((dest = mkstemp(tmp)) < 0)

18
packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_xpm.c.patch
View File

@ -1,18 +0,0 @@
diff -uNr imlib2-1.5.1/src/modules/loaders/loader_xpm.c imlib2-1.5.1.mod/src/modules/loaders/loader_xpm.c
--- imlib2-1.5.1/src/modules/loaders/loader_xpm.c 2018-03-11 09:54:36.000000000 +0200
+++ imlib2-1.5.1.mod/src/modules/loaders/loader_xpm.c 2018-11-14 19:06:27.004697564 +0200
@@ -51,11 +51,11 @@
}
/* look in rgb txt database */
if (!rgb_txt)
- rgb_txt = fopen("/usr/share/X11/rgb.txt", "r");
+ rgb_txt = fopen("@TERMUX_PREFIX@/share/X11/rgb.txt", "r");
if (!rgb_txt)
- rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
+ rgb_txt = fopen("@TERMUX_PREFIX@/X11R6/lib/X11/rgb.txt", "r");
if (!rgb_txt)
- rgb_txt = fopen("/usr/openwin/lib/X11/rgb.txt", "r");
+ rgb_txt = fopen("@TERMUX_PREFIX@/openwin/lib/X11/rgb.txt", "r");
if (!rgb_txt)
return;
fseek(rgb_txt, 0, SEEK_SET);

11
packages/imlib2/src-bin-imlib2_view.c.patch
View File

@ -1,11 +0,0 @@
diff -u -r ../imlib2-1.6.0/src/bin/imlib2_view.c ./src/bin/imlib2_view.c
--- ../imlib2-1.6.0/src/bin/imlib2_view.c 2019-11-23 16:59:35.000000000 +0000
+++ ./src/bin/imlib2_view.c 2019-12-12 20:27:59.394947223 +0000
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <sys/select.h>
#include "Imlib2.h"

12
packages/imlib2/src-modules-loaders-loader_zlib.c.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../imlib2-1.6.0/src/modules/loaders/loader_zlib.c ./src/modules/loaders/loader_zlib.c
--- ../imlib2-1.6.0/src/modules/loaders/loader_zlib.c 2019-11-23 05:36:44.000000000 +0000
+++ ./src/modules/loaders/loader_zlib.c 2019-12-12 20:15:28.361709201 +0000
@@ -44,7 +44,7 @@
ImlibLoader *loader;
int src;
int dest, res;
- char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX";
+ char *file, *p, *q, tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_zlib-XXXXXX";
char *real_ext;
/* make sure this file ends in ".gz" and that there's another ext