From nobody Sun Apr 27 04:37:07 2025 X-Original-To: dev-commits-ports-branches@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 4ZlYhN3lk6z5vGN2; Sun, 27 Apr 2025 04:37:08 +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 4ZlYhM64Zgz3skK; Sun, 27 Apr 2025 04:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745728627; 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=ccBVnJy2kFJKWuOdM4cfVWTheGATg5/V1i6s5SVvaxY=; b=i8du7TSxK+XKvGlewS+lBv4DUmJ6P0Bayyei6pTNASaZ2NVKoXjmrqV2WDCd2SGJfeH1jj 7T/a9FY9bZ5ttQtS6ufXjM3vxlBqtI3cq/NfBhkKdfCzYJXS5Ah5mn0zoLcxeRVSQ6drQq 63tsXHA7XEmGr+VsSRtgUBNIBU/CcUiFBtbTSEdXMEVsbXwzC+K82+qUYGmA+USyB3j+1l DTftfnTlMRQUE1G/vcTimRGeFELzn0u+7XqvWIwD0G+ROG3/oMaDXxdlMbOo8aaSIRCdYg JM8w6TFcYbDOV+eyfKdVIMAJWC+chVI/3CsJt6qQoMHYxK2OgQMKFzMWUYJ7mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745728627; a=rsa-sha256; cv=none; b=iThP+hilE2vp2shSBeqKFD8SUR0y//XUMA2cBae8hrIITSfsXjgul8asxUZ7wQLjwP7F4K AD9Yy3QLWELXU/pu7K4XN7eF2QCqs2q1rI+PKA+5HuAPE1qb21NbVpcy7ZWXSfrQwW5LUf TqLN9vqAbdXjwECkfdVgFxGt9mSuBFTvkxAIjbuK4KPQznlUjFnzYSg5iqeyi8znMEEMyS XanUJDaMW+hLnokuaM6SVJpuEvxTNMANmkm+oAI2+nrBUsernnRX/hTruYQCra242nr+fx nm/zt8ioL/C1AwrBgsDBOwbWROOIT49GIP/lp3EdfK/D9lwjLwfnrVSsU7KuEg== 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=1745728627; 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=ccBVnJy2kFJKWuOdM4cfVWTheGATg5/V1i6s5SVvaxY=; b=pXBCb4XZj2y/fyURFyyYnvXNsic9Ne7qhwV82aEkDo++jxxNGceUMlH+qwqTmUfasm7DVb GbKZ09baXqbklgaAeY7x7Vho3FjWzRFLfJMbK7zfLnQT8qugCSARr1hnbLWTrQa8KynIqi vOa6OCpSHNRK2KYT8guN9RamFvkwMfEhBCeBfPHOBoYFEyYxD3ec6MUlaaaZ5CNr/AqgvC SvL4BdNi8Xxw02m7a7oESItgvc68+Z7HnX1RQTlJW2tuSYK6cswdC9egAi62p/6+qT+swt HbClDxGUW3CzZ02xmD5THm1BnGbFNRn6AsOVhQFNT9YkyU2tRRGgnUvSu8DGHA== 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 4ZlYhM5cMfzrZM; Sun, 27 Apr 2025 04:37:07 +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 53R4b728046004; Sun, 27 Apr 2025 04:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53R4b7R1046001; Sun, 27 Apr 2025 04:37:07 GMT (envelope-from git) Date: Sun, 27 Apr 2025 04:37:07 GMT Message-Id: <202504270437.53R4b7R1046001@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 3bae97c041c3 - 2025Q2 - www/gitlab: decouple from www/rubygem-rqrcode List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q2 X-Git-Reftype: branch X-Git-Commit: 3bae97c041c3a771112192111039a6aa49d087ac Auto-Submitted: auto-generated The branch 2025Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bae97c041c3a771112192111039a6aa49d087ac commit 3bae97c041c3a771112192111039a6aa49d087ac Author: Matthias Fechner AuthorDate: 2025-04-27 04:17:56 +0000 Commit: Matthias Fechner CommitDate: 2025-04-27 04:26:54 +0000 www/gitlab: decouple from www/rubygem-rqrcode This makes it possible to upgrade www/rubygem-rqrcode to version 3 which unbreaks it due to update of www/rubygem-rqrcode_core. PR: 286372 (cherry picked from commit e5bf2131ff5710c26771c6c6a4d2541653c11436) --- www/Makefile | 2 ++ www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- www/rubygem-rqrcode-gitlab/Makefile | 21 +++++++++++++++++++++ www/rubygem-rqrcode-gitlab/distinfo | 3 +++ www/rubygem-rqrcode-gitlab/pkg-descr | 3 +++ www/rubygem-rqrcode_core-gitlab/Makefile | 18 ++++++++++++++++++ www/rubygem-rqrcode_core-gitlab/distinfo | 3 +++ www/rubygem-rqrcode_core-gitlab/pkg-descr | 15 +++++++++++++++ 9 files changed, 67 insertions(+), 2 deletions(-) diff --git a/www/Makefile b/www/Makefile index fa4f1354dd32..a74cc26573ad 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2347,6 +2347,8 @@ SUBDIR += rubygem-roda SUBDIR += rubygem-rqrcode SUBDIR += rubygem-rqrcode_core + SUBDIR += rubygem-rqrcode_core-gitlab + SUBDIR += rubygem-rqrcode-gitlab SUBDIR += rubygem-rss SUBDIR += rubygem-rtlit SUBDIR += rubygem-ruby-oembed diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index a386319d97dc..6cbd41e6c831 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -86,7 +86,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor41-rails70>=4.1.1<4.2:security/rubygem-devise-two-factor41-rails70 \ - rubygem-rqrcode>=2.2.0<3:www/rubygem-rqrcode \ + rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \ rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client-gitlab>=2.0.21<3:security/rubygem-acme-client-gitlab \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index a7bd8f577853..b2819cf58287 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.11.1 -GITLAB_PORTREVISION= 0 +GITLAB_PORTREVISION= 1 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/rubygem-rqrcode-gitlab/Makefile b/www/rubygem-rqrcode-gitlab/Makefile new file mode 100644 index 000000000000..acd6fcf32361 --- /dev/null +++ b/www/rubygem-rqrcode-gitlab/Makefile @@ -0,0 +1,21 @@ +PORTNAME= rqrcode +PORTVERSION= 2.2.0 +CATEGORIES= www rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Library for encoding QR Codes +WWW= https://whomwah.github.io/rqrcode/ + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-chunky_png>=1.0<2:graphics/rubygem-chunky_png \ + rubygem-rqrcode_core-gitlab>=1.0<2:www/rubygem-rqrcode_core-gitlab + +USES= gem + +NO_ARCH= yes + +.include diff --git a/www/rubygem-rqrcode-gitlab/distinfo b/www/rubygem-rqrcode-gitlab/distinfo new file mode 100644 index 000000000000..61930fac660c --- /dev/null +++ b/www/rubygem-rqrcode-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1698066054 +SHA256 (rubygem/rqrcode-2.2.0.gem) = 23eea88bb44c7ee6d6cab9354d08c287f7ebcdc6112e1fe7bcc2d010d1ffefc1 +SIZE (rubygem/rqrcode-2.2.0.gem) = 105984 diff --git a/www/rubygem-rqrcode-gitlab/pkg-descr b/www/rubygem-rqrcode-gitlab/pkg-descr new file mode 100644 index 000000000000..2265a5614c0e --- /dev/null +++ b/www/rubygem-rqrcode-gitlab/pkg-descr @@ -0,0 +1,3 @@ +rQRCode is a library for encoding QRCodes in Ruby. It has a simple interface +with all the standard qrcode options. It was adapted from the Javascript +library by Kazuhiko Arase. diff --git a/www/rubygem-rqrcode_core-gitlab/Makefile b/www/rubygem-rqrcode_core-gitlab/Makefile new file mode 100644 index 000000000000..639aa3c46762 --- /dev/null +++ b/www/rubygem-rqrcode_core-gitlab/Makefile @@ -0,0 +1,18 @@ +PORTNAME= rqrcode_core +DISTVERSION= 1.2.0 +CATEGORIES= www rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Ruby library for encoding QR Codes +WWW= https://github.com/whomwah/rqrcode_core + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +USES= gem + +NO_ARCH= yes + +.include diff --git a/www/rubygem-rqrcode_core-gitlab/distinfo b/www/rubygem-rqrcode_core-gitlab/distinfo new file mode 100644 index 000000000000..428064471f40 --- /dev/null +++ b/www/rubygem-rqrcode_core-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1745725395 +SHA256 (rubygem/rqrcode_core-1.2.0.gem) = cf4989dc82d24e2877984738c4ee569308625fed2a810960f1b02d68d0308d1a +SIZE (rubygem/rqrcode_core-1.2.0.gem) = 18944 diff --git a/www/rubygem-rqrcode_core-gitlab/pkg-descr b/www/rubygem-rqrcode_core-gitlab/pkg-descr new file mode 100644 index 000000000000..6f9fb5bbada5 --- /dev/null +++ b/www/rubygem-rqrcode_core-gitlab/pkg-descr @@ -0,0 +1,15 @@ +rqrcode_core is a library for encoding QR Codes in pure Ruby. It has a +simple interface with all the standard qrcode options. It was originally +adapted in 2008 from a Javascript library by Kazuhiko Arase. + +Features: +* rqrcode_core is a Ruby only library. It requires no 3rd party + libraries. Just Ruby! +* It is an encoding library. You can't decode QR Codes with it. +* The interface is simple and assumes you just want to encode a string + into a QR Code, but also allows for encoding multiple segments. +* QR Code is trademarked by Denso Wave inc. + +rqrcode_core is the basis of the popular rqrcode gem. This gem allows +you to generate different renderings of your QR Code, including png, svg +and ansi.