CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/26 00:52:58 Modified files: geo/qgis : Makefile distinfo Log message: geo/qgis: update to 3.34.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/26 00:29:31 Modified files: geo/pgrouting : Makefile distinfo geo/pgrouting/pkg: PLIST Added files: geo/pgrouting/patches: patch-include_c_types_restriction_t_h patch-include_cpp_common_get_check_data_hpp patch-src_cpp_common_get_check_data_cpp Log message: geo/pgrouting: update to 3.6.0. see https://github.com/pgRouting/pgrouting/releases/tag/v3.6.0 pull patches from https://github.com/pgRouting/pgrouting/pull/2589 to fix the build.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/26 00:17:10 Modified files: security/p5-Crypt-Argon2: Makefile distinfo security/p5-Crypt-Argon2/patches: patch-Build_PL Log message: Update to p5-Crypt-Argon2-0.020.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/26 00:06:47 Modified files: net/p5-POE-Component-Client-DNS-Recursive: Makefile distinfo Log message: Update to p5-POE-Component-Client-DNS-Recursive-1.14.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 22:36:36 Modified files: games/mysticmine: Makefile games/mysticmine/patches: patch-setup_py games/mysticmine/pkg: PLIST Added files: games/mysticmine/patches: patch-monorail_ai_py Log message: drop mysticmine BDEP on python2 cython Convert ai.pyx to ai.py which allows us to drop the build dependency on python2 cython. This will allow us to make cython python3-only.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 18:35:00 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm devel/py-six : Makefile devel/py-six/pkg: PLIST Log message: make py-six python3-only ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/25 16:09:08 Modified files: mail/opensmtpd-filters: Makefile Log message: +mail/opensmtpd-filters/spfgreylist
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/25 16:08:25 Log message: Import mail/opensmtpd-filters/spfgreylist 1.0.0 This filter implements greylisting, allowing OpenSMTPD to temporarily reject sessions of clients it has not seen before. Unlike many implementations, this one is SPF-aware so it will properly handle greylisting for domains doing relaying through multiple MX, as long as they publish a valid SPF record. The filter currently supports: * IPv4 and IPv6 address greylisting * SPF greylisting * startup whitelisting of IP and domains * automatically renewed whitelisting ok gilles@ Status: Vendor Tag: landry Release Tags: landry_20231126 N ports/mail/opensmtpd-filters/spfgreylist/Makefile N ports/mail/opensmtpd-filters/spfgreylist/distinfo N ports/mail/opensmtpd-filters/spfgreylist/pkg/PLIST N ports/mail/opensmtpd-filters/spfgreylist/pkg/DESCR N ports/mail/opensmtpd-filters/spfgreylist/pkg/README No conflicts created by this import
Re: NEW: devel/flint 3.0.1
Suitesparse looks rather complicated. Simple is much better for ports. -- Sent from a phone, apologies for poor formatting. On 25 November 2023 15:12:35 j...@bitminer.ca wrote: On Thu, Nov 23, 2023 at 07:01:07PM +, Stuart Henderson wrote: Or maybe disable the static library build? There is also the trick used by math/suitesparse in post-build: - using the static library - extract the object modules and compose a dynamic lib J
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2023/11/25 15:30:32 Modified files: games : Makefile Log message: hook up emptyclip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2023/11/25 15:28:49 Log message: import games/emptyclip Empty Clip is a top-down shooter action RPG. * Utilize over 15 different weapons, including melee, pistols, shotguns, rifles, rocket launchers, crossbows, and miniguns * Fight thousands of zombies, spiders, bats, skeletons, demons, aliens and more * Discover rare items and secrets that sprawl across dungeons, woods, caves, cities, desert, hell, and alien worlds * Customize your character with skill points and over 25 different equipment mods * Play through the 10 level campaign multiple times for an increase in difficulty and rewards * Complete eight achievements for an even greater challenge valuable feedback and final OK thfr@ Status: Vendor Tag: sebastia Release Tags: sebastia_20231125 N ports/games/emptyclip/Makefile N ports/games/emptyclip/distinfo N ports/games/emptyclip/patches/patch-ext_ae_ae_database_cpp N ports/games/emptyclip/patches/patch-ext_ae_ae_framebuffer_cpp N ports/games/emptyclip/patches/patch-ext_ae_ae_framelimit_h N ports/games/emptyclip/patches/patch-ext_ae_ae_network_cpp N ports/games/emptyclip/patches/patch-ext_ae_ae_random_cpp N ports/games/emptyclip/patches/patch-ext_ae_tinyxml2_tinyxml2_cpp N ports/games/emptyclip/patches/patch-src_save_cpp N ports/games/emptyclip/pkg/DESCR N ports/games/emptyclip/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/11/25 15:09:31 Modified files: lang/fpc : Makefile Log message: lang/fpc: mark BROKEN on amd64, does not build with LLVM 16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/25 15:00:30 Modified files: x11/xfce4/xfce4-whiskermenu: Makefile x11/xfce4/xfce4-whiskermenu/patches: patch-panel-plugin_settings_cpp Added files: x11/xfce4/xfce4-whiskermenu/patches: patch-panel-plugin_search-page_cpp Log message: x11/xfce4/xfce4-whiskermenu: workaround crash when searching an app see https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/issues/120
spyder 5.x: import cookiecutter
Following the previous message about re-importing binaryornot: https://marc.info/?l=openbsd-ports=170094343724652=2 ...we can now import cookiecutter. Cookiecutter needs 2 new RDEPs on top of binaryornot: - python-slugify - jinja2-time All 3 ports are attached. ok for importing these? (note that I ended up going with the newest version of cookiecutter that doesn't end up needing whichcraft or poyo which may have been needed in older versions of cookiecutter) py-cookiecutter.tgz Description: Binary data py-jinja2-time.tgz Description: Binary data py-python-slugify.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/11/25 14:15:52 Modified files: devel/py-identify: Makefile distinfo Log message: Update py-identify 2.5.31 -> 2.5.32
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/11/25 14:14:50 Modified files: sysutils/tflint: Makefile distinfo modules.inc Log message: Update tflint 0.48.0 -> 0.49.0 Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.49.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/11/25 13:28:01 Modified files: sysutils/ansible: Makefile distinfo sysutils/ansible/pkg: PLIST Log message: Update ansible 8.6.1 -> 9.0.1 Changelog: https://github.com/ansible-community/ansible-build-data/blob/main/9/CHANGELOG-v9.rst#v9-0-1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/11/25 13:23:04 Modified files: net/mattermost-server: Makefile distinfo net/mattermost-server/patches: patch-server_config_config_json net/mattermost-server/pkg: PLIST-main Log message: Update mattermost-server 9.1.2 -> 9.2.2 Changelog: https://docs.mattermost.com/install/self-managed-changelog.html
spyder 5.x: revive whichcraft and binaryornot
As part of the spyder 5.x we need cookiecutter (which was never imported).
An attempt was made to import cookiecutter a few years ago, but then some
of required ports were removed when the cookiecutter efforts stalled.
Now spyder 5.5.0 requires cookiecutter.
In this first step I'd like to revive 2 cookiecutter dependencies first:
- binaryornot
- whichcraft
Now, these were both python2 and python3 before they were retired up, so
the new ports also make them python3 only, while trying to make sure we
don't go backwards from the old versions that were in ports.
In theory, someone who still has the old ports installed should be able to
update to the new ports. The diff to devel/quirks is shown below.
ok to re-import these and update devel/quirks?
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
diff -u -p -u -r1.1582 Makefile
--- Makefile20 Nov 2023 11:53:55 - 1.1582
+++ Makefile25 Nov 2023 20:11:09 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.198
+PKGNAME = quirks-6.199
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -u -r1.1594 Quirks.pm
--- files/Quirks.pm 20 Nov 2023 11:53:55 - 1.1594
+++ files/Quirks.pm 25 Nov 2023 20:11:09 -
@@ -803,6 +803,8 @@ my $stem_extensions = {
'py-future' => 'py3-future',
'py-capstone' => 'py3-capstone',
'iosevka-fixed-slab' => 'iosevka-slab',
+ 'py-binaryornot' => 'py3-binaryornot',
+ 'py-whichcraft' => 'py3-whichcraft',
};
my $obsolete_reason = {};
@@ -1187,10 +1189,6 @@ setup_obsolete_reason(
5 => 'qucs',
1 => 'py-chai',
1 => 'py3-chai',
- 1 => 'py-binaryornot',
- 1 => 'py3-binaryornot',
- 1 => 'py-whichcraft',
- 1 => 'py3-whichcraft',
20 => 'celt07',
1 => qr{^terraform-provider-},
6 => 'radare2-bindings',
py-whichcraft.tgz
Description: Binary data
py-binaryornot.tgz
Description: Binary data
[update] www/gitea-1.21.0
Hi,
I'd like to get some feedback regarding this breaking change in gitea-1.21.0:
https://github.com/go-gitea/gitea/pull/25907
In my opinion it's better to install Gitea static assets directly in
/var/www/gitea instead of /var/www/gitea/public and thus get rid of URL
rewrite when serving static assets via httpd(8).
This change won't affect Gitea installs which do not use httpd(8) for
serving static assets.
--
With best regards,
Pavel Korovin
? Makefile-2023-11-25-20-58-18
? Makefile.novar
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
diff -u -p -r1.104 Makefile
--- Makefile12 Oct 2023 08:38:17 - 1.104
+++ Makefile25 Nov 2023 19:35:57 -
@@ -1,6 +1,6 @@
COMMENT = compact self-hosted Git service
-VERSION = 1.20.5
+VERSION = 1.21.0
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}
@@ -41,9 +41,9 @@ do-install:
.for _d in custom/conf options templates
cp -Rp ${WRKSRC}/${_d} ${PREFIX}/share/gitea
.endfor
- ${INSTALL_DATA_DIR} ${WRKINST}${VARBASE}/www/gitea
+ ${INSTALL_DATA_DIR} ${WRKINST}${VARBASE}/www
cp -Rp ${WRKSRC}/public ${WRKINST}${VARBASE}/www/gitea
- ln -s ${VARBASE}/www/gitea/public ${PREFIX}/share/gitea/public
+ ln -s ${VARBASE}/www/gitea ${PREFIX}/share/gitea/public
post-install:
@find ${WRKINST}/ -type f \
Index: distinfo
===
RCS file: /cvs/ports/www/gitea/distinfo,v
diff -u -p -r1.86 distinfo
--- distinfo12 Oct 2023 08:38:17 - 1.86
+++ distinfo25 Nov 2023 19:35:57 -
@@ -1,2 +1,2 @@
-SHA256 (gitea-src-1.20.5.tar.gz) = cH/AHsFXOdvfSfj9AZUd3l/RlYE06o1ByZu0vvGQuXw=
-SIZE (gitea-src-1.20.5.tar.gz) = 50448780
+SHA256 (gitea-src-1.21.0.tar.gz) = abEneLO18krs/wjY5RIuTt94S9ouQzW3fyu9BAShGpM=
+SIZE (gitea-src-1.21.0.tar.gz) = 53744981
Index: patches/patch-custom_conf_app_example_ini
===
RCS file: /cvs/ports/www/gitea/patches/patch-custom_conf_app_example_ini,v
diff -u -p -r1.19 patch-custom_conf_app_example_ini
--- patches/patch-custom_conf_app_example_ini 12 Sep 2023 22:22:10 -
1.19
+++ patches/patch-custom_conf_app_example_ini 25 Nov 2023 19:35:57 -
@@ -10,7 +10,7 @@ Index: custom/conf/app.example.ini
;;
;; Application run mode, affects performance and debugging: "dev" or "prod",
default is "prod"
;; Mode "dev" makes Gitea easier to develop and debug, values other than
"dev" are treated as "prod" which is for production use.
-@@ -150,7 +150,7 @@ RUN_USER = ; git
+@@ -153,7 +153,7 @@ RUN_USER = ; git
;SSH_LISTEN_HOST =
;;
;; Port number to be exposed in clone URL
@@ -19,7 +19,7 @@ Index: custom/conf/app.example.ini
;;
;; The port number the builtin SSH server should listen on
;SSH_LISTEN_PORT = %(SSH_PORT)s
-@@ -278,7 +278,7 @@ RUN_USER = ; git
+@@ -281,7 +281,7 @@ RUN_USER = ; git
;STATIC_ROOT_PATH = ; Will default to the built-in value _`StaticRootPath`_
;;
;; Default path for App data
@@ -28,7 +28,7 @@ Index: custom/conf/app.example.ini
;;
;; Enable gzip compression for runtime-generated content, static resources
excluded
;ENABLE_GZIP = false
-@@ -289,7 +289,7 @@ RUN_USER = ; git
+@@ -292,7 +292,7 @@ RUN_USER = ; git
;ENABLE_PPROF = false
;;
;; PPROF_DATA_PATH, use an absolute path when you start gitea as service
@@ -37,7 +37,7 @@ Index: custom/conf/app.example.ini
;;
;; Landing page, can be "home", "explore", "organizations", "login", or any
URL such as "/org/repo" or even "https://anotherwebsite.com;
;; The "login" choice is not a security measure but just a UI flow change,
use REQUIRE_SIGNIN_VIEW to force users to log in.
-@@ -338,10 +338,10 @@ LFS_JWT_SECRET =
+@@ -344,10 +344,10 @@ RUN_USER = ; git
;;
;; MySQL Configuration
;;
@@ -51,8 +51,8 @@ Index: custom/conf/app.example.ini
+;USER = %(RUN_USER)s
;PASSWD = ;Use PASSWD = `your password` for quoting if you use special
characters in the password.
;SSL_MODE = false ; either "false" (default), "true", or "skip-verify"
- ;CHARSET = utf8mb4 ;either "utf8" or "utf8mb4", default is "utf8mb4".
-@@ -353,9 +353,9 @@ USER = root
+ ;;
+@@ -356,9 +356,9 @@ USER = root
;; Postgres Configuration
;;
;DB_TYPE = postgres
@@ -64,7 +64,7 @@ Index: custom/conf/app.example.ini
;PASSWD =
;SCHEMA =
;SSL_MODE=disable ;either "disable" (default), "require", or "verify-full"
-@@ -364,8 +364,8 @@ USER = root
+@@ -367,8 +367,8 @@ USER = root
;;
;; SQLite Configuration
;;
@@ -75,7 +75,7 @@ Index: custom/conf/app.example.ini
;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
;SQLITE_JOURNAL_MODE = ; defaults to sqlite database default (often DELETE),
can be used to enable WAL mode.
https://www.sqlite.org/pragma.html#pragma_journal_mode
;;
-@@ -461,7 +461,7 @@ INTERNAL_TOKEN=
+@@ -464,7 +464,7 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 12:44:16 Modified files: www/webkitgtk4 : Makefile Log message: Explicitely set ENABLE_WAYLAND_TARGET to Off for now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2023/11/25 12:09:45 ports/sysutils/u-boot/rk3588/patches Update of /cvs/ports/sysutils/u-boot/rk3588/patches In directory cvs.openbsd.org:/tmp/cvs-serv76227/patches Log Message: Directory /cvs/ports/sysutils/u-boot/rk3588/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 12:08:25 Modified files: shells/py-qtconsole: Makefile distinfo Log message: update qtconsole to 5.5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 12:03:43 Modified files: devel/ipython : Makefile distinfo devel/ipython/pkg: PLIST Log message: update ipython to 8.18.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/11/25 11:35:02 Modified files: x11/qt5/qtwebengine/files: openbsd.pri Log message: qt5/qtwebengine: do not pick up re2 if it's installed. It breaks the build. ok rsadowski (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 11:25:32 Modified files: devel/py-jupyter_client: Makefile distinfo devel/py-jupyter_client/patches: patch-jupyter_client_connect_py devel/py-jupyter_client/pkg: PLIST Log message: update py-jupyter_client to 7.4.9 spyder-kernels needs this update so it can be updated. This is part of the work to get spyder update to the 5.x series.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/11/25 11:11:57 Modified files: databases/p5-DBD-Pg: Makefile distinfo Log message: update databases/p5-DBD-Pg to 3.17.0; ok pea@, bluhm@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 10:40:41 Modified files: textproc/py-whatthepatch: Makefile distinfo Log message: update py-whatthepatch to 1.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 10:30:28 Modified files: devel/py-jupyter_core: Makefile distinfo Log message: update py-jupyter_core to 5.5.0
Re: devel/py-installer dependency weirdness?
On Sat, Nov 25, 2023 at 08:20:11AM +, Stuart Henderson wrote: Hello Stuart, >> While `make update`ing Firefox, I stumbled across this build error: >> >> ===> py3-build-1.0.3 depends on: py3-installer-* - not found >> ===> Verifying install for py3-installer-* in devel/py-installer >> ===> Checking files for py3-installer-0.7.0 >> >> Fetch https://pypi.io/packages/source/i/installer/installer-0.7.0.tar.gz >> installer-0.7.0.tar.gz 100% |***| 463 KB >> 00:05 >> >> (SHA256) installer-0.7.0.tar.gz: OK >> ===> Extracting for py3-installer-0.7.0 > This seems like it's building in an existing work dir, prepared at a > time when flit_core was already installed. Hmm, I can't rule that out, so it's best to assume that I did do something stupid like that. Sorry for the noise! Laurie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 10:27:48 Modified files: misc/py-imdb : Makefile distinfo misc/py-imdb/patches: patch-setup_py misc/py-imdb/pkg: DESCR PLIST Log message: update py-imdb to 2023.5.1 Note that imdb has been renamed to cinemagoer but for now we keep our package name as is. ok millert@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/11/25 10:19:27 Modified files: devel/py-traitlets: Makefile distinfo devel/py-traitlets/pkg: PLIST Log message: update py-traitlets to 5.13.0
Re: update databases/p5-DBD-Pg to 3.17.0
Hello, ok pea@ Thanks. Le 2023-11-23 12:02, Omar Polo a écrit : noticed that we're behind a few versions. Tests are all passing and works for me, but I don't use its consumers in ports. Looking at the changes for the various versions between 3.15 and 3.17 I wouldn't expect breakage. ok? Index: Makefile === RCS file: /home/cvs/ports/databases/p5-DBD-Pg/Makefile,v diff -u -p -r1.77 Makefile --- Makefile11 Mar 2022 18:31:27 - 1.77 +++ Makefile23 Nov 2023 10:49:31 - @@ -1,7 +1,7 @@ COMMENT= access to PostgreSQL databases through the DBI MODULES= cpan databases/postgresql -DISTNAME= DBD-Pg-3.15.0 +DISTNAME= DBD-Pg-3.17.0 CATEGORIES=databases LIB_DEPENDS= databases/postgresql Index: distinfo === RCS file: /home/cvs/ports/databases/p5-DBD-Pg/distinfo,v diff -u -p -r1.26 distinfo --- distinfo11 Aug 2021 13:27:12 - 1.26 +++ distinfo23 Nov 2023 10:51:49 - @@ -1,2 +1,2 @@ -SHA256 (DBD-Pg-3.15.0.tar.gz) = acwZhw+dk18WUwvjnQ7WCvrcXlYOKcOhevRJjn4wgtk= -SIZE (DBD-Pg-3.15.0.tar.gz) = 284379 +SHA256 (DBD-Pg-3.17.0.tar.gz) = jZANTA50nzchh1KmZh+w01V6sfzMjeo4TLWHw4LeIZs= +SIZE (DBD-Pg-3.17.0.tar.gz) = 288633
Re: [update] sysutils/ugrep to 4.3.4
On 11/25/2023 11:19 AM, Justin Berthault wrote: > Trivial update of ugrep to v4.3.4. > > Built and tested on arm64 > I'm away for the US holiday. I'll commit when I'm home. Thanks. ~Brian
make py-six python3 only
I believe py-six can go python3-only now.
ok?
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
diff -u -p -u -r1.1582 Makefile
--- devel/quirks/Makefile 20 Nov 2023 11:53:55 - 1.1582
+++ devel/quirks/Makefile 25 Nov 2023 16:25:07 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.198
+PKGNAME = quirks-6.199
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -u -r1.1594 Quirks.pm
--- devel/quirks/files/Quirks.pm20 Nov 2023 11:53:55 - 1.1594
+++ devel/quirks/files/Quirks.pm25 Nov 2023 16:25:07 -
@@ -803,6 +803,7 @@ my $stem_extensions = {
'py-future' => 'py3-future',
'py-capstone' => 'py3-capstone',
'iosevka-fixed-slab' => 'iosevka-slab',
+ 'py-six' => 'py3-six',
};
my $obsolete_reason = {};
Index: devel/py-six/Makefile
===
RCS file: /cvs/ports/devel/py-six/Makefile,v
diff -u -p -u -r1.32 Makefile
--- devel/py-six/Makefile 26 Nov 2022 23:28:13 - 1.32
+++ devel/py-six/Makefile 25 Nov 2023 16:25:07 -
@@ -3,7 +3,7 @@ COMMENT = Python 2 and 3 compatibility l
MODPY_EGG_VERSION =1.16.0
DISTNAME = six-${MODPY_EGG_VERSION}
PKGNAME = py-six-${MODPY_EGG_VERSION}
-REVISION = 2
+REVISION = 3
CATEGORIES = devel
@@ -17,14 +17,12 @@ MODPY_PI = Yes
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS =-v
-.if ${FLAVOR:Mpython3}
TEST_DEPENDS = devel/py-py${MODPY_FLAVOR}
-.endif
.include
Index: devel/py-six/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-six/pkg/PLIST,v
diff -u -p -u -r1.5 PLIST
--- devel/py-six/pkg/PLIST 11 Mar 2022 18:52:57 - 1.5
+++ devel/py-six/pkg/PLIST 25 Nov 2023 16:25:07 -
@@ -1,3 +1,5 @@
+@conflict six-*
+@pkgpath devel/py-six
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
[update] sysutils/ugrep to 4.3.4
Trivial update of ugrep to v4.3.4.
Built and tested on arm64
diff /usr/ports
commit - b0c5a564531eb77190e8168b9d90c5e9271b7411
path + /usr/ports
blob - eb9c6607918484f3bc6dc61a5f77eb6cc99b4440
file + sysutils/ugrep/Makefile
--- sysutils/ugrep/Makefile
+++ sysutils/ugrep/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =sysutils
GH_ACCOUNT = Genivia
GH_PROJECT = ugrep
-GH_TAGNAME = v4.3.3
+GH_TAGNAME = v4.3.4
MAINTAINER = Brian Callahan
blob - 546a9cebc9a901dfa9cebf2e4670438a4e1c0d08
file + sysutils/ugrep/distinfo
--- sysutils/ugrep/distinfo
+++ sysutils/ugrep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ugrep-4.3.3.tar.gz) = Myo7X8p4LUHkJMIQvsAl0BaCGQIo1iuAc1LGhgc7794=
-SIZE (ugrep-4.3.3.tar.gz) = 4595042
+SHA256 (ugrep-4.3.4.tar.gz) = 0ganazvBA6DFGH+XOUPL2DOZlaKJ9iojeg5ljsstB0M=
+SIZE (ugrep-4.3.4.tar.gz) = 4597527
blob - 1117900226ca5962844659e6d9bc542a2cf386f1
file + sysutils/ugrep/patches/patch-configure
--- sysutils/ugrep/patches/patch-configure
+++ sysutils/ugrep/patches/patch-configure
@@ -4,7 +4,7 @@ Causes the AVX check to fail, but we disable that with
Index: configure
--- configure.orig
+++ configure
-@@ -8806,7 +8806,7 @@ printf "%s\n" "no" >&6; }
+@@ -8821,7 +8821,7 @@ printf "%s\n" "no" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${CXX}
supports SSE2 intrinsics" >&5
printf %s "checking whether ${CXX} supports SSE2 intrinsics... " >&6; }
save_CXXFLAGS=$CXXFLAGS
@@ -13,7 +13,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include
-@@ -8846,7 +8846,7 @@ printf "%s\n" "no" >&6; }
+@@ -8861,7 +8861,7 @@ printf "%s\n" "no" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${CXX}
supports AVX intrinsics" >&5
printf %s "checking whether ${CXX} supports AVX intrinsics... " >&6; }
save_CXXFLAGS=$CXXFLAGS
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include
-@@ -8945,7 +8945,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.b
+@@ -8960,7 +8960,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.b
SIMD_FLAGS="-DHAVE_NEON"
else
save_CXXFLAGS=$CXXFLAGS
@@ -31,7 +31,7 @@ Index: configure
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9113,9 +9113,9 @@ else $as_nop
+@@ -9128,9 +9128,9 @@ else $as_nop
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
if test "x$mneon_ok" = "xyes"; then
@@ -43,7 +43,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include
-@@ -9135,7 +9135,7 @@ else $as_nop
+@@ -9150,7 +9150,7 @@ else $as_nop
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
if test "x$mneon_ok" = "xyes"; then
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 08:27:10 Modified files: productivity/p5-Business-Tax-VAT-Validation: Makefile distinfo Log message: Update to p5-Business-Tax-VAT-Validation-1.23.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 08:16:58 Modified files: math/p5-Statistics-Descriptive: Makefile distinfo Log message: Update to p5-Statistics-Descriptive-3.0801.
Re: NEW: devel/flint 3.0.1
On Thu, Nov 23, 2023 at 07:01:07PM +, Stuart Henderson wrote: Or maybe disable the static library build? There is also the trick used by math/suitesparse in post-build: - using the static library - extract the object modules and compose a dynamic lib J
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 08:10:49 Modified files: multimedia/gstreamer1/plugins-bad: Makefile Log message: Missing BDEP on wayland/wayland-protocols.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 08:00:27 Modified files: graphics/p5-Image-ExifTool: Makefile distinfo Log message: Update to p5-Image-ExifTool-12.70.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 07:52:50 Modified files: devel/py-altgraph: Makefile distinfo Log message: Update to py3-altgraph-0.17.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 07:46:51 Modified files: devel/p5-URI-db: Makefile distinfo Log message: Update to p5-URI-db-0.21.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 07:42:09 Modified files: devel/p5-Time-Progress: Makefile distinfo Log message: Update to p5-Time-Progress-2.14.
Re: CVS: cvs.openbsd.org: ports
On Fri, Nov 24, 2023 at 05:23:54AM -0700, Jasper Lievisse Adriaanse wrote: > CVSROOT: /cvs > Module name: ports > Changes by: jas...@cvs.openbsd.org 2023/11/24 05:23:54 > > Added files: > devel/angr/py-claripy/patches: > patch-tests_common_backend_smt_solver_py > > Log message: > add file that's missing from the distribution tarball but that's required for > test Does not apply here. ===> Applying OpenBSD patch patch-tests_common_backend_smt_solver_py Hmm... Looks like a unified diff to me... The text leading up to this was: -- |File missing from distribution tarball. | |Index: tests/common_backend_smt_solver.py |--- tests/common_backend_smt_solver.py.orig |+++ tests/common_backend_smt_solver.py -- -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 07:30:25 Modified files: multimedia/gstreamer1/plugins-base: Makefile Log message: Need wayland/wayland-protocols to build.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2023/11/25 07:11:06 Modified files: audio/audacious/plugins: Makefile Log message: specifically disable openmpt support, prevents breakage if the right kind of junk happens between configure and build. OK bket@ (MAINTAINER)
Re: audio/audacious/plugins disable openmpt
On Sat 25/11/2023 14:47, Peter Hessler wrote: > Broke on the most recent aarch64 bulk build, a junk happened between > configure and build. > > OK? Thank you for this! OK bket@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2023/11/25 07:00:43 Added files: www/hiawatha/patches: patch-mbedtls_library_aesce_c Log message: set #pragma attribute after including arm_neon.h, so the attribute only applies to the local code
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/11/25 06:55:00 Modified files: www/mozilla-firefox: Makefile Log message: www/mozilla-firefox: bump after runtime fix on IBT-enabled hardware
audio/audacious/plugins disable openmpt
Broke on the most recent aarch64 bulk build, a junk happened between
configure and build.
OK?
Index: audio/audacious/plugins/Makefile
===
RCS file: /cvs/openbsd/ports/audio/audacious/plugins/Makefile,v
diff -u -p -u -p -r1.14 Makefile
--- audio/audacious/plugins/Makefile23 Jul 2023 04:27:27 - 1.14
+++ audio/audacious/plugins/Makefile25 Nov 2023 13:45:14 -
@@ -1,7 +1,7 @@
COMMENT = input and output plugins for Audacious
DISTNAME = audacious-plugins-${VERSION}
-REVISION = 0
+REVISION = 1
# BSD / GPL
PERMIT_PACKAGE = Yes
@@ -46,6 +46,7 @@ CONFIGURE_ARGS = --disable-alsa \
--disable-bs2b \
--disable-jack \
--disable-lirc \
+ --disable-openmpt \
--disable-pulse \
--disable-qtaudio \
--disable-sdlout \
--
If you've done six impossible things before breakfast, why not round it
off with dinner at Milliway's, the restaurant at the end of the universe?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2023/11/25 06:39:41 Added files: lang/sbcl/patches: patch-make-config_sh patch-src_runtime_ppc-assem_S Log message: lang/sbcl: unbreak powerpc build powerpc code doesn't support gcc-tls, so do not try to use it for openbsd-powerpc. no bump as it didn't build on powerpc, and doesn't changes on others platforms tested by Tobias Heider
Re: UPDATE x11/spectrwm-3.5.1
Bjorn Ketelaars wrote (2023-11-25 11:37 CET):
> Diff below brings spectrwm to 3.5.1. Changes:
> https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_1
>
> OK?
I'm running the last commit already. Nice that there's a release now.
OK sdk@
> diff --git Makefile Makefile
> index 45da60f00e1..fae035a6dde 100644
> --- Makefile
> +++ Makefile
> @@ -1,6 +1,6 @@
> COMMENT= small tiling window manager
>
> -V= 3.5.0
> +V= 3.5.1
> DIST_TUPLE= github conformal spectrwm SPECTRWM_${V:S/./_/g} /
> DISTNAME=spectrwm-${V}
>
> diff --git distinfo distinfo
> index a12233acd18..2e0f3b923c5 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) =
> tN6LLFkvxapMpNvQ6KQh9/0Wi31fVMetgZl63ADawg8=
> -SIZE (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 194387
> +SHA256 (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) =
> f+QmAgilLZ+4RCkdCv5q8YiHxUUt8Lkh7XgK97kiPw8=
> +SIZE (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 196431
> diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
> index e002bc0b708..08dc93fa75b 100644
> --- patches/patch-spectrwm_1
> +++ patches/patch-spectrwm_1
> @@ -1,12 +1,12 @@
> Index: spectrwm.1
> --- spectrwm.1.orig
> +++ spectrwm.1
> -@@ -164,7 +164,7 @@ For example, starting
> - via
> - .Xr xinit 1 :
> +@@ -1990,7 +1990,7 @@ via
> + .Pa LD_PRELOAD
> + must be specified.
> .Bd -literal -offset indent
> -LD_PRELOAD=/usr/lib/libswmhack.so.0.0 urxvtd -q -o -f
> +LD_PRELOAD=${PREFIX}/lib/libswmhack.so.${LIBswmhack_VERSION} urxvtd -q -o -f
> .Ed
> .Pp
> - Spawned programs automatically have
> + Note that some operating systems may ignore
> diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
> index 6404edb119c..6fc372bca93 100644
> --- patches/patch-spectrwm_c
> +++ patches/patch-spectrwm_c
> @@ -1,7 +1,7 @@
> Index: spectrwm.c
> --- spectrwm.c.orig
> +++ spectrwm.c
> -@@ -373,7 +373,7 @@ uint32_t swm_debug = 0
> +@@ -379,7 +379,7 @@ uint32_t swm_debug = 0
> #define SWM_CONF_WHITESPACE " \t\n"
>
> #ifndef SWM_LIB
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2023/11/25 04:57:57 Modified files: sysutils/cdrtools/patches: patch-inc_avoffset_c Log message: put the explanation comment before the Index line of the patch reminded by Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/25 04:21:32 Modified files: wayland/sway : Makefile distinfo Added files: wayland/sway/patches: patch-common_stringop_c patch-include_stringop_h patch-meson_build patch-sway_config_bar_c patch-sway_config_c patch-swaybar_meson_build patch-swaynag_config_c patch-swaynag_meson_build Log message: wayland/sway: switch to upstream source, and update to a newer commit - commit chosen to be before upstream starts using wlroots>0.17 APIs. - convert matthieu's porting commit from https://github.com/mherrb/sway/commit/1f64b183d3c12aaf54f43c474a709cc79ccbbb59 to proper port patches still UNLINKED because of the RDEP on wayland/foot ok matthieu@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/11/25 04:16:14 Modified files: wayland/wlroots: Makefile distinfo wayland/wlroots/pkg: PLIST Added files: wayland/wlroots/patches: patch-meson_build patch-render_vulkan_vulkan_c patch-xcursor_xcursor_c Log message: wayland/wlroots: update to 0.17.0. - switch to the upstream tarballs - move matthieu's commits from https://gitlab.freedesktop.org/mherrb/wlroots/-/compare/master...obsd?from_project_id=12103 to patches - bump EPOCH ok matthieu@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 04:04:45 Modified files: devel/p5-Scope-Upper: Makefile distinfo Log message: Update to p5-Scope-Upper-0.34.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2023/11/25 04:04:12 Added files: sysutils/cdrtools/patches: patch-inc_avoffset_c Log message: Backport llvm fix from 3.01, fixes build for aarch64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:54:16 Modified files: devel/p5-Proc-Background: Makefile distinfo Log message: Update to p5-Proc-Background-1.32.
UPDATE x11/spectrwm-3.5.1
Diff below brings spectrwm to 3.5.1. Changes:
https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_1
OK?
diff --git Makefile Makefile
index 45da60f00e1..fae035a6dde 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
COMMENT= small tiling window manager
-V= 3.5.0
+V= 3.5.1
DIST_TUPLE=github conformal spectrwm SPECTRWM_${V:S/./_/g} /
DISTNAME= spectrwm-${V}
diff --git distinfo distinfo
index a12233acd18..2e0f3b923c5 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) =
tN6LLFkvxapMpNvQ6KQh9/0Wi31fVMetgZl63ADawg8=
-SIZE (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 194387
+SHA256 (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) =
f+QmAgilLZ+4RCkdCv5q8YiHxUUt8Lkh7XgK97kiPw8=
+SIZE (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 196431
diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
index e002bc0b708..08dc93fa75b 100644
--- patches/patch-spectrwm_1
+++ patches/patch-spectrwm_1
@@ -1,12 +1,12 @@
Index: spectrwm.1
--- spectrwm.1.orig
+++ spectrwm.1
-@@ -164,7 +164,7 @@ For example, starting
- via
- .Xr xinit 1 :
+@@ -1990,7 +1990,7 @@ via
+ .Pa LD_PRELOAD
+ must be specified.
.Bd -literal -offset indent
-LD_PRELOAD=/usr/lib/libswmhack.so.0.0 urxvtd -q -o -f
+LD_PRELOAD=${PREFIX}/lib/libswmhack.so.${LIBswmhack_VERSION} urxvtd -q -o -f
.Ed
.Pp
- Spawned programs automatically have
+ Note that some operating systems may ignore
diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
index 6404edb119c..6fc372bca93 100644
--- patches/patch-spectrwm_c
+++ patches/patch-spectrwm_c
@@ -1,7 +1,7 @@
Index: spectrwm.c
--- spectrwm.c.orig
+++ spectrwm.c
-@@ -373,7 +373,7 @@ uint32_t swm_debug = 0
+@@ -379,7 +379,7 @@ uint32_t swm_debug = 0
#define SWM_CONF_WHITESPACE " \t\n"
#ifndef SWM_LIB
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:25:29 Modified files: devel/p5-POSIX-strftime-Compiler: Makefile distinfo Log message: Update to p5-POSIX-strftime-Compiler-0.45.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2023/11/25 03:24:56 Modified files: meta/tor-browser: Makefile www/tor-browser: Makefile.inc www/tor-browser/browser: Makefile distinfo Log message: Tor Browser: update to 13.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:20:34 Modified files: devel/p5-PerlIO-eol: Makefile distinfo Log message: Update to p5-PerlIO-eol-0.19.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:15:59 Modified files: devel/p5-PAR : Makefile distinfo Log message: Update to p5-PAR-1.019.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:09:45 Modified files: devel/p5-Package-DeprecationManager: Makefile distinfo Log message: Update to p5-Package-DeprecationManager-0.18.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:03:51 Modified files: devel/p5-Log-Any-Adapter-Callback: Makefile distinfo Log message: Update to p5-Log-Any-Adapter-Callback-0.102.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 03:00:03 Modified files: devel/p5-Graph : Makefile distinfo Log message: Update to p5-Graph-0.9727.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 02:55:01 Modified files: devel/p5-Getopt-Euclid: Makefile distinfo Log message: Update to p5-Getopt-Euclid-0.4.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: matth...@cvs.openbsd.org2023/11/25 02:49:05 Removed files: wayland: TODO-Wayland.md Log message: Remove this file. Information in it is becoming stale fast. To be replaced by a FAQ entry or a manual page at some point
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:45:48 Modified files: sysutils/deja-dup: Makefile Log message: Bump for gtk4-wayland.
Re: [update] wayland/sway & wayland/wlroots 0.17.0
On Fri, Nov 24, 2023 at 07:09:06PM +0100, Landry Breuil wrote:
> hi,
>
> here's two diffs to update wlroots to the recently released 0.17.0, and
> update sway to a more recent commit (eg last commit before they started
> using wlroots apis not in 0.17.0).
>
> Both ports now use upstream sources, and i've added your commits as
> patches in most places, taken from
> https://gitlab.freedesktop.org/mherrb/wlroots/-/compare/master...obsd?from_project_id=12103
> and
> https://github.com/mherrb/sway/commit/1f64b183d3c12aaf54f43c474a709cc79ccbbb59
> for the latter, some of the work that was done to find config files in
> swayidle/swaylock can be reused.
>
> sway runs fine here - ive reseted the version since it's still UNLINKED,
> but i've bumped EPOCH for wlroots.
>
> feedback and testing welcome :)
Ok. I've not yet been able to test, but I trust you that it works.
Note for later: there are a number of wayland related ports for which
we have to patch out -lrt from meson.build. The patches to do that are
highly in-coherent... would be nice to decide on an idiom and use it
everywhere.
>
> Landry
> Index: Makefile
> ===
> RCS file: /cvs/ports/wayland/sway/Makefile,v
> retrieving revision 1.6
> diff -u -r1.6 Makefile
> --- Makefile 12 Nov 2023 10:46:11 - 1.6
> +++ Makefile 24 Nov 2023 17:57:58 -
> @@ -1,13 +1,10 @@
> COMMENT =i3-compatible Wayland compositor
> UNLINKED = wayland
>
> -V = 20231108
> -PKGNAME =sway-${V}
> -
> -GH_ACCOUNT = mherrb
> +GH_ACCOUNT = swaywm
> GH_PROJECT = sway
> -GH_TAGNAME = sway-obsd-${V}
> -
> +GH_COMMIT = bff991dfdc63ca3785a810ff4d913ddfd71677a1
> +DISTNAME = ${GH_PROJECT}-1.8.1pl20231121
> CATEGORIES = wayland
>
> HOMEPAGE = https://github.com/swaywm/sway
> Index: distinfo
> ===
> RCS file: /cvs/ports/wayland/sway/distinfo,v
> retrieving revision 1.2
> diff -u -r1.2 distinfo
> --- distinfo 8 Nov 2023 14:04:07 - 1.2
> +++ distinfo 24 Nov 2023 17:57:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (sway-sway-obsd-20231108.tar.gz) =
> YC2EMMvJDzJ/XHaz+sve1ND1JhDp7HEYnD4wQyPYhfE=
> -SIZE (sway-sway-obsd-20231108.tar.gz) = 5580535
> +SHA256 (sway-1.8.1pl20231121-bff991df.tar.gz) =
> 6WbJ34/vaJ6cwLp6BYh/ogpnz2a0Qz/FPXA9CwhT9WA=
> +SIZE (sway-1.8.1pl20231121-bff991df.tar.gz) = 5581167
> Index: patches/patch-common_stringop_c
> ===
> RCS file: patches/patch-common_stringop_c
> diff -N patches/patch-common_stringop_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-common_stringop_c 24 Nov 2023 17:57:58 -
> @@ -0,0 +1,20 @@
> +Index: common/stringop.c
> +--- common/stringop.c.orig
> common/stringop.c
> +@@ -6,7 +6,16 @@
> + #include
> + #include
> + #include
> ++#ifndef __OpenBSD__
> + #include
> ++#else
> ++#include
> ++#define wordexp_t glob_t
> ++#define wordfree globfree
> ++#define wordexp(s,p,f) glob((s), GLOB_DOOFFS, NULL, (p))
> ++#define we_wordc gl_pathc
> ++#define we_wordv gl_pathv
> ++#endif
> + #include "list.h"
> + #include "log.h"
> + #include "stringop.h"
> Index: patches/patch-include_stringop_h
> ===
> RCS file: patches/patch-include_stringop_h
> diff -N patches/patch-include_stringop_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-include_stringop_h 24 Nov 2023 17:57:58 -
> @@ -0,0 +1,11 @@
> +Index: include/stringop.h
> +--- include/stringop.h.orig
> include/stringop.h
> +@@ -1,6 +1,7 @@
> + #ifndef _SWAY_STRINGOP_H
> + #define _SWAY_STRINGOP_H
> +
> ++#include
> + #include
> + #include
> + #include "list.h"
> Index: patches/patch-meson_build
> ===
> RCS file: patches/patch-meson_build
> diff -N patches/patch-meson_build
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-meson_build 24 Nov 2023 17:57:58 -
> @@ -0,0 +1,11 @@
> +Index: meson.build
> +--- meson.build.orig
> meson.build
> +@@ -81,7 +81,6 @@ drm_full = dependency('libdrm') # only needed for drm_
> + drm = drm_full.partial_dependency(compile_args: true, includes: true)
> + libudev = wlroots_features['libinput_backend'] ? dependency('libudev') :
> null_dep
> + math = cc.find_library('m')
> +-rt = cc.find_library('rt')
> + xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
> + threads = dependency('threads') # for pthread_setschedparam
> +
> Index: patches/patch-meson_build.orig
> ===
> RCS file: patches/patch-meson_build.orig
> diff -N patches/patch-meson_build.orig
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-meson_build.orig24 Nov 2023 17:57:58 -
> @@ -0,0 +1,11 @@
> +Index: meson.build
> +--- meson.build.orig
> meson.build
> +@@ -81,7 +81,6 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 02:44:41 Modified files: devel/p5-ExtUtils-CppGuess: Makefile distinfo Log message: Update to p5-ExtUtils-CppGuess-0.27.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:41:44 Modified files: multimedia/gstreamer1/plugins-bad: Makefile multimedia/gstreamer1/plugins-bad/pkg: PLIST multimedia/gstreamer1/plugins-base: Makefile multimedia/gstreamer1/plugins-base/pkg: PLIST Log message: Enable Wayland support.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:41:04 Modified files: sysutils/flatpak/xdg-desktop-portal-gnome: Makefile Log message: Regen WANTLIB for wayland-client.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:40:37 Modified files: x11/gnome/tecla: Makefile Log message: Regen WANTLIB for wayland-client.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:40:04 Modified files: x11/gtk+4 : Makefile x11/gtk+4/pkg : PLIST-main Log message: Add Wayland support so that we can start testing GTK4 apps. prodded by and ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 02:33:12 Modified files: devel/p5-Data-OptList: Makefile distinfo Log message: Update to p5-Data-OptList-0.114.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 02:23:07 Modified files: devel/p5-Class-Meta-Express: Makefile distinfo Log message: pdate to p5-Class-Meta-Express-0.14.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:13:31 Modified files: textproc/gi-docgen: Makefile distinfo textproc/gi-docgen/pkg: PLIST Log message: Update to gi-docgen-2023.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:13:17 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.30.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:12:48 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.29.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/11/25 02:12:40 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.32.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 02:03:21 Modified files: devel/p5-Carp-Assert: Makefile distinfo Log message: Update to p5-Carp-Assert-0.22.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/11/25 01:58:50 Modified files: devel/p5-App-Cmd: Makefile distinfo Log message: Update to p5-App-Cmd-0.336.
Re: devel/py-installer dependency weirdness?
On 2023/11/25 00:06, Laurence Tratt wrote: > While `make update`ing Firefox, I stumbled across this build error: > > ===> py3-build-1.0.3 depends on: py3-installer-* - not found > ===> Verifying install for py3-installer-* in devel/py-installer > ===> Checking files for py3-installer-0.7.0 > >> Fetch https://pypi.io/packages/source/i/installer/installer-0.7.0.tar.gz > installer-0.7.0.tar.gz 100% |***| 463 KB00:05 > > >> (SHA256) installer-0.7.0.tar.gz: OK > ===> Extracting for py3-installer-0.7.0 This seems like it's building in an existing work dir, prepared at a time when flit_core was already installed. A fresh build should look more like this: $ make ===> Building from scratch py3-installer-0.7.0 ===> py3-installer-0.7.0 depends on: py3-flit_core-* -> py3-flit_core-3.9.0 ===> py3-installer-0.7.0 depends on: python->=3.10,<3.11 -> python-3.10.13p0 ===> Checking files for py3-installer-0.7.0 `/y/Download/ftp/pub/OpenBSD/distfiles/installer-0.7.0.tar.gz' is up to date. >> (SHA256) installer-0.7.0.tar.gz: OK ===> Extracting for py3-installer-0.7.0 What happens if you make clean first? (For the actual "build firefox" task I suggest running "make prepare FETCH_PACKAGES=" first).
