Browse Source

Merge remote-tracking branch 'freebsd/master'

* freebsd/master:
  science/pulseview: prepare for Qt5-5.15
  sysutils/password-store: fix package name for QRENCODE option
  net-p2p/retroshare: prepare for Qt5-5.15
  net-p2p/litecoin: prepare for Qt5-5.15
  - Update WWW
  editors/calligraplan: prepare for Qt5-5.15
  science/py-spglib: Update 1.14.1 -> 1.15.1
  www/py-internetarchive: Update 1.9.0 -> 1.9.3
  devel/py-fypp: Update 2.1.1 -> 3.0
  Update to version 2.1.5.
  biology/abyss: Update 2.2.3 -> 2.2.4
  deskutils/calibre: prepare for Qt5-5.15
  - fix build with mariadb 10.4
  Add patch to correctly set wsdd_group in rc.d script
  desktuils/owncloudclient: prepare for Qt5-5.15
master
HardenedBSD Sync Service 1 month ago
parent
commit
0f3b7f93f1
25 changed files with 176 additions and 30 deletions
  1. +1
    -2
      biology/abyss/Makefile
  2. +3
    -3
      biology/abyss/distinfo
  3. +46
    -2
      databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
  4. +3
    -0
      deskutils/calibre/Makefile
  5. +3
    -1
      deskutils/calibre/distinfo
  6. +10
    -0
      deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp
  7. +1
    -2
      devel/py-fypp/Makefile
  8. +3
    -3
      devel/py-fypp/distinfo
  9. +10
    -0
      editors/calligraplan/files/patch-src_libs_ui_kptganttitemdelegate.cpp
  10. +10
    -0
      net-p2p/litecoin/files/patch-src_qt_trafficgraphwidget.h
  11. +2
    -1
      net-p2p/retroshare/Makefile
  12. +10
    -0
      net-p2p/retroshare/files/patch-retroshare-gui_src_gui_elastic_node.cpp
  13. +10
    -0
      net-p2p/retroshare/files/patch-retroshare-gui_src_gui_gxs_GxsCommentTreeWidget.cpp
  14. +10
    -0
      net-p2p/retroshare/files/patch-retroshare-gui_src_gui_gxs_GxsIdDetails.cpp
  15. +1
    -1
      net/haproxy21/Makefile
  16. +3
    -3
      net/haproxy21/distinfo
  17. +1
    -0
      net/py-wsdd/Makefile
  18. +19
    -0
      net/py-wsdd/files/patch-etc_rc.d_wsdd
  19. +20
    -0
      science/pulseview/files/patch-pv_util.cpp
  20. +1
    -2
      science/py-spglib/Makefile
  21. +3
    -3
      science/py-spglib/distinfo
  22. +1
    -1
      security/greenbone-security-assistant8/pkg-descr
  23. +1
    -1
      sysutils/password-store/Makefile
  24. +1
    -2
      www/py-internetarchive/Makefile
  25. +3
    -3
      www/py-internetarchive/distinfo

+ 1
- 2
biology/abyss/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= abyss
DISTVERSION= 2.2.3
PORTREVISION= 1
DISTVERSION= 2.2.4
CATEGORIES= biology

MAINTAINER= yuri@FreeBSD.org

+ 3
- 3
biology/abyss/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1578886491
SHA256 (bcgsc-abyss-2.2.3_GH0.tar.gz) = c7b93290b2ccffcf2f3ca42262621c636108f6dbc21f5684ebeeb4f682200675
SIZE (bcgsc-abyss-2.2.3_GH0.tar.gz) = 1203318
TIMESTAMP = 1590829348
SHA256 (bcgsc-abyss-2.2.4_GH0.tar.gz) = 0b3265506d448cad5bbfe16b7b3cbd88c51a9c02a96ce1ddcd0389836c317d5a
SIZE (bcgsc-abyss-2.2.4_GH0.tar.gz) = 1204110

+ 46
- 2
databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c View File

