Extend merge for qtpbfimageformat (fixes #913)

repology · Jan 13, 2025 · eccf3a0 · eccf3a0
1 parent 017be0a
commit eccf3a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 }