[packages/osmo] Rel 4
arekm
arekm at pld-linux.org
Sat Aug 22 16:32:47 CEST 2026
commit 385018fb8c7c17bc694a100677cb3803c20397bd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Aug 22 16:32:39 2026 +0200
Rel 4
osmo-libical4.patch | 36 ++++++++++++++++++++++++++++++++++++
osmo-prototypes.patch | 22 ++++++++++++++++++++++
osmo-webkit41.patch | 11 +++++++++++
osmo.spec | 14 ++++++++++----
4 files changed, 79 insertions(+), 4 deletions(-)
---
diff --git a/osmo.spec b/osmo.spec
index 0a571b1..572c7ce 100644
--- a/osmo.spec
+++ b/osmo.spec
@@ -2,12 +2,15 @@ Summary: Simple PIM application
Summary(pl.UTF-8): Prosta aplikacja PIM (do zarządzania informacjami osobistymi)
Name: osmo
Version: 0.4.4
-Release: 3
+Release: 4
License: GPL v2+
Group: X11/Applications
Source0: http://downloads.sourceforge.net/osmo-pim/%{name}-%{version}.tar.gz
# Source0-md5: 4a22d229c57c12899520edecd73e6bb9
Patch0: %{name}-datadir.patch
+Patch1: %{name}-webkit41.patch
+Patch2: %{name}-prototypes.patch
+Patch3: %{name}-libical4.patch
URL: http://clayo.org/osmo/
BuildRequires: autoconf >= 2.61
BuildRequires: automake
@@ -15,7 +18,7 @@ BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.6.0
BuildRequires: gspell-devel >= 1.2.0
BuildRequires: gtk+3-devel >= 3.10.0
-BuildRequires: gtk-webkit4-devel >= 2.8.0
+BuildRequires: gtk-webkit4.1-devel >= 2.8.0
BuildRequires: libarchive-devel >= 3.0.0
BuildRequires: libgringotts-devel >= 1.2.1
BuildRequires: libical-devel >= 1.0
@@ -25,10 +28,10 @@ BuildRequires: pango-devel >= 1:1.20
BuildRequires: pkgconfig
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
-Requires: glib2-devel >= 1:2.6.0
+Requires: glib2 >= 1:2.6.0
Requires: gspell >= 1.2.0
Requires: gtk+3 >= 3.10.0
-Requires: gtk-webkit4 >= 2.8.0
+Requires: gtk-webkit4.1 >= 2.8.0
Requires: pango >= 1:1.20
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,6 +59,9 @@ przechowywania danych bazę danych w czystym XML-u.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
%build
%{__aclocal}
diff --git a/osmo-libical4.patch b/osmo-libical4.patch
new file mode 100644
index 0000000..86abea0
--- /dev/null
+++ b/osmo-libical4.patch
@@ -0,0 +1,36 @@
+--- osmo-0.4.4.orig/configure.ac
++++ osmo-0.4.4/configure.ac
+@@ -89,6 +89,10 @@
+ PKG_CHECK_MODULES(LIBICAL, libical >= 1.0, have_libical=true,
+ have_libical=false)
+ if test "x$have_libical" = "xtrue"; then
++ dnl libical 4.0 moved the storage API into its own pkg-config module;
++ dnl up to 3.0 libical.pc already pulled -licalss in
++ PKG_CHECK_MODULES(LIBICALSS, libicalss,
++ [LIBICAL_LIBS="$LIBICAL_LIBS $LIBICALSS_LIBS"], [:])
+ AC_DEFINE([HAVE_LIBICAL], [1], [Definded to 1 if compile with libical support])
+ libical="yes"
+ else
+--- osmo-0.4.4.orig/src/calendar_ical.c
++++ osmo-0.4.4/src/calendar_ical.c
+@@ -38,6 +38,11 @@
+ #include <libical/icalset.h>
+ #include <libical/icalclassify.h>
+
++/* libical 4.0 renamed set_zone_directory() to icaltimezone_set_zone_directory() */
++#if !ICAL_CHECK_VERSION(4, 0, 0)
++#define icaltimezone_set_zone_directory set_zone_directory
++#endif
++
+ /*------------------------------------------------------------------------------*/
+
+ void
+@@ -56,7 +61,7 @@
+
+ for (i = 0; i < N_SEARCH_PATHS; i++) {
+ if (!g_access (tz_search_paths[i], F_OK | R_OK)) {
+- set_zone_directory (tz_search_paths[i]);
++ icaltimezone_set_zone_directory (tz_search_paths[i]);
+ break;
+ }
+ }
diff --git a/osmo-prototypes.patch b/osmo-prototypes.patch
new file mode 100644
index 0000000..35d142a
--- /dev/null
+++ b/osmo-prototypes.patch
@@ -0,0 +1,22 @@
+--- osmo-0.4.4.orig/src/calendar_notes.h
++++ osmo-0.4.4/src/calendar_notes.h
+@@ -53,7 +53,7 @@
+
+ gboolean cal_check_note (guint32 julian, GUI *appGUI);
+ gboolean cal_check_notes (guint32 julian_start, guint32 julian_end, GUI *appGUI);
+-void cal_notes_foreach (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(), GUI *appGUI);
++void cal_notes_foreach (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(struct note *, GUI *), GUI *appGUI);
+ gchar * cal_get_note (guint32 julian, GUI *appGUI);
+ gchar * cal_get_note_color (guint32 julian, GUI *appGUI);
+ void cal_replace_note_color (gchar *old_color, gchar *new_color, GUI *appGUI);
+--- osmo-0.4.4.orig/src/calendar_notes.c
++++ osmo-0.4.4/src/calendar_notes.c
+@@ -67,7 +67,7 @@
+ /*------------------------------------------------------------------------------*/
+
+ void
+-cal_notes_foreach (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(), GUI *appGUI)
++cal_notes_foreach (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(struct note *, GUI *), GUI *appGUI)
+ {
+ GSList *node;
+ struct note *n;
diff --git a/osmo-webkit41.patch b/osmo-webkit41.patch
new file mode 100644
index 0000000..0cb4ba2
--- /dev/null
+++ b/osmo-webkit41.patch
@@ -0,0 +1,11 @@
+--- osmo-0.4.4.orig/configure.ac
++++ osmo-0.4.4/configure.ac
+@@ -132,7 +132,7 @@
+ fi
+
+ # Checks for libwebkit
+-PKG_CHECK_MODULES(LIBWEBKIT, webkit2gtk-4.0 >= 2.8.0, have_libwebkit=true,
++PKG_CHECK_MODULES(LIBWEBKIT, webkit2gtk-4.1 >= 2.8.0, have_libwebkit=true,
+ have_libwebkit=false)
+ if test "x$have_libwebkit" = "xtrue"; then
+ libwebkit="yes"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/osmo.git/commitdiff/385018fb8c7c17bc694a100677cb3803c20397bd
More information about the pld-cvs-commit
mailing list