From nobody Wed Feb 19 06:56:06 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YyRxf6wc3z5nvCY; Wed, 19 Feb 2025 06:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyRxf681cz3G5S; Wed, 19 Feb 2025 06:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739948166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfzv8og5tOS3fM/q0mKgpP1sQpzdIy97zCy2UwNkM5A=; b=ttAPp15s/32C0LI8tniGFbAT7Kk2Gdgmt0fNVBUAnu1chh4bKMEl9qxRTN55ijoAkZvgCm /F0qw22kJTNDj9CL7PQUbTCrC3Eab5xusqkBU/SKygGTErULSNcUXCPxdZJLpBhQ7rtrJH 2ck0xZmrA5vkF6i4lqfsXVE2vuxwU7qDKlGWqjcaAWibvmEOFqygSIOR/cFGDV2afhLwvg OmMSXAlDVPHRfHFuG5eEdILwDxSE/G+Klb4m+ye6YDlyJKqoAnhhWR6DhWecdwmpMcjneU 2kEsqJRI87iRCexX1LlC/ZxFvT7uY0Qlvt3Cp7uomC58nfxW9foUYjHdDSwqbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739948166; a=rsa-sha256; cv=none; b=QHOgGkHiqAqqWNMM2EsBOtG3EzLZiKagPgFThxYvj8cIYrOvBN3BdCXKZsFrsiMH48Hyow xHOElqiQllBjof/pQYn6F6QhMozXFswItpKxWNygicuCm78T2SvgxiGWKo9t1e3q/5TWAZ GoMcxb4vCAy6Rrhb4FUtBTE7NvQUTDm1Pe+Z3EOm4/PmEq9Yi4F/+bM5g91j8VGxDII0Ic keV54ZJzEgefV/EZxEksGyckInk1/U5iwQ1jfOUsIOQ87aoylUsHQv8YiCrHzhxmPQw7/6 ae/lSODrrTzontl+LRmiJL4qqaNbDVuQgVxlHo6B9bDe1GeRpE1HT3MtA/WRqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739948166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfzv8og5tOS3fM/q0mKgpP1sQpzdIy97zCy2UwNkM5A=; b=hJ3j5/euaDngqJayJ1KKVZc1UZwtJ2vtbNfU78yFaZPyMmtJqSxxmmFEAOdQ5sosSIp4F/ D1fItsZRNyUm6B3upceUdr9R0bUHdGIKebnoq63JA+sTOGIZImysZVc76LyBTCwjKk1cKb uaLSqTvMfB/B+Y42WBEJM1aR1i9yJXmWHPrMWtx4nUly6VX9BIDPixPp/sz9ccN6pUY4vS YGaWezmcu+Hxb5yIWJEZrzA1P7Qw4uaLP3fYjxDPWNMWVaAHDNX3USWDsrZt4QoFR6Cn4m DGE9CgVKd6Sc42nXXETATa7wvpOArmafrbLuwZRosca2GlJIVjttc/ODywxApA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YyRxf5VvrzvW7; Wed, 19 Feb 2025 06:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51J6u6IP099040; Wed, 19 Feb 2025 06:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51J6u65H099037; Wed, 19 Feb 2025 06:56:06 GMT (envelope-from git) Date: Wed, 19 Feb 2025 06:56:06 GMT Message-Id: <202502190656.51J6u65H099037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 27c06632a2fe - main - deskutils/mybee-qt: Update to version 25.02.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27c06632a2fea56c3fd3d697e95ce0cb0c0bc00f Auto-Submitted: auto-generated The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=27c06632a2fea56c3fd3d697e95ce0cb0c0bc00f commit 27c06632a2fea56c3fd3d697e95ce0cb0c0bc00f Author: Kirill Ponomarev AuthorDate: 2025-02-19 06:55:46 +0000 Commit: Kirill Ponomarev CommitDate: 2025-02-19 06:55:46 +0000 deskutils/mybee-qt: Update to version 25.02.1 Changes: https://github.com/myb-project/mybee-qt/releases/tag/v25.02.1 --- deskutils/mybee-qt/Makefile | 8 +++++--- deskutils/mybee-qt/distinfo | 6 +++--- deskutils/mybee-qt/files/patch-mybee-qt.pro | 10 ++++++---- deskutils/mybee-qt/files/patch-src_src.pro | 31 ++++++++++++++++++----------- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/deskutils/mybee-qt/Makefile b/deskutils/mybee-qt/Makefile index 084939ade014..77f1ebb8bde8 100644 --- a/deskutils/mybee-qt/Makefile +++ b/deskutils/mybee-qt/Makefile @@ -1,5 +1,5 @@ PORTNAME= mybee-qt -DISTVERSION= 25.01.5 +DISTVERSION= 25.02.1 CATEGORIES= deskutils MAINTAINER= fbsd-ports@convectix.com @@ -13,15 +13,17 @@ BUILD_DEPENDS= curl:ftp/curl \ xfreerdp:net/freerdp LIB_DEPENDS= libvncserver.so:net/libvncserver \ libfreerdp2.so:net/freerdp \ + libturbojpeg.so:graphics/libjpeg-turbo \ libwinpr2.so:net/freerdp \ - libssh.so:security/libssh + libssh.so:security/libssh \ + libz-ng.so:archivers/zlib-ng RUN_DEPENDS= xfreerdp:net/freerdp USES= gl gmake qmake qt:6 USE_GITHUB= yes GH_ACCOUNT= myb-project -GH_TAGNAME= 6955032 +#GH_TAGNAME= 6955032 USE_GL= gl USE_QT= 5compat base multimedia tools:build diff --git a/deskutils/mybee-qt/distinfo b/deskutils/mybee-qt/distinfo index 656342ee9e8b..68c339533a4d 100644 --- a/deskutils/mybee-qt/distinfo +++ b/deskutils/mybee-qt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737743875 -SHA256 (myb-project-mybee-qt-25.01.5-6955032_GH0.tar.gz) = bde7212cc2a9099083a5b8f73a5f7c4a23351fbdd49ebf2242e798f2b1942cc6 -SIZE (myb-project-mybee-qt-25.01.5-6955032_GH0.tar.gz) = 3878705 +TIMESTAMP = 1739729378 +SHA256 (myb-project-mybee-qt-25.02.1_GH0.tar.gz) = ac9b7acaae0b197f620b324731e700f4ae0e13d3e5b7bdda22278ccfb2ec9ab9 +SIZE (myb-project-mybee-qt-25.02.1_GH0.tar.gz) = 3599613 diff --git a/deskutils/mybee-qt/files/patch-mybee-qt.pro b/deskutils/mybee-qt/files/patch-mybee-qt.pro index 4cc5ed28b413..2766330e5c63 100644 --- a/deskutils/mybee-qt/files/patch-mybee-qt.pro +++ b/deskutils/mybee-qt/files/patch-mybee-qt.pro @@ -1,13 +1,15 @@ ---- mybee-qt.pro.orig 2025-01-23 11:34:32 UTC +--- mybee-qt.pro.orig 2025-02-16 18:06:21 UTC +++ mybee-qt.pro -@@ -1,8 +1,8 @@ TEMPLATE = subdirs +@@ -1,11 +1,10 @@ TEMPLATE = subdirs TEMPLATE = subdirs --SUBDIRS = libssh freerdp2 vnc src +-SUBDIRS = zlib-ng libjpeg-turbo libssh freerdp2 vnc src +SUBDIRS = src #CONFIG += ordered + libssh.depends = zlib-ng + freerdp2.depends = zlib-ng libjpeg-turbo + vnc.depends = zlib-ng libjpeg-turbo -src.depends = libssh freerdp2 vnc -+#src.depends = libssh freerdp2 vnc DISTFILES += \ APP_VERSION \ diff --git a/deskutils/mybee-qt/files/patch-src_src.pro b/deskutils/mybee-qt/files/patch-src_src.pro index 1bc7c3d8581e..b0ae91266147 100644 --- a/deskutils/mybee-qt/files/patch-src_src.pro +++ b/deskutils/mybee-qt/files/patch-src_src.pro @@ -1,20 +1,27 @@ ---- src/src.pro.orig 2025-01-23 11:34:32 UTC +--- src/src.pro.orig 2025-02-16 18:06:21 UTC +++ src/src.pro -@@ -18,7 +18,7 @@ windows: INCLUDEPATH += ../win64/zlib/include - DEFINES += LIBSSH_STATIC SSH_NO_CPP_EXCEPTIONS +@@ -15,7 +15,8 @@ DEFINES += LIBSSH_STATIC SSH_NO_CPP_EXCEPTIONS + CONFIG += file_copies lrelease embed_translations - windows: INCLUDEPATH += ../win64/zlib/include + DEFINES += LIBSSH_STATIC SSH_NO_CPP_EXCEPTIONS -INCLUDEPATH += ../include ../include/freerdp2 ../include/winpr2 -+INCLUDEPATH += \"/usr/local/include/freerdp2\" \"/usr/local/include/winpr2\" ../include ../include/freerdp2 ../include/winpr2 ++#INCLUDEPATH += ../include ../include/freerdp2 ../include/winpr2 ++INCLUDEPATH += \"/usr/local/include/freerdp2\" \"/usr/local/include/freerdp2/freerdp/client\" \"/usr/local/include/winpr2\" ../include ../include/freerdp2 ../include/winpr2 !isEmpty(OPENSSL_ROOT_DIR) { INCLUDEPATH += $$clean_path($${OPENSSL_ROOT_DIR}/include) -@@ -53,8 +53,6 @@ windows { +@@ -63,10 +64,10 @@ windows { + + } else { # any other unix & linux - LIBS += -lOpenSLES - FREERDP_CHANNEL_LIBS = ../*.$${QMAKE_EXTENSION_STATICLIB} -- } else { -- FREERDP_CHANNEL_LIBS = ../lib/freerdp2/*.$${QMAKE_EXTENSION_STATICLIB} - } +- LIBS += ../lib/libssh.a ../lib/libvncclient.a +- LIBS += ../lib/libfreerdp-client2.a ../lib/freerdp2/lib*.a ../lib/libfreerdp2.a ../lib/libwinpr2.a +- LIBS += ../lib/libturbojpeg.a ../lib/libz.a +- LIBS += -lssl -lcrypto -ldl -lutil ++# LIBS += /usr/local/lib/libssh.a ../lib/libvncclient.a ++# LIBS += ../lib/libfreerdp-client2.a ../lib/freerdp2/lib*.a ../lib/libfreerdp2.a ../lib/libwinpr2.a ++# LIBS += ../lib/libturbojpeg.a ../lib/libz.a ++ LIBS += -lssl -lcrypto -ldl -lutil -lturbojpeg -lz-ng -lssh -lfreerdp-client2 -lfreerdp2 -lwinpr2 -lvncclient -lz + } - LIBS += -L../lib -lssh -lvncclient + SOURCES += \