Date: Sat, 15 Nov 2025 13:23:44 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 54e14a5a5f62 - main - x11/oscar: Update to 1.6.1 and switch to QT6 Message-ID: <202511151323.5AFDNiXU032772@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=54e14a5a5f6266aa67be71f893f28286ee07da11 commit 54e14a5a5f6266aa67be71f893f28286ee07da11 Author: Stéphane D'Alu <sdalu@sdalu.com> AuthorDate: 2025-11-15 08:23:45 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2025-11-15 11:52:43 +0000 x11/oscar: Update to 1.6.1 and switch to QT6 Changelog (html only): https://gitlab.com/CrimsonNape/OSCAR-code/-/raw/v1.6.1/release_notes.html?ref_type=tags PR: 290491 --- x11/oscar/Makefile | 8 +- x11/oscar/distinfo | 6 +- x11/oscar/files/patch-SleepLib_common.cpp | 10 +- x11/oscar/pkg-plist | 374 ++++++++++++++---------------- 4 files changed, 188 insertions(+), 210 deletions(-) diff --git a/x11/oscar/Makefile b/x11/oscar/Makefile index 8354dd10e406..60579966e1de 100644 --- a/x11/oscar/Makefile +++ b/x11/oscar/Makefile @@ -1,6 +1,6 @@ PORTNAME= OSCAR DISTVERSIONPREFIX= v -DISTVERSION= 1.5.1 +DISTVERSION= 1.6.1 CATEGORIES= x11 MAINTAINER= sdalu@sdalu.com @@ -11,13 +11,13 @@ LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash -USES= gmake qmake:outsource qt:5 shebangfix xorg gl desktop-file-utils +USES= gmake qmake:outsource qt:6 shebangfix xorg gl desktop-file-utils USE_XORG= x11 USE_GL= gl glu -USE_QT= gui printsupport opengl widgets network xml serialport core linguisttools:build buildtools:build +USE_QT= base tools serialport USE_GITLAB= yes -GL_ACCOUNT= pholy +GL_ACCOUNT= CrimsonNape GL_PROJECT= OSCAR-code WRKSRC_SUBDIR= oscar diff --git a/x11/oscar/distinfo b/x11/oscar/distinfo index 7098ad7c120a..d4588ad7517a 100644 --- a/x11/oscar/distinfo +++ b/x11/oscar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705257812 -SHA256 (OSCAR-code-v1.5.1.tar.bz2) = a7d7668f0d2480835fa409f7585e1c6ba55684909fc2b98b86197913948044d8 -SIZE (OSCAR-code-v1.5.1.tar.bz2) = 6727600 +TIMESTAMP = 1761349814 +SHA256 (OSCAR-code-v1.6.1.tar.bz2) = 7d1b5e4a2888537657742c9faed028b459f6cd54dd91e985604cc2d34b00fd33 +SIZE (OSCAR-code-v1.6.1.tar.bz2) = 6878709 diff --git a/x11/oscar/files/patch-SleepLib_common.cpp b/x11/oscar/files/patch-SleepLib_common.cpp index fb5de5c17145..3a6e7aec67e1 100644 --- a/x11/oscar/files/patch-SleepLib_common.cpp +++ b/x11/oscar/files/patch-SleepLib_common.cpp @@ -1,10 +1,10 @@ ---- SleepLib/common.cpp -+++ SleepLib/common.cpp -@@ -248,7 +248,7 @@ QString appResourcePath() - // This one will be used if the Html and Translations folders +--- SleepLib/common.cpp 2025-07-20 16:34:44.000000000 +0200 ++++ SleepLib/common.cpp 2025-10-25 02:20:32.076356000 +0200 +@@ -285,7 +285,7 @@ + // This one will be used if the Html and Translations folders // are in the same folder as the OSCAR executable paths.append( QCoreApplication::applicationDirPath() ); --#ifdef Q_OS_LINUX +-#ifdef Q_OS_LINUX +#if defined (Q_OS_LINUX) || defined (Q_OS_FREEBSD) QString appName = QCoreApplication::applicationName(); if (appName != QString("OSCAR")) diff --git a/x11/oscar/pkg-plist b/x11/oscar/pkg-plist index 040ff31175cb..ce7cf8cc5816 100644 --- a/x11/oscar/pkg-plist +++ b/x11/oscar/pkg-plist @@ -1,202 +1,180 @@ bin/OSCAR -%%DATADIR%%/help/help_en/daily.html -%%DATADIR%%/help/help_en/default.css -%%DATADIR%%/help/help_en/faq.html -%%DATADIR%%/help/help_en/gettingstarted.html -%%DATADIR%%/help/help_en/glossary.html -%%DATADIR%%/help/help_en/import.html -%%DATADIR%%/help/help_en/index.html -%%DATADIR%%/help/help_en/OSCAR_Guide_en.qhp -%%DATADIR%%/help/help_en/overview.html -%%DATADIR%%/help/help_en/oximetry.html -%%DATADIR%%/help/help_en/reportingbugs.html -%%DATADIR%%/help/help_en/statistics.html -%%DATADIR%%/help/help_en/supported.html -%%DATADIR%%/help/help_en/tipsntricks.html -%%DATADIR%%/help/help_nl/daily.html -%%DATADIR%%/help/help_nl/default.css -%%DATADIR%%/help/help_nl/faq.html -%%DATADIR%%/help/help_nl/gettingstarted.html -%%DATADIR%%/help/help_nl/glossary.html -%%DATADIR%%/help/help_nl/import.html -%%DATADIR%%/help/help_nl/index.html -%%DATADIR%%/help/help_nl/OSCAR_Guide_nl.qhp -%%DATADIR%%/help/help_nl/overview.html -%%DATADIR%%/help/help_nl/oximetry.html -%%DATADIR%%/help/help_nl/reportingbugs.html -%%DATADIR%%/help/help_nl/statistics.html -%%DATADIR%%/help/help_nl/supported.html -%%DATADIR%%/help/help_nl/tipsntricks.html -%%DATADIR%%/help/images/aircurve.png -%%DATADIR%%/help/images/airsense10.png -%%DATADIR%%/help/images/cms50f.png -%%DATADIR%%/help/images/dreamstation.png -%%DATADIR%%/help/images/dv64.png -%%DATADIR%%/help/images/fp_icon.png -%%DATADIR%%/help/images/intellipap.png -%%DATADIR%%/help/images/logo.png -%%DATADIR%%/help/images/oximeter.png -%%DATADIR%%/help/images/prs1_60s.png -%%DATADIR%%/help/images/prs1_960.png -%%DATADIR%%/help/images/prs1.png -%%DATADIR%%/help/images/rms9.png -%%DATADIR%%/help/index.qhcp -%%DATADIR%%/Html/about-af.html -%%DATADIR%%/Html/about-ar.html -%%DATADIR%%/Html/about-bg.html -%%DATADIR%%/Html/about-da.html -%%DATADIR%%/Html/about-de.html -%%DATADIR%%/Html/about-el.html -%%DATADIR%%/Html/about-es.html -%%DATADIR%%/Html/about-fi.html -%%DATADIR%%/Html/about-fil.html -%%DATADIR%%/Html/about-fr.html -%%DATADIR%%/Html/about-he.html -%%DATADIR%%/Html/about-hu.html -%%DATADIR%%/Html/about-it.html -%%DATADIR%%/Html/about-nl.html -%%DATADIR%%/Html/about-no.html -%%DATADIR%%/Html/about-pl.html -%%DATADIR%%/Html/about-pt_BR.html -%%DATADIR%%/Html/about-pt.html -%%DATADIR%%/Html/about-ro.html -%%DATADIR%%/Html/about-sv.html -%%DATADIR%%/Html/about-th.html -%%DATADIR%%/Html/about-tr.html -%%DATADIR%%/Html/about-zh.html -%%DATADIR%%/Html/about.html -%%DATADIR%%/Html/credits.html -%%DATADIR%%/Html/release_notes.html -%%DATADIR%%/icons/aircurve.png -%%DATADIR%%/icons/airsense10.png -%%DATADIR%%/icons/arrow-end.png -%%DATADIR%%/icons/arrow-left.png -%%DATADIR%%/icons/arrow-right.png -%%DATADIR%%/icons/back.png -%%DATADIR%%/icons/bookmark.png -%%DATADIR%%/icons/checkmark.png -%%DATADIR%%/icons/cms50f.png -%%DATADIR%%/icons/cog.png -%%DATADIR%%/icons/cubeoximeter.png -%%DATADIR%%/icons/daily.png -%%DATADIR%%/icons/dreamstation.png -%%DATADIR%%/icons/dv64.png -%%DATADIR%%/icons/edit-find.png -%%DATADIR%%/icons/empty_box.png -%%DATADIR%%/icons/exit.png -%%DATADIR%%/icons/eye.png -%%DATADIR%%/icons/forward.png -%%DATADIR%%/icons/fp_icon.png -%%DATADIR%%/icons/go-home.png -%%DATADIR%%/icons/help.png -%%DATADIR%%/icons/intellipap.png -%%DATADIR%%/icons/last.png -%%DATADIR%%/icons/logo-lg.png -%%DATADIR%%/icons/logo-lm.png -%%DATADIR%%/icons/logo-md.png -%%DATADIR%%/icons/logo-sm.png -%%DATADIR%%/icons/logo.ico -%%DATADIR%%/icons/mask.png -%%DATADIR%%/icons/moon.png -%%DATADIR%%/icons/OSCAR.icns -%%DATADIR%%/icons/overview-page.png -%%DATADIR%%/icons/overview.png -%%DATADIR%%/icons/oximeter.png -%%DATADIR%%/icons/plus.png -%%DATADIR%%/icons/prds2.png -%%DATADIR%%/icons/preferences.png -%%DATADIR%%/icons/prs1_60s.png -%%DATADIR%%/icons/prs1_960.png -%%DATADIR%%/icons/prs1.png -%%DATADIR%%/icons/prs1vent.png -%%DATADIR%%/icons/pushpin.png -%%DATADIR%%/icons/question_mark.png -%%DATADIR%%/icons/README.txt -%%DATADIR%%/icons/refresh.png -%%DATADIR%%/icons/rename.png -%%DATADIR%%/icons/restore.png -%%DATADIR%%/icons/resvent.png -%%DATADIR%%/icons/return.png -%%DATADIR%%/icons/rms9.png -%%DATADIR%%/icons/sadface.png -%%DATADIR%%/icons/save.png -%%DATADIR%%/icons/sdcard-lock.png -%%DATADIR%%/icons/sdcard.png -%%DATADIR%%/icons/session-off.png -%%DATADIR%%/icons/session-on.png -%%DATADIR%%/icons/smileyface.png -%%DATADIR%%/icons/statistics.png -%%DATADIR%%/icons/svg/applications-viewers.svg -%%DATADIR%%/icons/svg/back.svg -%%DATADIR%%/icons/svg/calendar.svg -%%DATADIR%%/icons/svg/close-window.svg -%%DATADIR%%/icons/svg/edit-find.svg -%%DATADIR%%/icons/svg/emblem-marketing.svg -%%DATADIR%%/icons/svg/forward.svg -%%DATADIR%%/icons/svg/gnome-dev-media-sdmmc.svg -%%DATADIR%%/icons/svg/media.svg -%%DATADIR%%/icons/svg/moon.svg -%%DATADIR%%/icons/svg/preferences.svg -%%DATADIR%%/icons/trash_can.png -%%DATADIR%%/icons/trophy.png -%%DATADIR%%/icons/up-down.png -%%DATADIR%%/icons/update.png -%%DATADIR%%/icons/warning.png -%%DATADIR%%/Translations/Afrikaans.af.qm -%%DATADIR%%/Translations/Arabic.ar.qm -%%DATADIR%%/Translations/Bulgarian.bg.qm -%%DATADIR%%/Translations/Chinese.zh_CN.qm -%%DATADIR%%/Translations/Chinese.zh_TW.qm -%%DATADIR%%/Translations/Czech.cz.qm -%%DATADIR%%/Translations/Dansk.da.qm -%%DATADIR%%/Translations/Deutsch.de.qm -%%DATADIR%%/Translations/English.en_UK.qm -%%DATADIR%%/Translations/Espaniol.es_MX.qm -%%DATADIR%%/Translations/Espaniol.es.qm -%%DATADIR%%/Translations/Filipino.fil.qm -%%DATADIR%%/Translations/Filipino.ph.qm -%%DATADIR%%/Translations/Francais.fr.qm -%%DATADIR%%/Translations/Greek.el.qm -%%DATADIR%%/Translations/Hebrew.he.qm -%%DATADIR%%/Translations/Italiano.it.qm -%%DATADIR%%/Translations/Japanese.ja.qm -%%DATADIR%%/Translations/Korean.ko.qm -%%DATADIR%%/Translations/Magyar.hu.qm -%%DATADIR%%/Translations/Nederlands.nl.qm -%%DATADIR%%/Translations/Norsk.no.qm -%%DATADIR%%/Translations/oscar_qt_af.qm -%%DATADIR%%/Translations/oscar_qt_ar.qm -%%DATADIR%%/Translations/oscar_qt_bg.qm -%%DATADIR%%/Translations/oscar_qt_da.qm -%%DATADIR%%/Translations/oscar_qt_de.qm -%%DATADIR%%/Translations/oscar_qt_el.qm -%%DATADIR%%/Translations/oscar_qt_es.qm -%%DATADIR%%/Translations/oscar_qt_fi.qm -%%DATADIR%%/Translations/oscar_qt_fil.qm -%%DATADIR%%/Translations/oscar_qt_fr.qm -%%DATADIR%%/Translations/oscar_qt_he.qm -%%DATADIR%%/Translations/oscar_qt_it.qm -%%DATADIR%%/Translations/oscar_qt_ja.qm -%%DATADIR%%/Translations/oscar_qt_ko.qm -%%DATADIR%%/Translations/oscar_qt_nl.qm -%%DATADIR%%/Translations/oscar_qt_no.qm -%%DATADIR%%/Translations/oscar_qt_pl.qm -%%DATADIR%%/Translations/oscar_qt_pt.qm -%%DATADIR%%/Translations/oscar_qt_ro.qm -%%DATADIR%%/Translations/oscar_qt_ru.qm -%%DATADIR%%/Translations/oscar_qt_sv.qm -%%DATADIR%%/Translations/oscar_qt_th.qm -%%DATADIR%%/Translations/oscar_qt_tr.qm -%%DATADIR%%/Translations/oscar_qt_zh.qm -%%DATADIR%%/Translations/Polski.pl.qm -%%DATADIR%%/Translations/Portugues.pt_BR.qm -%%DATADIR%%/Translations/Portugues.pt.qm -%%DATADIR%%/Translations/Romanian.ro.qm -%%DATADIR%%/Translations/Russkiy.ru.qm -%%DATADIR%%/Translations/Suomi.fi.qm -%%DATADIR%%/Translations/Svenska.sv.qm -%%DATADIR%%/Translations/Thai.th.qm -%%DATADIR%%/Translations/Turkish.tr.qm share/applications/OSCAR.desktop share/icons/hicolor/48x48/apps/OSCAR.png share/icons/hicolor/scalable/apps/OSCAR.svg +share/OSCAR/help/help_en/daily.html +share/OSCAR/help/help_en/default.css +share/OSCAR/help/help_en/faq.html +share/OSCAR/help/help_en/gettingstarted.html +share/OSCAR/help/help_en/glossary.html +share/OSCAR/help/help_en/import.html +share/OSCAR/help/help_en/index.html +share/OSCAR/help/help_en/OSCAR_Guide_en.qhp +share/OSCAR/help/help_en/overview.html +share/OSCAR/help/help_en/oximetry.html +share/OSCAR/help/help_en/reportingbugs.html +share/OSCAR/help/help_en/statistics.html +share/OSCAR/help/help_en/supported.html +share/OSCAR/help/help_en/tipsntricks.html +share/OSCAR/help/help_nl/daily.html +share/OSCAR/help/help_nl/default.css +share/OSCAR/help/help_nl/faq.html +share/OSCAR/help/help_nl/gettingstarted.html +share/OSCAR/help/help_nl/glossary.html +share/OSCAR/help/help_nl/import.html +share/OSCAR/help/help_nl/index.html +share/OSCAR/help/help_nl/OSCAR_Guide_nl.qhp +share/OSCAR/help/help_nl/overview.html +share/OSCAR/help/help_nl/oximetry.html +share/OSCAR/help/help_nl/reportingbugs.html +share/OSCAR/help/help_nl/statistics.html +share/OSCAR/help/help_nl/supported.html +share/OSCAR/help/help_nl/tipsntricks.html +share/OSCAR/help/images/aircurve.png +share/OSCAR/help/images/airsense10.png +share/OSCAR/help/images/cms50f.png +share/OSCAR/help/images/dreamstation.png +share/OSCAR/help/images/dv64.png +share/OSCAR/help/images/fp_icon.png +share/OSCAR/help/images/intellipap.png +share/OSCAR/help/images/logo.png +share/OSCAR/help/images/oximeter.png +share/OSCAR/help/images/prs1_60s.png +share/OSCAR/help/images/prs1_960.png +share/OSCAR/help/images/prs1.png +share/OSCAR/help/images/rms9.png +share/OSCAR/help/index.qhcp +share/OSCAR/Html/about-af.html +share/OSCAR/Html/about-ar.html +share/OSCAR/Html/about-bg.html +share/OSCAR/Html/about-da.html +share/OSCAR/Html/about-de.html +share/OSCAR/Html/about-el.html +share/OSCAR/Html/about-es.html +share/OSCAR/Html/about-fi.html +share/OSCAR/Html/about-fil.html +share/OSCAR/Html/about-fr.html +share/OSCAR/Html/about-he.html +share/OSCAR/Html/about-hu.html +share/OSCAR/Html/about-it.html +share/OSCAR/Html/about-nl.html +share/OSCAR/Html/about-no.html +share/OSCAR/Html/about-ph.html +share/OSCAR/Html/about-pl.html +share/OSCAR/Html/about-pt_BR.html +share/OSCAR/Html/about-pt.html +share/OSCAR/Html/about-ro.html +share/OSCAR/Html/about-ru.html +share/OSCAR/Html/about-sv.html +share/OSCAR/Html/about-th.html +share/OSCAR/Html/about-tr.html +share/OSCAR/Html/about-zh.html +share/OSCAR/Html/about.html +share/OSCAR/Html/credits.html +share/OSCAR/Html/release_notes.html +share/OSCAR/icons/aircurve.png +share/OSCAR/icons/airsense10.png +share/OSCAR/icons/arrow-end.png +share/OSCAR/icons/arrow-left.png +share/OSCAR/icons/arrow-right.png +share/OSCAR/icons/back.png +share/OSCAR/icons/bmc.png +share/OSCAR/icons/bookmark.png +share/OSCAR/icons/checkmark.png +share/OSCAR/icons/cms50f.png +share/OSCAR/icons/cog.png +share/OSCAR/icons/cubeoximeter.png +share/OSCAR/icons/daily.png +share/OSCAR/icons/dreamstation.png +share/OSCAR/icons/dv64.png +share/OSCAR/icons/edit-find.png +share/OSCAR/icons/empty_box.png +share/OSCAR/icons/exit.png +share/OSCAR/icons/eye.png +share/OSCAR/icons/forward.png +share/OSCAR/icons/fp_icon.png +share/OSCAR/icons/go-home.png +share/OSCAR/icons/help.png +share/OSCAR/icons/intellipap.png +share/OSCAR/icons/last.png +share/OSCAR/icons/logo-lg.png +share/OSCAR/icons/logo-lm.png +share/OSCAR/icons/logo-md.png +share/OSCAR/icons/logo-sm.png +share/OSCAR/icons/logo.ico +share/OSCAR/icons/mask.png +share/OSCAR/icons/moon.png +share/OSCAR/icons/OSCAR.icns +share/OSCAR/icons/overview-page.png +share/OSCAR/icons/overview.png +share/OSCAR/icons/oximeter.png +share/OSCAR/icons/plus.png +share/OSCAR/icons/prds2.png +share/OSCAR/icons/preferences.png +share/OSCAR/icons/prs1_60s.png +share/OSCAR/icons/prs1_960.png +share/OSCAR/icons/prs1.png +share/OSCAR/icons/prs1vent.png +share/OSCAR/icons/pushpin.png +share/OSCAR/icons/question_mark.png +share/OSCAR/icons/README.txt +share/OSCAR/icons/refresh.png +share/OSCAR/icons/rename.png +share/OSCAR/icons/restore.png +share/OSCAR/icons/resvent.png +share/OSCAR/icons/return.png +share/OSCAR/icons/rms9.png +share/OSCAR/icons/sadface.png +share/OSCAR/icons/save.png +share/OSCAR/icons/sdcard-lock.png +share/OSCAR/icons/sdcard.png +share/OSCAR/icons/session-off.png +share/OSCAR/icons/session-on.png +share/OSCAR/icons/smileyface.png +share/OSCAR/icons/statistics.png +share/OSCAR/icons/svg/applications-viewers.svg +share/OSCAR/icons/svg/back.svg +share/OSCAR/icons/svg/calendar.svg +share/OSCAR/icons/svg/close-window.svg +share/OSCAR/icons/svg/edit-find.svg +share/OSCAR/icons/svg/emblem-marketing.svg +share/OSCAR/icons/svg/forward.svg +share/OSCAR/icons/svg/gnome-dev-media-sdmmc.svg +share/OSCAR/icons/svg/media.svg +share/OSCAR/icons/svg/moon.svg +share/OSCAR/icons/svg/preferences.svg +share/OSCAR/icons/trash_can.png +share/OSCAR/icons/trophy.png +share/OSCAR/icons/up-down.png +share/OSCAR/icons/update.png +share/OSCAR/icons/warning.png +share/OSCAR/Translations/Afrikaans.af.qm +share/OSCAR/Translations/Arabic.ar.qm +share/OSCAR/Translations/Bulgarian.bg.qm +share/OSCAR/Translations/Chinese.zh_CN.qm +share/OSCAR/Translations/Chinese.zh_TW.qm +share/OSCAR/Translations/Czech.cz.qm +share/OSCAR/Translations/Dansk.da.qm +share/OSCAR/Translations/Deutsch.de.qm +share/OSCAR/Translations/English.en_UK.qm +share/OSCAR/Translations/Espaniol.es_MX.qm +share/OSCAR/Translations/Espaniol.es.qm +share/OSCAR/Translations/Filipino.fil.qm +share/OSCAR/Translations/Francais.fr.qm +share/OSCAR/Translations/Greek.el.qm +share/OSCAR/Translations/Hebrew.he.qm +share/OSCAR/Translations/Italiano.it.qm +share/OSCAR/Translations/Japanese.ja.qm +share/OSCAR/Translations/Korean.ko.qm +share/OSCAR/Translations/Magyar.hu.qm +share/OSCAR/Translations/Nederlands.nl.qm +share/OSCAR/Translations/Norsk.no.qm +share/OSCAR/Translations/Polski.pl.qm +share/OSCAR/Translations/Portugues.pt_BR.qm +share/OSCAR/Translations/Portugues.pt.qm +share/OSCAR/Translations/Romanian.ro.qm +share/OSCAR/Translations/Russkiy.ru.qm +share/OSCAR/Translations/Suomi.fi.qm +share/OSCAR/Translations/Svenska.sv.qm +share/OSCAR/Translations/Thai.th.qm +share/OSCAR/Translations/Turkish.tr.qmhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511151323.5AFDNiXU032772>