From 7fdd7555ccf79ae703e66de22beaf868a3a4d2a7 Mon Sep 17 00:00:00 2001 From: arvin <83908258+arvinsalehi@users.noreply.github.com> Date: Fri, 13 Dec 2024 00:47:07 +0000 Subject: [PATCH 1/6] fix not finding libjalali.so.0: added ldconfig to Makefile.am to update the Cache after installation is done. --- sources/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sources/Makefile.am b/sources/Makefile.am index ec3e42b..d6b7822 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -1,6 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libjalali src man test_kit +install-exec-hook: + @echo "make[0]: Running ldconfig ..." + @sudo ldconfig + if WANT_PYJALALI install-exec-hook: @echo -e "\n###########################\n"\ From 6531d01c20c3b350020b133d78346c6e4abb60d2 Mon Sep 17 00:00:00 2001 From: arvin <83908258+arvinsalehi@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:54:12 -0500 Subject: [PATCH 2/6] Update Makefile.am more responsible coding. --- sources/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/Makefile.am b/sources/Makefile.am index d6b7822..62d3d88 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libjalali src man test_kit install-exec-hook: - @echo "make[0]: Running ldconfig ..." + @echo "make[$(MAKELEVEL)]: Running ldconfig ..." @sudo ldconfig if WANT_PYJALALI From 140563e978681ee5a5046f800d0d47979d956966 Mon Sep 17 00:00:00 2001 From: fzerorubigd Date: Sun, 10 Feb 2019 20:37:33 +0100 Subject: [PATCH 3/6] Update the README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 3b8ac63..4efc5a3 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,9 @@ libc implementations. Jalali calendar provides an API similar to that of libc's Jalali calendar package consists of a library namely libjalali and two simple and easy to use terminal tools, jcal and jdate with functionality similar to UNIX cal and date. + + +--- + +This library was written and maintained by Ashkan Ghasemi, he passed away in an [accident](https://jadi.net/2017/10/ashkan-ghasemi/). +Therefore there is no way to migrate the original repository to another person, so this fork is for keep the project alive. From 1a5c3b7716a5947684f7859880931fcd626fc3f1 Mon Sep 17 00:00:00 2001 From: fzerorubigd Date: Fri, 15 Feb 2019 18:44:01 +0100 Subject: [PATCH 4/6] white is a color and -N should remove white colors too --- sources/src/jcal.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sources/src/jcal.c b/sources/src/jcal.c index 3de534a..e4afb96 100644 --- a/sources/src/jcal.c +++ b/sources/src/jcal.c @@ -352,7 +352,11 @@ void show_cal(struct cal_layout* l, printf(" "); } - printf("%s%s%s", TERM_WHITE, cal_t[i], TERM_RESET); + if (l->color) { + printf("%s%s%s", TERM_WHITE, cal_t[i], TERM_RESET); + } else { + printf("%s", cal_t[i]); + } for (k=0; k<(cal_width - cal_tw[i] - @@ -372,13 +376,17 @@ void show_cal(struct cal_layout* l, for (i=0; in; i++) { for (k=0; k<6; k++) { - printf("%s%s%s ", TERM_WHITE, ptr_d[k], TERM_RESET); + if (l->color) { + printf("%s%s%s ", TERM_WHITE, ptr_d[k], TERM_RESET); + } else { + printf("%s ", ptr_d[k]); + } } if (l->color) printf("%s%s%s", TERM_RED, ptr_d[6], TERM_RESET); else - printf("%s%s%s", TERM_WHITE, ptr_d[6], TERM_RESET); + printf("%s", ptr_d[6]); if (i != m->n-1) { for (k=0; kmargin; k++) { From 0b48b9eb736370239b1259748fa037145dce61f6 Mon Sep 17 00:00:00 2001 From: Forud Date: Tue, 1 Oct 2019 15:55:40 +0200 Subject: [PATCH 5/6] fix the problem with delete libtoolT fixes #3 --- sources/configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources/configure.ac b/sources/configure.ac index e623ec9..75f1da8 100644 --- a/sources/configure.ac +++ b/sources/configure.ac @@ -66,4 +66,7 @@ if test $installpyjalali = "yes"; then fi AM_CONDITIONAL([WANT_PYJALALI], [test $installpyjalali = "yes"]) +AC_PATH_PROG(RM, rm, $FALSE) +RM="$RM -f" + AC_OUTPUT From 63b78f73d225def79c1f7d9a0c1fd3741f8418b8 Mon Sep 17 00:00:00 2001 From: arvin <83908258+arvinsalehi@users.noreply.github.com> Date: Sat, 14 Dec 2024 00:45:21 +0000 Subject: [PATCH 6/6] more responsible coding --- sources/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/Makefile.am b/sources/Makefile.am index 62d3d88..0e93a41 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -1,8 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libjalali src man test_kit -install-exec-hook: - @echo "make[$(MAKELEVEL)]: Running ldconfig ..." +install-exec-hook:: + @echo "make[$(MAKELEVEL)]: Running ldconfig" @sudo ldconfig if WANT_PYJALALI