openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to libical-4.0.1.

Browse Source
This commit is contained in:
ajacoutot
2026-05-20 11:42:22 +00:00
parent 813924ef7c
commit c31a5bdebb
11 changed files with 139 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
textproc/libical/Makefile
+16 -15
View File
@@ -1,20 +1,19 @@
COMMENT-main= implementation of the iCalendar protocols and data units
COMMENT-glib= GObject wrapper for libical library
V= 3.0.20
V= 4.0.1
DISTNAME= libical-${V}
PKGNAME-main= ${PKGNAME}
PKGNAME-glib= libical-glib-${V}
REVISION-glib= 0
REVISION-main= 0
SHARED_LIBS += ical 4.5
SHARED_LIBS += icalss 4.0
SHARED_LIBS += icalvcal 3.0
SHARED_LIBS += ical_cxx 1.1
SHARED_LIBS += icalss_cxx 1.0
SHARED_LIBS += ical-glib 0.0
SHARED_LIBS += ical 5.0
SHARED_LIBS += icalss 5.0
SHARED_LIBS += icalvcal 4.0
SHARED_LIBS += ical_cxx 2.0
SHARED_LIBS += icalss_cxx 2.0
SHARED_LIBS += ical-glib 1.0
SHARED_LIBS += icalvcard 0.0
CATEGORIES= textproc
@@ -27,9 +26,10 @@ PERMIT_PACKAGE= Yes
WANTLIB += icui18n icudata icuuc
WANTLIB-main += ${WANTLIB} ${COMPILER_LIBCXX} m lib/db4/db lib/db4/db_cxx
WANTLIB-glib += ${WANTLIB} c ical glib-2.0 gobject-2.0 intl pthread xml2
WANTLIB-glib += ${WANTLIB} c ical icalvcard glib-2.0 gobject-2.0 intl
WANTLIB-glib += pthread xml2
SITES= https://github.com/libical/libical/releases/download/v${V}/
SITES= https://github.com/libical/libical/releases/download/v${V}/
MULTI_PACKAGES= -main -glib
@@ -49,10 +49,11 @@ LIB_DEPENDS-glib= devel/glib2 \
${BASE_PKGPATH},-main=${V}
CONFIGURE_ARGS= -DENABLE_GTK_DOC=false \
-DGOBJECT_INTROSPECTION=true \
-DICAL_GLIB_VAPI=true \
-DICAL_BUILD_DOCS=false
CONFIGURE_ARGS= -DLIBICAL_GOBJECT_INTROSPECTION=true \
-DLIBICAL_GLIB_VAPI=true \
-DLIBICAL_BUILD_DOCS=false \
-DLIBICAL_BUILD_DOCS=false \
-DLIBICAL_JAVA_BINDINGS=false
DEBUG_PACKAGES= ${BUILD_PACKAGES}
textproc/libical/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (libical-3.0.20.tar.gz) = 5z3pL1ps6EwbADBkRrKQorCM3wqAmI7KCiydXDUQtMI=
SIZE (libical-3.0.20.tar.gz) = 973928
SHA256 (libical-4.0.1.tar.gz) = fB2LeAzjBaiCPlgk7E1+sF2Fro+AiDa0lao3sMPQgzc=
SIZE (libical-4.0.1.tar.gz) = 1871999
textproc/libical/patches/patch-CMakeLists_txt
+18 -18
View File
@@ -3,21 +3,21 @@ base gcc does not understand -Wwrite-strings and errors out.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -525,7 +525,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}"
check_c_compiler_flag(-Wredundant-decls HAVE_GCC_REDUNDANT_DECLS)
check_c_compiler_flag(-Wunreachable-code HAVE_GCC_UNREACHABLE_CODE)
check_c_compiler_flag(-Wvarargs HAVE_GCC_VARARGS)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Wno-deprecated -Wall -Wno-unknown-pragmas -Wextra -Winit-self -Wunused -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Werror=return-type")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Wno-deprecated -Wall -Wno-unknown-pragmas -Wextra -Winit-self -Wunused -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Werror=return-type")
#for more modern C
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wold-style-definition -Wstrict-prototypes")
if(HAVE_GCC_UNUSED_BUT_SET)
@@ -569,7 +569,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_I
check_cxx_compiler_flag(-Wredundant-decls HAVE_GXX_REDUNDANT_DECLS)
check_cxx_compiler_flag(-Wunreachable-code HAVE_GXX_UNREACHABLE_CODE)
check_cxx_compiler_flag(-Wvarargs HAVE_GXX_VARARGS)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Weffc++ -Wno-deprecated -Wall -Wextra -Woverloaded-virtual -Winit-self -Wunused -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Werror=return-type")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Weffc++ -Wno-deprecated -Wall -Wextra -Woverloaded-virtual -Winit-self -Wunused -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Werror=return-type")
if(HAVE_GXX_UNUSED_BUT_SET)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-but-set-variable")
endif()
@@ -768,7 +768,7 @@ if(CMAKE_C_COMPILER_IS_GCC OR CMAKE_C_COMPILER_IS_CLAN
-O2 \
-fvisibility=hidden \
-Wno-deprecated -Wall -Wunknown-pragmas -Wextra -Winit-self -Wunused -Wno-div-by-zero \
- -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wreturn-type \
+ -Wundef -Wpointer-arith -Wtype-limits -Wreturn-type \
-Wold-style-definition -Wstrict-prototypes"
)
if(LIBICAL_DEVMODE)
@@ -805,7 +805,7 @@ if(CMAKE_CXX_COMPILER_IS_GCC OR CMAKE_CXX_COMPILER_IS_
-O2 \
-fvisibility=hidden \
-Weffc++ -Wno-deprecated -Wall -Wextra -Woverloaded-virtual -Winit-self -Wunused \
- -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wreturn-type"
+ -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Wreturn-type"
)
if(LIBICAL_DEVMODE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
textproc/libical/patches/patch-cmake_modules_FindBDB_cmake
+6 -6
View File
@@ -1,12 +1,12 @@
Index: cmake/modules/FindBDB.cmake
--- cmake/modules/FindBDB.cmake.orig
+++ cmake/modules/FindBDB.cmake
@@ -19,7 +19,7 @@ endif()
find_path(
BDB_INCLUDE_DIR
NAMES db.h
- HINTS /usr/local/opt/db/include
+ HINTS ${LOCALBASE}/include/db4
@@ -29,7 +29,7 @@ find_path(
NAMES
db.h
HINTS
- /usr/local/opt/db/include
+ ${LOCALBASE}/include/db4
DOC "Include directory for the Berkeley DB library"
)
mark_as_advanced(BDB_INCLUDE_DIR)
textproc/libical/patches/patch-cmake_modules_openssf-c_cmake
+19
View File
@@ -0,0 +1,19 @@
From 0159109b38e5a3dd068f4f0c1affd9dc94983412 Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Sat, 16 May 2026 10:54:38 -0400
Subject: [PATCH] Remove "-Wl,-z,nodlopen" from gcc/clang compile options (#1325)
Index: cmake/modules/openssf-c.cmake
--- cmake/modules/openssf-c.cmake.orig
+++ cmake/modules/openssf-c.cmake
@@ -117,10 +117,6 @@ if(C_SUPPORTS_FTRIVIAL_AUTO_VAR_INIT)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftrivial-auto-var-init")
endif()
-check_linker_flag(C "-Wl,-z,nodlopen" C_LINKER_SUPPORTS_NODLOPEN)
-if(C_LINKER_SUPPORTS_NODLOPEN)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nodlopen")
-endif()
check_linker_flag(C "-Wl,-z,noexecstack" C_LINKER_SUPPORTS_NOEXECSTACK)
if(C_LINKER_SUPPORTS_NOEXECSTACK)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack")
textproc/libical/patches/patch-cmake_modules_openssf-cpp_cmake
+19
View File
@@ -0,0 +1,19 @@
From 0159109b38e5a3dd068f4f0c1affd9dc94983412 Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Sat, 16 May 2026 10:54:38 -0400
Subject: [PATCH] Remove "-Wl,-z,nodlopen" from gcc/clang compile options (#1325)
Index: cmake/modules/openssf-cpp.cmake
--- cmake/modules/openssf-cpp.cmake.orig
+++ cmake/modules/openssf-cpp.cmake
@@ -117,10 +117,6 @@ if(CXX_SUPPORTS_FTRIVIAL_AUTO_VAR_INIT)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrivial-auto-var-init")
endif()
-check_linker_flag(CXX "-Wl,-z,nodlopen" CXX_LINKER_SUPPORTS_NODLOPEN)
-if(CXX_LINKER_SUPPORTS_NODLOPEN)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nodlopen")
-endif()
check_linker_flag(CXX "-Wl,-z,noexecstack" CXX_LINKER_SUPPORTS_NOEXECSTACK)
if(CXX_LINKER_SUPPORTS_NOEXECSTACK)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack")
textproc/libical/patches/patch-src_libicalss_icalbdbset_h
+1 -1
View File
@@ -3,7 +3,7 @@ don't pick up /usr/include/db.h
Index: src/libicalss/icalbdbset.h
--- src/libicalss/icalbdbset.h.orig
+++ src/libicalss/icalbdbset.h
@@ -21,7 +21,7 @@
@@ -18,7 +18,7 @@
#include "libical_icalss_export.h"
#include "icalset.h"
textproc/libical/patches/patch-src_libicalss_icalbdbsetimpl_h
+1 -1
View File
@@ -3,7 +3,7 @@ don't pick up /usr/include/db.h
Index: src/libicalss/icalbdbsetimpl.h
--- src/libicalss/icalbdbsetimpl.h.orig
+++ src/libicalss/icalbdbsetimpl.h
@@ -19,7 +19,7 @@
@@ -9,7 +9,7 @@
#define ICALBDBSETIMPL_H
#include "icalset.h"
textproc/libical/patches/patch-src_test_regression-storage_c
+2 -2
View File
@@ -3,12 +3,12 @@ don't pick up /usr/include/db.h
Index: src/test/regression-storage.c
--- src/test/regression-storage.c.orig
+++ src/test/regression-storage.c
@@ -58,7 +58,7 @@ struct calendar
@@ -45,7 +45,7 @@ struct calendar {
int vcalendar_init(struct calendar **cal, const char *vcalendar, const char *title);
#if defined(HAVE_BDB)
-#include <db.h>
+#include <db4/db.h>
/*
int get_title(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey);
char *parse_vcalendar(const DBT *dbt);
textproc/libical/pkg/PLIST-glib
+1 -4
View File
@@ -13,7 +13,6 @@ include/libical-glib/i-cal-error.h
include/libical-glib/i-cal-forward-declarations.h
include/libical-glib/i-cal-geo.h
include/libical-glib/i-cal-memory.h
include/libical-glib/i-cal-mime.h
include/libical-glib/i-cal-object.h
include/libical-glib/i-cal-parameter.h
include/libical-glib/i-cal-parser.h
@@ -33,13 +32,11 @@ include/libical-glib/i-cal-value.h
include/libical-glib/libical-glib.h
lib/cmake/LibIcal/IcalGlibSrcGenerator${MODCMAKE_BUILD_SUFFIX}
lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake
lib/girepository-1.0/ICalGLib-3.0.typelib
@static-lib lib/libical-glib.a
@lib lib/libical-glib.so.${LIBical-glib_VERSION}
lib/pkgconfig/libical-glib.pc
libexec/libical/
@bin libexec/libical/ical-glib-src-generator
share/gir-1.0/ICalGLib-3.0.gir
share/gir-1.0/ICalGLib-4.0.gir
share/vala/
share/vala/vapi/
share/vala/vapi/libical-glib.vapi
textproc/libical/pkg/PLIST-main
+54 -19
View File
@@ -1,9 +1,28 @@
@pkgpath textproc/libical
include/libical/
include/libical-glib/i-cal-enum-array.h
include/libical-glib/i-cal-limits.h
include/libical-glib/i-cal-param-iter.h
include/libical-glib/i-cal-prop-iter.h
include/libical-glib/i-cal-str-array.h
include/libical-glib/i-cal-vcard-component.h
include/libical-glib/i-cal-vcard-derived-parameter.h
include/libical-glib/i-cal-vcard-derived-property.h
include/libical-glib/i-cal-vcard-derived-value.h
include/libical-glib/i-cal-vcard-enum-array.h
include/libical-glib/i-cal-vcard-geo.h
include/libical-glib/i-cal-vcard-parameter.h
include/libical-glib/i-cal-vcard-parser.h
include/libical-glib/i-cal-vcard-property.h
include/libical-glib/i-cal-vcard-restriction.h
include/libical-glib/i-cal-vcard-str-array.h
include/libical-glib/i-cal-vcard-structured.h
include/libical-glib/i-cal-vcard-time.h
include/libical-glib/i-cal-vcard-tz.h
include/libical-glib/i-cal-vcard-value.h
include/libical/ical.h
include/libical/icalarray.h
include/libical/icalattach.h
include/libical/icalbdbset_cxx.h
include/libical/icalcalendar.h
include/libical/icalclassify.h
include/libical/icalcluster.h
@@ -14,45 +33,61 @@ include/libical/icalderivedvalue.h
include/libical/icaldirset.h
include/libical/icaldirsetimpl.h
include/libical/icalduration.h
include/libical/icalenumarray.h
include/libical/icalenums.h
include/libical/icalerror.h
include/libical/icalfileset.h
include/libical/icalfilesetimpl.h
include/libical/icalgauge.h
include/libical/icalgaugeimpl.h
include/libical/icallangbind.h
include/libical/icallimits.h
include/libical/icalmemory.h
include/libical/icalmessage.h
include/libical/icalmime.h
include/libical/icalparameter.h
include/libical/icalparameter_cxx.h
include/libical/icalparameter_cxx.hpp
include/libical/icalparser.h
include/libical/icalperiod.h
include/libical/icalproperty.h
include/libical/icalproperty_cxx.h
include/libical/icalproperty_cxx.hpp
include/libical/icalrecur.h
include/libical/icalrestriction.h
include/libical/icalset.h
include/libical/icalspanlist.h
include/libical/icalspanlist_cxx.h
include/libical/icalspanlist_cxx.hpp
include/libical/icalss.h
include/libical/icalssyacc.h
include/libical/icalstrarray.h
include/libical/icaltime.h
include/libical/icaltime_p.h
include/libical/icaltimezone.h
include/libical/icaltypes.h
include/libical/icaltz-util.h
include/libical/icalvalue.h
include/libical/icalvalue_cxx.h
include/libical/icalvalue_cxx.hpp
include/libical/icalvcal.h
include/libical/icptrholder_cxx.h
include/libical/icptrholder_cxx.hpp
include/libical/libical_deprecated.h
include/libical/libical_ical_export.h
include/libical/libical_icalss_export.h
include/libical/libical_sentinel.h
include/libical/libical_vcal_export.h
include/libical/pvl.h
include/libical/sspm.h
include/libical/libical_vcard_export.h
include/libical/vcaltmp.h
include/libical/vcard.h
include/libical/vcardcomponent.h
include/libical/vcardderivedparameter.h
include/libical/vcardderivedproperty.h
include/libical/vcardderivedvalue.h
include/libical/vcardenumarray.h
include/libical/vcardparameter.h
include/libical/vcardparser.h
include/libical/vcardproperty.h
include/libical/vcardstrarray.h
include/libical/vcardstructured.h
include/libical/vcardtime.h
include/libical/vcardtypes.h
include/libical/vcardvalue.h
include/libical/vcc.h
include/libical/vcomponent_cxx.h
include/libical/vcomponent_cxx.hpp
include/libical/vobject.h
lib/cmake/
lib/cmake/LibIcal/
@@ -61,17 +96,17 @@ lib/cmake/LibIcal/LibIcalConfigVersion.cmake
lib/cmake/LibIcal/LibIcalTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/LibIcal/LibIcalTargets.cmake
lib/girepository-1.0/
lib/girepository-1.0/ICal-3.0.typelib
@static-lib lib/libical.a
lib/girepository-1.0/ICal-4.0.typelib
lib/girepository-1.0/ICalGLib-4.0.typelib
@lib lib/libical.so.${LIBical_VERSION}
@static-lib lib/libical_cxx.a
@lib lib/libical_cxx.so.${LIBical_cxx_VERSION}
@static-lib lib/libicalss.a
@lib lib/libicalss.so.${LIBicalss_VERSION}
@static-lib lib/libicalss_cxx.a
@lib lib/libicalss_cxx.so.${LIBicalss_cxx_VERSION}
@static-lib lib/libicalvcal.a
@lib lib/libicalvcal.so.${LIBicalvcal_VERSION}
@lib lib/libicalvcard.so.${LIBicalvcard_VERSION}
lib/pkgconfig/libical.pc
lib/pkgconfig/libicalss.pc
lib/pkgconfig/libicalvcal.pc
lib/pkgconfig/libicalvcard.pc
share/gir-1.0/
share/gir-1.0/ICal-3.0.gir
share/gir-1.0/ICal-4.0.gir