svn commit: r489853 - in branches/2019Q1/mail: claws-mail claws-mail-python claws-mail/files
Jochen Neumeister
joneum at FreeBSD.org
Thu Jan 10 08:44:52 UTC 2019
Author: joneum
Date: Thu Jan 10 08:44:49 2019
New Revision: 489853
URL: https://svnweb.freebsd.org/changeset/ports/489853
Log:
MFH: r489852
- Switch to python3 and fix build
- Unbreak mail/claws-mail-python
Submitted by: mmokhi
Sponsored by: Netzkommune GmbH
Differential Revision: https://reviews.freebsd.org/D18800
Approved by: portmgr (blanket: build fix)
Added:
branches/2019Q1/mail/claws-mail/files/patch-configure.ac
- copied unchanged from r489852, head/mail/claws-mail/files/patch-configure.ac
branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c
- copied unchanged from r489852, head/mail/claws-mail/files/patch-src_plugins_python_accounttype.c
branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c
- copied unchanged from r489852, head/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c
branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c
- copied unchanged from r489852, head/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c
branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c
- copied unchanged from r489852, head/mail/claws-mail/files/patch-src_plugins_python_foldertype.c
branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c
- copied unchanged from r489852, head/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c
branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c
- copied unchanged from r489852, head/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c
Modified:
branches/2019Q1/mail/claws-mail-python/Makefile
branches/2019Q1/mail/claws-mail/Makefile
branches/2019Q1/mail/claws-mail/Makefile.claws
Directory Properties:
branches/2019Q1/ (props changed)
Modified: branches/2019Q1/mail/claws-mail-python/Makefile
==============================================================================
--- branches/2019Q1/mail/claws-mail-python/Makefile Thu Jan 10 08:35:25 2019 (r489852)
+++ branches/2019Q1/mail/claws-mail-python/Makefile Thu Jan 10 08:44:49 2019 (r489853)
@@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= python
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= Python scripting plugin for Claws Mail
-
-BROKEN= fails to stage
USE_GNOME= pygtk2
Modified: branches/2019Q1/mail/claws-mail/Makefile
==============================================================================
--- branches/2019Q1/mail/claws-mail/Makefile Thu Jan 10 08:35:25 2019 (r489852)
+++ branches/2019Q1/mail/claws-mail/Makefile Thu Jan 10 08:44:49 2019 (r489853)
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= claws-mail
+PORTREVISION= 1
CATEGORIES= mail news ipv6
COMMENT= Lightweight and featureful GTK+ based e-mail and news client
@@ -20,8 +21,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libnettle.so:security/nettle
RUN_DEPENDS= mime-support>0:misc/mime-support
-USES= compiler:c++11-lang cpe desktop-file-utils gnome pathfix \
- python:2.7 shebangfix ssl
+USES= autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix \
+ python:3.6 shebangfix ssl
USE_XORG= ice sm
USE_GNOME= cairo gtk20 librsvg2
SHEBANG_FILES= tools/*.pl tools/*.py tools/tb2claws-mail
Modified: branches/2019Q1/mail/claws-mail/Makefile.claws
==============================================================================
--- branches/2019Q1/mail/claws-mail/Makefile.claws Thu Jan 10 08:35:25 2019 (r489852)
+++ branches/2019Q1/mail/claws-mail/Makefile.claws Thu Jan 10 08:44:49 2019 (r489853)
@@ -8,7 +8,7 @@ MAINTAINER= joneum at FreeBSD.org
LICENSE= GPLv3
-USES+= gettext-runtime gmake iconv libtool pkgconfig tar:xz
+USES+= autoreconf gettext-tools gmake iconv libtool pkgconfig tar:xz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
Copied: branches/2019Q1/mail/claws-mail/files/patch-configure.ac (from r489852, head/mail/claws-mail/files/patch-configure.ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-configure.ac Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-configure.ac)
@@ -0,0 +1,20 @@
+--- configure.ac.orig 2019-01-08 23:08:21 UTC
++++ configure.ac
+@@ -1268,7 +1268,7 @@ fi
+
+ dnl Python *********************************************************************
+ AM_PATH_PYTHON([2.5], [
+- AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
++ AC_PATH_PROG(PYTHON_CONFIG, python"$PYTHON_VERSION"m-config)
+ if test x"$PYTHON_CONFIG" = x"" ; then
+ AC_PATH_PROG(PYTHON_CONFIG, python-config)
+ fi
+@@ -1286,7 +1286,7 @@ AM_PATH_PYTHON([2.5], [
+ _save_libs="$LIBS"
+ if test x"$platform_win32" = xno; then
+ # libpython.so
+- PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
++ PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}m.so"
+ AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl"])
+ AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
+ AC_RUN_IFELSE(
Copied: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c (from r489852, head/mail/claws-mail/files/patch-src_plugins_python_accounttype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_accounttype.c Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-src_plugins_python_accounttype.c)
@@ -0,0 +1,22 @@
+--- src/plugins/python/accounttype.c.orig 2018-09-10 13:00:33 UTC
++++ src/plugins/python/accounttype.c
+@@ -24,6 +24,10 @@
+
+ #include <structmember.h>
+
++#if PY_MAJOR_VERSION == 3
++typedef int (*cmpfunc)(PyObject *, PyObject *);
++#endif
++
+ typedef struct {
+ PyObject_HEAD
+ PrefsAccount *account;
+@@ -38,7 +42,7 @@ static int Account_init(clawsmail_Accoun
+
+ static void Account_dealloc(clawsmail_AccountObject* self)
+ {
+- self->ob_type->tp_free((PyObject*)self);
++ Py_TYPE(self)->tp_free((PyObject*)self);
+ }
+
+ static int Account_compare(clawsmail_AccountObject *obj1, clawsmail_AccountObject *obj2)
Copied: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c (from r489852, head/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-src_plugins_python_composewindowtype.c)
@@ -0,0 +1,20 @@
+--- src/plugins/python/composewindowtype.c.orig 2019-01-09 18:38:06 UTC
++++ src/plugins/python/composewindowtype.c
+@@ -54,7 +54,7 @@ static void ComposeWindow_dealloc(clawsm
+ Py_XDECREF(self->text);
+ Py_XDECREF(self->replyinfo);
+ Py_XDECREF(self->fwdinfo);
+- self->ob_type->tp_free((PyObject*)self);
++ Py_TYPE(self)->tp_free((PyObject*)self);
+ }
+
+ static void flush_gtk_queue(void)
+@@ -345,7 +345,7 @@ static PyObject* ComposeWindow_set_heade
+ headerfield = PyTuple_GetItem(element, 0);
+ headercontent = PyTuple_GetItem(element, 1);
+ if(!headerfield || !headercontent
+- || !PyObject_TypeCheck(headerfield, &PyString_Type) || !PyObject_TypeCheck(headercontent, &PyString_Type)) {
++ || !PyObject_TypeCheck(headerfield, &PyBytes_Type) || !PyObject_TypeCheck(headercontent, &PyBytes_Type)) {
+ PyErr_SetString(PyExc_LookupError, "Argument to set_header_list() must be a list of tuples with two strings");
+ return NULL;
+ }
Copied: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c (from r489852, head/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-src_plugins_python_folderpropertiestype.c)
@@ -0,0 +1,11 @@
+--- src/plugins/python/folderpropertiestype.c.orig 2019-01-09 18:47:36 UTC
++++ src/plugins/python/folderpropertiestype.c
+@@ -38,7 +38,7 @@ static int FolderProperties_init(clawsma
+
+ static void FolderProperties_dealloc(clawsmail_FolderPropertiesObject* self)
+ {
+- self->ob_type->tp_free((PyObject*)self);
++ Py_TYPE(self)->tp_free((PyObject*)self);
+ }
+
+ static PyObject* get_default_account(clawsmail_FolderPropertiesObject *self, void *closure)
Copied: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c (from r489852, head/mail/claws-mail/files/patch-src_plugins_python_foldertype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_foldertype.c Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-src_plugins_python_foldertype.c)
@@ -0,0 +1,11 @@
+--- src/plugins/python/foldertype.c.orig 2019-01-09 18:47:36 UTC
++++ src/plugins/python/foldertype.c
+@@ -40,7 +40,7 @@ typedef struct {
+ static void Folder_dealloc(clawsmail_FolderObject* self)
+ {
+ Py_XDECREF(self->properties);
+- self->ob_type->tp_free((PyObject*)self);
++ Py_TYPE(self)->tp_free((PyObject*)self);
+ }
+
+ static int Folder_init(clawsmail_FolderObject *self, PyObject *args, PyObject *kwds)
Copied: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c (from r489852, head/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-src_plugins_python_mailboxtype.c)
@@ -0,0 +1,11 @@
+--- src/plugins/python/mailboxtype.c.orig 2019-01-09 18:47:36 UTC
++++ src/plugins/python/mailboxtype.c
+@@ -41,7 +41,7 @@ static int Mailbox_init(clawsmail_Mailbo
+ static void Mailbox_dealloc(clawsmail_MailboxObject* self)
+ {
+ self->folder = NULL;
+- self->ob_type->tp_free((PyObject*)self);
++ Py_TYPE(self)->tp_free((PyObject*)self);
+ }
+
+ static PyObject* Mailbox_str(clawsmail_MailboxObject *self)
Copied: branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c (from r489852, head/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c Thu Jan 10 08:44:49 2019 (r489853, copy of r489852, head/mail/claws-mail/files/patch-src_plugins_python_messageinfotype.c)
@@ -0,0 +1,11 @@
+--- src/plugins/python/messageinfotype.c.orig 2019-01-09 18:47:36 UTC
++++ src/plugins/python/messageinfotype.c
+@@ -43,7 +43,7 @@ typedef struct {
+
+ static void MessageInfo_dealloc(clawsmail_MessageInfoObject* self)
+ {
+- self->ob_type->tp_free((PyObject*)self);
++ Py_TYPE(self)->tp_free((PyObject*)self);
+ }
+
+ static int MessageInfo_init(clawsmail_MessageInfoObject *self, PyObject *args, PyObject *kwds)
More information about the svn-ports-all
mailing list