From eccf3a0810bc5ae2913e990f6e577f5e747d907e Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 13 Jan 2025 15:48:19 +0300 Subject: [PATCH] Extend merge for qtpbfimageformat (fixes #913) --- 800.renames-and-merges/q.yaml | 3 ++- 900.version-fixes/l.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/800.renames-and-merges/q.yaml b/800.renames-and-merges/q.yaml index edc068d8f..7b9ce253f 100644 --- a/800.renames-and-merges/q.yaml +++ b/800.renames-and-merges/q.yaml @@ -72,7 +72,8 @@ - { setname: qtkeychain, name: [qt4-qtkeychain,qt5-qtkeychain,qt5keychain,qtkeychain-qt4,qtkeychain-qt5,qt5-keychain,libqtkeychain], addflavor: true } - { setname: qtoctave, name: qtoctave-mac } - { setname: qtox, name: qtox-alpha, weak_devel: true, nolegacy: true } -- { setname: qtpbfimageplugin, name: [qt5-pbfimageplugin,libqt5-qtpbfimageformat,qt5-qtpbfimageformat] } +- { setname: qtpbfimageplugin, name: [qt5-pbfimageplugin,libqt5-qtpbfimageformat,qt5-qtpbfimageformat], addflavor: qt5 } +- { setname: qtpbfimageplugin, name: qt6-qtpbfimageformat, addflavor: qt6 } - { setname: qtscrobbler, name: qtscrob } - { setname: quadrapassel, name: gnome-games-quadrapassel } - { setname: quake3, name: linux-quake3, ruleset: freebsd } diff --git a/900.version-fixes/l.yaml b/900.version-fixes/l.yaml index 022586006..44e7c9ccc 100644 --- a/900.version-fixes/l.yaml +++ b/900.version-fixes/l.yaml @@ -223,7 +223,7 @@ - { name: luciole, ruleset: openbsd, untrusted: true } # accused of fake 1.0 - { name: lugaru, verpat: "[0-9]{3}.*", ignore: true } # dates and snapshots - { name: lugaru, verpat: "201[56].*", sink: true } # 1.2 from 2017 -- { name: luit-xterm, verpat: "20[0-9]{6}", altscheme: true } # XXX: problem +- { name: luit-xterm, verpat: "20[0-9]{6}", altscheme: true } # XXX: upstream problem - { name: luit-xterm, verpat: "[0-9]{6}", incorrect: true } - { name: luit-xterm, ruleset: side, untrusted: true } # accused of fake 240102 - { namepat: "lumina.*", p_is_patch: true }