mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
claws_mail: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -11,7 +11,7 @@ COPYRIGHT="1999-2022 the Claws Mail team and Hiroyuki Yamamoto"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.claws-mail.org/download.php?file=releases/claws-mail-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e"
|
||||
CHECKSUM_SHA256="b189e700c1896f5e0deb0b76d4bfa820eb7ac1935ee10aa9afbada3cf53a0344"
|
||||
SOURCE_DIR="claws-mail-$portVersion"
|
||||
PATCHES="claws_mail-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="claws_mail.rdef.in"
|
||||
@@ -123,6 +123,8 @@ BUILD()
|
||||
--localedir=$dataDir/locale \
|
||||
--docdir=$developDocDir \
|
||||
--mandir=$manDir \
|
||||
--disable-dillo-plugin \
|
||||
--disable-notification-plugin \
|
||||
--disable-static --with-config-dir=mail/claws-mail
|
||||
|
||||
make $jobArgs
|
||||
@@ -1,82 +0,0 @@
|
||||
From 0298131d4c8af6c55a7c1c6402653060a57157c2 Mon Sep 17 00:00:00 2001
|
||||
From: Khaled <khallbal@gmail.com>
|
||||
Date: Sun, 2 Oct 2022 21:38:51 +0100
|
||||
Subject: Add support for Haiku
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 58b7f26..11bcabe 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -12,7 +12,9 @@ BINARY_AGE=0
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK3_VERSION=
|
||||
|
||||
-if test \( -d .git \); then
|
||||
+if test \( -n "$GIT_VERSION" \); then
|
||||
+ echo "echo ${GIT_VERSION}" > ./version
|
||||
+elif test \( -d .git \); then
|
||||
AC_CHECK_PROG([GIT], [git], [yes], [no], [$PATH])
|
||||
if test \( "$GIT" = "no" \); then
|
||||
AC_MSG_ERROR([*** git not found. See http://git-scm.com/])
|
||||
@@ -141,14 +143,20 @@ case "$host" in
|
||||
platform_osx=yes
|
||||
LDFLAGS="$LDFLAGS -Wl,-export_dynamic"
|
||||
;;
|
||||
+ *-haiku-*)
|
||||
+ platform_haiku=yes
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-export_dynamic"
|
||||
+ ;;
|
||||
*)
|
||||
platform_win32=no
|
||||
platform_osx=no
|
||||
+ platform_haiku=no
|
||||
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
||||
;;
|
||||
esac
|
||||
AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes")
|
||||
AM_CONDITIONAL(PLATFORM_OSX, test x"$platform_osx" = x"yes")
|
||||
+AM_CONDITIONAL(PLATFORM_HAIKU, test x"$platform_haiku" = x"yes")
|
||||
AC_MSG_RESULT([$host])
|
||||
|
||||
AC_MSG_CHECKING([for native Win32])
|
||||
@@ -228,6 +236,10 @@ case "$target" in
|
||||
AM_CFLAGS="$AM_CFLAGS -std=gnu99"
|
||||
AC_DEFINE([SOLARIS], [], [Target is Solaris])
|
||||
;;
|
||||
+*-*-haiku*)
|
||||
+ AC_DEFINE([HAIKU], [], [Target is Haiku])
|
||||
+ LIBS="$LIBS -lroot -lnetwork"
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
AC_SUBST(AM_CFLAGS)
|
||||
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
|
||||
index a9a5453..020f59f 100644
|
||||
--- a/src/etpan/imap-thread.c
|
||||
+++ b/src/etpan/imap-thread.c
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <imap.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__))
|
||||
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__HAIKU__))
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
|
||||
index 65e794a..e4975a5 100644
|
||||
--- a/src/etpan/nntp-thread.c
|
||||
+++ b/src/etpan/nntp-thread.c
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "news.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__))
|
||||
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__HAIKU__))
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
--
|
||||
2.30.2
|
||||
|
||||
159
mail-client/claws-mail/patches/claws_mail-4.1.1.patchset
Normal file
159
mail-client/claws-mail/patches/claws_mail-4.1.1.patchset
Normal file
@@ -0,0 +1,159 @@
|
||||
From c058fd371d6170e375c5b89ddea02c4cd5d29228 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 28 Oct 2022 21:52:55 +1000
|
||||
Subject: Add support for Haiku
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f0fe8f2..963897d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -139,14 +139,20 @@ case "$host" in
|
||||
platform_osx=yes
|
||||
LDFLAGS="$LDFLAGS -Wl,-export_dynamic"
|
||||
;;
|
||||
+ *-haiku-*)
|
||||
+ platform_haiku=yes
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-export_dynamic"
|
||||
+ ;;
|
||||
*)
|
||||
platform_win32=no
|
||||
platform_osx=no
|
||||
+ platform_haiku=no
|
||||
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
||||
;;
|
||||
esac
|
||||
AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes")
|
||||
AM_CONDITIONAL(PLATFORM_OSX, test x"$platform_osx" = x"yes")
|
||||
+AM_CONDITIONAL(PLATFORM_HAIKU, test x"$platform_haiku" = x"yes")
|
||||
AC_MSG_RESULT([$host])
|
||||
|
||||
AC_MSG_CHECKING([for native Win32])
|
||||
@@ -226,6 +232,10 @@ case "$target" in
|
||||
AM_CFLAGS="$AM_CFLAGS -std=gnu99"
|
||||
AC_DEFINE([SOLARIS], [], [Target is Solaris])
|
||||
;;
|
||||
+*-*-haiku*)
|
||||
+ AC_DEFINE([HAIKU], [], [Target is Haiku])
|
||||
+ LIBS="$LIBS -lroot -lnetwork"
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
AC_SUBST(AM_CFLAGS)
|
||||
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
|
||||
index 973656c..89a3ecd 100644
|
||||
--- a/src/etpan/imap-thread.c
|
||||
+++ b/src/etpan/imap-thread.c
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <imap.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__))
|
||||
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__HAIKU__))
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
|
||||
index 76020ca..5b95819 100644
|
||||
--- a/src/etpan/nntp-thread.c
|
||||
+++ b/src/etpan/nntp-thread.c
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "news.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__))
|
||||
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__HAIKU__))
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 457eadacaee02657bf329c4f956ddd34daf4a3ee Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 19 Nov 2022 10:29:03 +1000
|
||||
Subject: Dirty hack for XDG variables
|
||||
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index a9351b0..7f8d72c 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -1072,6 +1072,14 @@ int main(int argc, char *argv[])
|
||||
|
||||
sc_starting = TRUE;
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ g_setenv ("XDG_CONFIG_DIRS", "/boot/system/settings", FALSE);
|
||||
+ g_setenv ("XDG_DATA_HOME", "/boot/home/config/non-packaged/data", FALSE);
|
||||
+ g_setenv ("XDG_CONFIG_HOME", "/boot/home/config/settings", FALSE);
|
||||
+ g_setenv ("XDG_CACHE_HOME", "/boot/home/config/cache", FALSE);
|
||||
+ g_setenv ("XDG_DATA_DIRS", "/boot/system/non-packaged/data:/boot/system/data", FALSE);
|
||||
+#endif
|
||||
+
|
||||
#ifdef G_OS_WIN32
|
||||
win32_open_log();
|
||||
#endif
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 503203d5575e5a2e8fb866707facddaf5d6be605 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 19 Nov 2022 10:30:39 +1000
|
||||
Subject: Disable socket communication with external editor
|
||||
|
||||
|
||||
diff --git a/src/compose.c b/src/compose.c
|
||||
index 5908f9d..7bd9c2e 100644
|
||||
--- a/src/compose.c
|
||||
+++ b/src/compose.c
|
||||
@@ -374,7 +374,7 @@ static void compose_set_ext_editor_sensitive (Compose *compose,
|
||||
gboolean sensitive);
|
||||
static gboolean compose_get_ext_editor_cmd_valid();
|
||||
static gboolean compose_get_ext_editor_uses_socket();
|
||||
-#ifndef G_OS_WIN32
|
||||
+#if !defined(G_OS_WIN32) && !defined(__HAIKU__)
|
||||
static gboolean compose_ext_editor_plug_removed_cb
|
||||
(GtkSocket *socket,
|
||||
Compose *compose);
|
||||
@@ -9630,7 +9630,7 @@ static gboolean compose_can_autosave(Compose *compose)
|
||||
static void compose_exec_ext_editor(Compose *compose)
|
||||
{
|
||||
gchar *tmp;
|
||||
-#ifndef G_OS_WIN32
|
||||
+#if !defined(G_OS_WIN32) && !defined(__HAIKU__)
|
||||
GtkWidget *socket;
|
||||
Window socket_wid = 0;
|
||||
gchar *p, *s;
|
||||
@@ -9651,7 +9651,7 @@ static void compose_exec_ext_editor(Compose *compose)
|
||||
}
|
||||
|
||||
if (compose_get_ext_editor_uses_socket()) {
|
||||
-#ifndef G_OS_WIN32
|
||||
+#if !defined(G_OS_WIN32) && !defined(__HAIKU__)
|
||||
/* Only allow one socket */
|
||||
if (compose->exteditor_socket != NULL) {
|
||||
if (gtk_widget_is_focus(compose->exteditor_socket)) {
|
||||
@@ -9681,7 +9681,7 @@ static void compose_exec_ext_editor(Compose *compose)
|
||||
|
||||
if (compose_get_ext_editor_cmd_valid()) {
|
||||
if (compose_get_ext_editor_uses_socket()) {
|
||||
-#ifndef G_OS_WIN32
|
||||
+#if !defined(G_OS_WIN32) && !defined(__HAIKU__)
|
||||
p = g_strdup(prefs_common_get_ext_editor_cmd());
|
||||
s = strstr(p, "%w");
|
||||
s[1] = 'u';
|
||||
@@ -9946,7 +9946,7 @@ static gboolean compose_get_ext_editor_uses_socket()
|
||||
strstr(prefs_common_get_ext_editor_cmd(), "%w"));
|
||||
}
|
||||
|
||||
-#ifndef G_OS_WIN32
|
||||
+#if !defined(G_OS_WIN32) && !defined(__HAIKU__)
|
||||
static gboolean compose_ext_editor_plug_removed_cb(GtkSocket *socket, Compose *compose)
|
||||
{
|
||||
compose->exteditor_socket = NULL;
|
||||
--
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user