@@ -1,6 +1,50 @@
--- ext/mysql_api/mysql.c.orig 2018-01-03 15:47:52 UTC
--- ext/mysql_api/mysql.c.orig 2020-05-29 23:08:40 UTC
+++ ext/mysql_api/mysql.c
@@ -1317,7 +1317,7 @@ static VALUE stmt_bind_result(int argc,
@@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE
rb_thread_start_timer();
#endif
+#if MYSQL_VERSION_ID >= 100400
+#else
myp->handler.reconnect = 0;
+#endif
myp->connection = Qtrue;
myp->query_with_result = Qtrue;
rb_obj_call_init(obj, argc, argv);
@@ -347,7 +350,10 @@ static VALUE real_connect2(int argc, VALUE* argv, VALU
#ifdef HAVE_RB_THREAD_START_TIMER
rb_thread_start_timer();
#endif
+#if MYSQL_VERSION_ID >= 100400
+#else
m->reconnect = 0;
+#endif
GetMysqlStruct(obj)->connection = Qtrue;
return obj;
@@ -917,13 +923,21 @@ static VALUE query_with_result_set(VALUE obj, VALUE fl
/* reconnect() */
static VALUE reconnect(VALUE obj)
{
+#if MYSQL_VERSION_ID >= 100400
+ return Qfalse;
+#else
return GetHandler(obj)->reconnect ? Qtrue : Qfalse;
+#endif
}
/* reconnect=(flag) */
static VALUE reconnect_set(VALUE obj, VALUE flag)
{
+#if MYSQL_VERSION_ID >= 100400
+ return Qfalse;
+#else
GetHandler(obj)->reconnect = (flag == Qnil || flag == Qfalse) ? 0 : 1;
+#endif
return flag;
}
@@ -1317,7 +1331,7 @@ static VALUE stmt_bind_result(int argc, VALUE *argv, V
}
else if (argv[i] == rb_cString)
s->result.bind[i].buffer_type = MYSQL_TYPE_STRING;

+ 3
- 0
deskutils/calibre/Makefile View File

@@ -6,6 +6,9 @@ PORTVERSION= 4.17.0
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/

PATCH_SITES= https://github.com/kovidgoyal/calibre/commit/
PATCHFILES= db7007a25faefb0cc90e64dda1c0793393b9512d.patch:-p1

MAINTAINER= madpilot@FreeBSD.org
COMMENT= Ebook management application


+ 3
- 1
deskutils/calibre/distinfo View File

@@ -1,3 +1,5 @@
TIMESTAMP = 1590221348
TIMESTAMP = 1590828111
SHA256 (calibre-4.17.0.tar.xz) = aada09db377ef7f36253afd9458314f6c6c015f92b8630be00e11585b0e8ffe1
SIZE (calibre-4.17.0.tar.xz) = 37027156
SHA256 (db7007a25faefb0cc90e64dda1c0793393b9512d.patch) = ffd7aa6dab196420843064cd29454b56aa8c8bd014af3adc734b4f45f3c3baa7
SIZE (db7007a25faefb0cc90e64dda1c0793393b9512d.patch) = 1222

+ 10
- 0
deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp View File

@@ -0,0 +1,10 @@
--- src/libsync/networkjobs.cpp.orig 2020-05-30 08:02:56 UTC
+++ src/libsync/networkjobs.cpp
@@ -31,6 +31,7 @@
#include <QJsonObject>
#ifndef TOKEN_AUTH_ONLY
#include <QPainter>
+#include <QPainterPath>
#endif
#include "networkjobs.h"

+ 1
- 2
devel/py-fypp/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= fypp
PORTVERSION= 2.1.1
PORTREVISION= 1
DISTVERSION= 3.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

+ 3
- 3
devel/py-fypp/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1541006395
SHA256 (fypp-2.1.1.tar.gz) = a0dad193bce4420927953dbd2068cb9fbfdb0bc0a161bafca366b1ed87cb954c
SIZE (fypp-2.1.1.tar.gz) = 65021
TIMESTAMP = 1590829885
SHA256 (fypp-3.0.tar.gz) = 157f3d22d78f5869dea85712a469eaf087c46febd2e36135bdbca60c15034f54
SIZE (fypp-3.0.tar.gz) = 63779

+ 10
- 0
editors/calligraplan/files/patch-src_libs_ui_kptganttitemdelegate.cpp View File

@@ -0,0 +1,10 @@
--- src/libs/ui/kptganttitemdelegate.cpp.orig 2020-05-30 09:10:49 UTC
+++ src/libs/ui/kptganttitemdelegate.cpp
@@ -28,6 +28,7 @@
#include <QModelIndex>
#include <QApplication>
#include <QPainter>
+#include <QPainterPath>
#include <QLocale>
#include <KLocalizedString>

+ 10
- 0
net-p2p/litecoin/files/patch-src_qt_trafficgraphwidget.h View File

@@ -0,0 +1,10 @@
--- src/qt/trafficgraphwidget.h.orig 2020-05-30 09:38:07 UTC
+++ src/qt/trafficgraphwidget.h
@@ -7,6 +7,7 @@
#include <QWidget>
#include <QQueue>
+#include <QPainterPath>
class ClientModel;

+ 2
- 1
net-p2p/retroshare/Makefile View File

@@ -38,7 +38,8 @@ USE_GNOME= libxml2 libxslt
USE_GL= gl
USE_QT= core gui multimedia printsupport network widgets xml \
buildtools_build uitools_build
DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro
DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro \
retroshare-gui/src/gui/elastic/node.cpp

.include <bsd.port.pre.mk>


+ 10
- 0
net-p2p/retroshare/files/patch-retroshare-gui_src_gui_elastic_node.cpp View File

@@ -0,0 +1,10 @@
--- retroshare-gui/src/gui/elastic/node.cpp.orig 2020-05-30 09:39:55 UTC
+++ retroshare-gui/src/gui/elastic/node.cpp
@@ -45,6 +45,7 @@
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QAction>
#include <QMenu>
#include <QStyleOption>

+ 10
- 0
net-p2p/retroshare/files/patch-retroshare-gui_src_gui_gxs_GxsCommentTreeWidget.cpp View File

@@ -0,0 +1,10 @@
--- retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp.orig 2020-05-30 09:39:55 UTC
+++ retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -28,6 +28,7 @@
#include <QMenu>
#include <QMimeData>
#include <QPainter>
+#include <QPainterPath>
#include <QTextDocument>
#include "gui/common/RSElidedItemDelegate.h"

+ 10
- 0
net-p2p/retroshare/files/patch-retroshare-gui_src_gui_gxs_GxsIdDetails.cpp View File

@@ -0,0 +1,10 @@
--- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp.orig 2020-05-30 09:39:55 UTC
+++ retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
@@ -34,6 +34,7 @@
#include <iostream>
#include <QPainter>
+#include <QPainterPath>
/* Images for tag icons */
#define IMAGE_LOADING ":/images/folder-draft.png"

+ 1
- 1
net/haproxy21/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= haproxy
DISTVERSION= 2.1.4
DISTVERSION= 2.1.5
CATEGORIES= net www
PKGNAMESUFFIX= 21
MASTER_SITES= http://www.haproxy.org/download/2.1/src/

+ 3
- 3
net/haproxy21/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1585836483
SHA256 (haproxy-2.1.4.tar.gz) = 51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd
SIZE (haproxy-2.1.4.tar.gz) = 2684568
TIMESTAMP = 1590829826
SHA256 (haproxy-2.1.5.tar.gz) = 42174ac5836ab243565b888299ec30115c1259e75872696708528260c6700ea1
SIZE (haproxy-2.1.5.tar.gz) = 2708469

+ 1
- 0
net/py-wsdd/Makefile View File

@@ -3,6 +3,7 @@
PORTNAME= wsdd
DISTVERSIONPREFIX= v
DISTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}


+ 19
- 0
net/py-wsdd/files/patch-etc_rc.d_wsdd View File

@@ -0,0 +1,19 @@
--- etc/rc.d/wsdd.orig 2019-12-16 13:40:38 UTC
+++ etc/rc.d/wsdd
@@ -9,14 +9,11 @@
name=wsdd
rcvar=wsdd_enable
-wsdd_group=""
+wsdd_group=$(/usr/local/bin/testparm -s --parameter-name workgroup 2>/dev/null)
-if which testparm >/dev/null 2>/dev/null; then
- wsdd_group=$(testparm -s --parameter-name workgroup 2>/dev/null)
-fi
+: ${wsdd_smb_config_file="/usr/local/etc/smb4.conf"}
# try to manually extract workgroup from samba configuration if testparm failed
-wsdd_smb_config_file="/usr/local/etc/smb.conf"
if [ -z "$wsdd_group" ] && [ -r $wsdd_smb_config_file ]; then
wsdd_group="$(grep -i '^[[:space:]]*workgroup[[:space:]]*=' $wsdd_smb_config_file | cut -f2 -d= | tr -d '[:blank:]')"
fi

+ 20
- 0
science/pulseview/files/patch-pv_util.cpp View File

@@ -0,0 +1,20 @@
--- pv/util.cpp.orig 2020-05-30 09:57:56 UTC
+++ pv/util.cpp
@@ -137,7 +137,7 @@ QString format_time_si(const Timestamp& v, SIPrefix pr
QString s;
QTextStream ts(&s);
if (sign && !v.is_zero())
- ts << forcesign;
+ ts << Qt::forcesign;
ts << qSetRealNumberPrecision(precision) << (v * multiplier);
ts << ' ' << prefix << unit;
@@ -175,7 +175,7 @@ QString format_value_si(double v, SIPrefix prefix, uns
QString s;
QTextStream ts(&s);
if (sign && (v != 0))
- ts << forcesign;
+ ts << Qt::forcesign;
ts.setRealNumberNotation(QTextStream::FixedNotation);
ts.setRealNumberPrecision(precision);
ts << (v * multiplier) << ' ' << prefix << unit;

+ 1
- 2
science/py-spglib/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= spglib
DISTVERSION= 1.14.1
DISTVERSIONSUFFIX= .post0
DISTVERSION= 1.15.1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

+ 3
- 3
science/py-spglib/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1567264229
SHA256 (spglib-1.14.1.post0.tar.gz) = 1823aa0a10c0cde0504c8dae8c0012591e5334fd38e21c3bf540dc0219a3b44e
SIZE (spglib-1.14.1.post0.tar.gz) = 694833
TIMESTAMP = 1590830156
SHA256 (spglib-1.15.1.tar.gz) = 7d4dbbcad0c3aec3d5f9204b4d7d3edffbc478378353a45e0f66785eda5d3630
SIZE (spglib-1.15.1.tar.gz) = 699060

+ 1
- 1
security/greenbone-security-assistant8/pkg-descr View File

@@ -5,4 +5,4 @@ scanning and vulnerability management solution.
This package contains the Greenbone Security Assistant, a web interface for
the OpenVAS Manager.

WWW: http://www.openvas.org/
WWW: https://www.openvas.org/

+ 1
- 1
sysutils/password-store/Makefile View File

@@ -35,7 +35,7 @@ GIT_RUN_DEPENDS= git>=0:devel/git
XCLIP_RUN_DEPENDS= base64>=0:converters/base64 \
xclip>=0:x11/xclip
CONTRIB_RUN_DEPENDS= pwgen>=0:sysutils/pwgen
QRENCODE_RUN_DEPENDS= qrencode>=0:graphics/libqrencode
QRENCODE_RUN_DEPENDS= libqrencode>=0:graphics/libqrencode

SUB_FILES= pass


+ 1
- 2
www/py-internetarchive/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= internetarchive
DISTVERSION= 1.9.0
PORTREVISION= 1
DISTVERSION= 1.9.3
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

+ 3
- 3
www/py-internetarchive/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1577608052
SHA256 (internetarchive-1.9.0.tar.gz) = 42bb60228d5fe604c1f4f4426eca458179c71241c325e3cbc0acfbd84504a95c
SIZE (internetarchive-1.9.0.tar.gz) = 82111
TIMESTAMP = 1590829959
SHA256 (internetarchive-1.9.3.tar.gz) = bad1c4152fb6286ce7c77737a853bb4e45bcefb89ca5834d75607419f08cb6fe
SIZE (internetarchive-1.9.3.tar.gz) = 84107

Loading…
Cancel
Save