haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

calcurse, bump version (#8660)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-05-17 15:29:06 +02:00
committed by GitHub
parent 01e97a0d7a
commit acbf22fa48
3 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app-office/calcurse/calcurse-4.7.1.recipe → app-office/calcurse/calcurse-4.8.0.recipe
View File

@@ -6,11 +6,11 @@ curses based interface can be customized to suit user needs and a very \
powerful set of command line options can be used to filter and format \
appointments, making it suitable for use in scripts."
HOMEPAGE="https://calcurse.org/"
COPYRIGHT="2005-2017 calcurse Development Team"
COPYRIGHT="2004-2022 calcurse Development Team"
LICENSE="BSD (2-clause)"
REVISION="2"
REVISION="1"
SOURCE_URI="http://calcurse.org/files/calcurse-$portVersion.tar.gz"
CHECKSUM_SHA256="0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0"
CHECKSUM_SHA256="48a736666cc4b6b53012d73b3aa70152c18b41e6c7b4807fab0f168d645ae32c"
PATCHES="calcurse-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -34,12 +34,14 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libncursesw$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libncursesw$secondaryArchSuffix
"

47
app-office/calcurse/patches/calcurse-4.7.1.patchset
View File

@@ -1,47 +0,0 @@
From 91859edea421c982332ea5025bdda691433b5d8c Mon Sep 17 00:00:00 2001
From: Andy <andy@keyboardfire.com>
Date: Sun, 3 Dec 2017 13:25:59 +0000
Subject: Fix version and don't check for lm or pthread
diff --git a/configure.ac b/configure.ac
index 1f6ec61..afa6c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
#-------------------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT([calcurse],
- m4_esyscmd([build-aux/git-version-gen .version]),
+ 4.5.0,
[bugs@calcurse.org])
AM_INIT_AUTOMAKE
#m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -50,24 +50,6 @@ AC_CHECK_FUNC(initscr,,
fi
LIBS="$LIBS -l$available_ncurses"
])
-
-AC_CHECK_HEADERS([pthread.h], [
- AC_CHECK_LIB(pthread, pthread_create, [
- LIBS="$LIBS -pthread"
- AC_DEFINE(HAVE_LIBPTHREAD, 1,
- [Define to 1 if you have the 'pthread' library (-pthread).])
- ],
- AC_MSG_ERROR(The pthread library is required in order to build calcurse!))
-], AC_MSG_ERROR(The pthread header is required in order to build calcurse!))
-
-AC_CHECK_HEADERS([math.h], [
- AC_CHECK_LIB(m, exp, [
- LIBS="$LIBS -lm"
- AC_DEFINE(HAVE_LIBMATH, 1,
- [Define to 1 if you have the 'math' library (-lm).])
- ],
- AC_MSG_ERROR(The math library is required in order to build calcurse!))
-], AC_MSG_ERROR(The math header is required in order to build calcurse!))
#-------------------------------------------------------------------------------
# Check whether to build documentation
#-------------------------------------------------------------------------------
--
2.30.2

70
app-office/calcurse/patches/calcurse-4.8.0.patchset Normal file
View File

@@ -0,0 +1,70 @@
From be7e7bc4d56fd3e86611800b8771d733ff8835cc Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 17 May 2023 15:08:43 +0200
Subject: Fix version
diff --git a/configure.ac b/configure.ac
index e7594c5..f3924a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
#-------------------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT([calcurse],
- m4_esyscmd([build-aux/git-version-gen .version]),
+ m4_esyscmd_s([cat .version]),
[bugs@calcurse.org])
AM_INIT_AUTOMAKE
#m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
--
2.37.3
From ac1bac201c3961ccb90fab2f6a4a86ec6b3b532f Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 17 May 2023 15:13:23 +0200
Subject: Revert check for libncurses (no need for autoconf-archive)
diff --git a/configure.ac b/configure.ac
index f3924a9..4fc1874 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,27 @@ AC_CHECK_HEADERS([ctype.h getopt.h locale.h math.h signal.h stdio.h stdlib.h \
#-------------------------------------------------------------------------------
# Checks for system libs
#-------------------------------------------------------------------------------
-AX_WITH_CURSES
-if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
- AC_MSG_ERROR(Either ncurses or ncursesw library is required to build calcurse!)
-fi
-
-LIBS="$LIBS $CURSES_LIBS"
+AC_CHECK_FUNC(initscr,,
+[
+ available_ncurses="none"
+ for lib in ncursesw ncurses
+ do
+ AC_CHECK_LIB($lib, initscr,
+ [available_ncurses="$lib"; break])
+ done
+ if test "$available_ncurses" = none; then
+ AC_MSG_ERROR(Either ncurses or ncursesw library is required to build calcurse!)
+ elif test "$available_ncurses" = ncursesw; then
+ AC_CHECK_HEADERS([ncursesw/ncurses.h],,
+ [AC_CHECK_HEADERS([ncurses.h],,
+ AC_MSG_ERROR([Missing ncursesw header file]))])
+ else
+ AC_CHECK_HEADERS([ncurses/ncurses.h],,
+ [AC_CHECK_HEADERS([ncurses.h],,
+ AC_MSG_ERROR([Missing ncurses header file]))])
+ fi
+ LIBS="$LIBS -l$available_ncurses"
+])
AC_CHECK_HEADERS([pthread.h], [
AC_CHECK_LIB(pthread, pthread_create, [
--
2.37.3