From nobody Wed Jan 3 12:59:28 2024 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 4T4qYY2BVzz55phR; Wed, 3 Jan 2024 12:59:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4qYY0LkKz4Dlk; Wed, 3 Jan 2024 12:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704286769; 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=MNSyhpUCiTrEfor0V2EkIMoH8W8Q/w2CTQs8mKZ/OfI=; b=jPZKQ88dI7XSYjSdntECRsRdRGXUtjBiWwWp8GecJMsBNdt3zHsZHwEajOYHjVbISFNLyW 2Xgs0h0+840lAD3fXSerKGO6ZMANVznEOR+SX+XMoMKqMV1aeKkR3cnj/LPRZtICVg6ZcU CUf9wduuDBJYjMweF7y+m3ttaHJBDfVNKQgTJr3dxuiYT/TdEQHFMiIpZdQZC29WgFT51P L0umvcC7OjHMbtICEfX7hTqCLIcPszTZpapiUXfdQS6UflbiDGWIBhUBX4pxr1xzuX5xcM jBmLUyTgtrLtXDcG6biJ8XggUmMTUMBy9EDlp8MIs5qXMHW+4oIMh2EfBDzWww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704286769; 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=MNSyhpUCiTrEfor0V2EkIMoH8W8Q/w2CTQs8mKZ/OfI=; b=p7BMCXiJ87R8VpTHtPvZ9j5cXEKQrlpsbPAkLT6mtsumsNPJ7/tz7o8D/jDADJwpCw3oAS mvCWsTqbu4BaUP17rZU36JvjdiTam6EU9eu8t17ot5CJ8igHktxqFy1n3uHh8rxi7uRd2K myCQy9JihZsbyQyoIYCgWXv8huCSWiYR6FsW7bXq4gPD4ISgOu7oDNd6JWXY3Pmy9sMKO4 ZZXT/2qwKhBSGgdJhF7pcRkODRgZWWZVcA/n7wJP31t3IgEi8JujaOCDUrqEyJRWDhAN6i e6UDjh0ycomICak/OyPMyHZsCGUkPbMmBjnknKRpNgojrrnJ4O7CWYvPkqyJWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704286769; a=rsa-sha256; cv=none; b=jQMR6M8FYCLA8aGB1RaV9bINX5t+0MpAi4jegMZ5jUVwnbqOAmjER/ryUUcQZinN1eWeQI 23O89gjWraPdjayHVue5iBFWlx1sNdSU0qUAYUCwG0Frh5N1xEdH/Ci/7wyd+OiNNjyrW5 pV06RsZQbpl4RyYpt6yWZgaN59NfS55RklZqMkMQjaJMqJD6N4IAU8BJzMtW9Wd95sGOxa Cb2tBALWZ9tsPlMv4dS18RfTQjVD9Dy4xbeJHYpvxV8aoepUxY7U875ZLWTq910eF5Lu9Y nupTF3+fftevCZNslbiNgUxSG8F86xS3CkTITfOrJDsA+OVeu9ktK6/97l7ncA== 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 4T4qYX6M7PzlvD; Wed, 3 Jan 2024 12:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403CxS1I046750; Wed, 3 Jan 2024 12:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403CxSlw046747; Wed, 3 Jan 2024 12:59:28 GMT (envelope-from git) Date: Wed, 3 Jan 2024 12:59:28 GMT Message-Id: <202401031259.403CxSlw046747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 91a19f4d4045 - main - x11/hyprpaper: unbundle devel/hyprlang 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91a19f4d4045ac593e96d50a5d2f542b7ce120e0 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=91a19f4d4045ac593e96d50a5d2f542b7ce120e0 commit 91a19f4d4045ac593e96d50a5d2f542b7ce120e0 Author: Jan Beich AuthorDate: 2024-01-03 12:10:40 +0000 Commit: Jan Beich CommitDate: 2024-01-03 12:58:11 +0000 x11/hyprpaper: unbundle devel/hyprlang --- x11/hyprpaper/Makefile | 12 +++-------- x11/hyprpaper/distinfo | 2 -- x11/hyprpaper/files/patch-private-libs | 37 ---------------------------------- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile index 26a9adfff5ea..deecc3bddb07 100644 --- a/x11/hyprpaper/Makefile +++ b/x11/hyprpaper/Makefile @@ -1,6 +1,7 @@ PORTNAME= hyprpaper DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -8,25 +9,18 @@ COMMENT= Blazing fast Wayland wallpaper utility with IPC controls WWW= https://github.com/hyprwm/hyprpaper LICENSE= BSD3CLAUSE -LICENSE+= GPLv3+ -LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_FILE_GPLv3+ = ${WRKSRC_hyprlang}/LICENSE - -BROKEN_armv7= https://github.com/hyprwm/hyprlang/issues/8 -BROKEN_i386= https://github.com/hyprwm/hyprlang/issues/8 -BROKEN_powerpc= https://github.com/hyprwm/hyprlang/issues/8 BUILD_DEPENDS= gmake:devel/gmake \ wayland-protocols>0:graphics/wayland-protocols -LIB_DEPENDS= libwayland-client.so:graphics/wayland \ +LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ + libwayland-client.so:graphics/wayland \ libwebp.so:graphics/webp USES= compiler:c++11-lib cmake gnome jpeg localbase:ldflags pkgconfig USE_GNOME= cairo USE_GITHUB= yes GH_ACCOUNT= hyprwm -GH_TUPLE= hyprwm:hyprlang:v0.2.1:hyprlang/subprojects/hyprlang PLIST_FILES= bin/${PORTNAME} post-patch: diff --git a/x11/hyprpaper/distinfo b/x11/hyprpaper/distinfo index 304f8be09b93..11823315793e 100644 --- a/x11/hyprpaper/distinfo +++ b/x11/hyprpaper/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1704230554 SHA256 (hyprwm-hyprpaper-v0.6.0_GH0.tar.gz) = 71d8294ffbcbaae628c4eabdcb3b7fb1974d6bed7794b787bb77934d0a3f4538 SIZE (hyprwm-hyprpaper-v0.6.0_GH0.tar.gz) = 28122 -SHA256 (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190 -SIZE (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = 61006 diff --git a/x11/hyprpaper/files/patch-private-libs b/x11/hyprpaper/files/patch-private-libs deleted file mode 100644 index 365f59de6260..000000000000 --- a/x11/hyprpaper/files/patch-private-libs +++ /dev/null @@ -1,37 +0,0 @@ -hyprlang has no other consumers. Keep it private for now. - ---- CMakeLists.txt.orig 2024-01-02 21:22:34 UTC -+++ CMakeLists.txt -@@ -41,11 +41,12 @@ find_package(PkgConfig REQUIRED) - find_package(Threads REQUIRED) - - find_package(PkgConfig REQUIRED) --pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp hyprlang>=0.2.0) -+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp) - - file(GLOB_RECURSE SRCFILES "src/*.cpp") - - add_executable(hyprpaper ${SRCFILES}) -+add_subdirectory(subprojects/hyprlang EXCLUDE_FROM_ALL) - - target_compile_definitions(hyprpaper PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"") - target_compile_definitions(hyprpaper PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"") -@@ -59,6 +60,7 @@ target_link_libraries(hyprpaper PkgConfig::deps) - include(CPack) - - target_link_libraries(hyprpaper PkgConfig::deps) -+target_link_libraries(hyprpaper hyprlang) - - target_link_libraries(hyprpaper - OpenGL ---- subprojects/hyprlang/CMakeLists.txt.orig 2024-01-02 22:10:42 UTC -+++ subprojects/hyprlang/CMakeLists.txt -@@ -17,7 +17,7 @@ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cp - - file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp" "include/hyprlang.hpp") - --add_library(hyprlang SHARED ${SRCFILES}) -+add_library(hyprlang STATIC ${SRCFILES}) - target_include_directories( hyprlang - PUBLIC "./include" - PRIVATE "./src"