Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nethack, bump to 3.6.7 #3823

Closed
wants to merge 4 commits into from
Closed

nethack, bump to 3.6.7 #3823

wants to merge 4 commits into from

Conversation

Dawn-Xu-helloworld
Copy link
Contributor

No description provided.

Copy link

github-actions bot commented Nov 5, 2023

pkgcheck checks failed

QA Results:
acct-user/hysteria
  PotentialStable: version 0: slot(0), stabled arches: [ amd64, arm, arm64, hppa, ppc, ppc64, sparc, x86 ], potentials: [ ~ia64, ~loong, ~riscv, ~s390 ]

acct-group/hysteria
  PotentialStable: version 0: slot(0), stabled arches: [ amd64, arm, arm64, hppa, ppc, ppc64, sparc, x86 ], potentials: [ ~ia64, ~loong, ~riscv, ~s390 ]

app-crypt/archlinux-keyring
  BetterCompressionUri: version 20231017: line 9: better compression URI using extension '.tar.bz2' for 'https://gitlab.archlinux.org/archlinux/${PN}/-/archive/${PV}/${P}.tar.gz'

app-editors/appflowy-bin
  RedundantVersion: version 0.3.5: slot(0) keywords are overshadowed by version: 0.3.6

app-emulation/deepin-wine-helper
  PythonCompatUpdate: version 5.1.27-r1: PYTHON_COMPAT update available: python3_12
  RedundantVersion: version 5.1.27-r1: slot(0) keywords are overshadowed by version: 5.1.45

app-emulation/deepin-wine6-stable
  NonexistentDeps: version 6.0.0.19-r1: RDEPEND: nonexistent package: dev-libs/ocl-icd
  NonsolvableDepsInDev: version 6.0.0.19-r1: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/17.0/musl) (6 total): solutions: [ >=app-emulation/vkd3d-1.0[abi_x86_32(-)], >=dev-libs/libxml2-2.9.0[abi_x86_32(-)], dev-libs/ocl-icd[abi_x86_32(-)], dev-libs/opencl-icd-loader[abi_x86_32(-)], >=media-libs/alsa-lib-1.0.16[abi_x86_32(-)], media-libs/fontconfig[abi_x86_32(-)], media-libs/freetype:2[abi_x86_32(-)], media-libs/glu[abi_x86_32(-)], media-libs/gst-plugins-base[abi_x86_32(-)], media-libs/lcms:2[abi_x86_32(-)], media-libs/libcanberra[abi_x86_32(-),pulseaudio], >=media-libs/libgphoto2-2.5.10[abi_x86_32(-)], media-libs/libjpeg-turbo[abi_x86_32(-)], media-libs/mesa[abi_x86_32(-),osmesa], >=media-libs/openal-1.14[abi_x86_32(-)], >=media-sound/mpg123-1.13.7[abi_x86_32(-)], >=net-libs/libpcap-0.9.8[abi_x86_32(-)], >=net-nds/openldap-2.4.7[abi_x86_32(-)], sys-devel/gettext[abi_x86_32(-)], sys-libs/ncurses[abi_x86_32(-)], sys-libs/ncurses-compat:5[abi_x86_32(-)], >=sys-libs/zlib-1.1.4[abi_x86_32(-)], virtual/libudev[abi_x86_32(-)], virtual/libusb:1[abi_x86_32(-)], x11-libs/libX11[abi_x86_32(-)], x11-libs/libXcursor[abi_x86_32(-)], x11-libs/libXext[abi_x86_32(-)], x11-libs/libXi[abi_x86_32(-)], x11-libs/libXrandr[abi_x86_32(-)] ]
  NonsolvableDepsInStable: version 6.0.0.19-r1: nonsolvable depset(rdepend) keyword(~amd64) stable profile (default/linux/amd64/17.1/no-multilib) (6 total): solutions: [ >=app-emulation/vkd3d-1.0[abi_x86_32(-)], >=dev-libs/libxml2-2.9.0[abi_x86_32(-)], dev-libs/ocl-icd[abi_x86_32(-)], dev-libs/opencl-icd-loader[abi_x86_32(-)], >=media-libs/alsa-lib-1.0.16[abi_x86_32(-)], media-libs/fontconfig[abi_x86_32(-)], media-libs/freetype:2[abi_x86_32(-)], media-libs/glu[abi_x86_32(-)], media-libs/gst-plugins-base[abi_x86_32(-)], media-libs/lcms:2[abi_x86_32(-)], media-libs/libcanberra[abi_x86_32(-),pulseaudio], >=media-libs/libgphoto2-2.5.10[abi_x86_32(-)], media-libs/libjpeg-turbo[abi_x86_32(-)], media-libs/mesa[abi_x86_32(-),osmesa], >=media-libs/openal-1.14[abi_x86_32(-)], >=media-sound/mpg123-1.13.7[abi_x86_32(-)], >=net-libs/libpcap-0.9.8[abi_x86_32(-)], >=net-nds/openldap-2.4.7[abi_x86_32(-)], sys-devel/gettext[abi_x86_32(-)], sys-libs/ncurses[abi_x86_32(-)], sys-libs/ncurses-compat:5[abi_x86_32(-)], >=sys-libs/zlib-1.1.4[abi_x86_32(-)], virtual/libudev[abi_x86_32(-)], virtual/libusb:1[abi_x86_32(-)], x11-libs/libX11[abi_x86_32(-)], x11-libs/libXcursor[abi_x86_32(-)], x11-libs/libXext[abi_x86_32(-)], x11-libs/libXi[abi_x86_32(-)], x11-libs/libXrandr[abi_x86_32(-)] ]
  RedundantVersion: version 6.0.0.19-r1: slot(0) keywords are overshadowed by version: 6.0.0.52
  NonsolvableDepsInDev: version 6.0.0.52: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/17.0/musl) (6 total): solutions: [ >=app-emulation/vkd3d-1.0[abi_x86_32(-)], >=dev-libs/libxml2-2.9.0[abi_x86_32(-)], dev-libs/opencl-icd-loader[abi_x86_32(-)], >=media-libs/alsa-lib-1.0.16[abi_x86_32(-)], media-libs/fontconfig[abi_x86_32(-)], media-libs/freetype:2[abi_x86_32(-)], media-libs/glu[abi_x86_32(-)], media-libs/gst-plugins-base[abi_x86_32(-)], media-libs/lcms:2[abi_x86_32(-)], media-libs/libcanberra[abi_x86_32(-),pulseaudio], >=media-libs/libgphoto2-2.5.10[abi_x86_32(-)], media-libs/libjpeg-turbo[abi_x86_32(-)], media-libs/mesa[abi_x86_32(-),osmesa], >=media-libs/openal-1.14[abi_x86_32(-)], >=media-sound/mpg123-1.13.7[abi_x86_32(-)], >=net-libs/libpcap-0.9.8[abi_x86_32(-)], >=net-nds/openldap-2.4.7[abi_x86_32(-)], sys-devel/gettext[abi_x86_32(-)], sys-libs/ncurses[abi_x86_32(-)], sys-libs/ncurses-compat:5[abi_x86_32(-)], >=sys-libs/zlib-1.1.4[abi_x86_32(-)], virtual/libudev[abi_x86_32(-)], virtual/libusb:1[abi_x86_32(-)], x11-libs/libX11[abi_x86_32(-)], x11-libs/libXcursor[abi_x86_32(-)], x11-libs/libXext[abi_x86_32(-)], x11-libs/libXi[abi_x86_32(-)], x11-libs/libXrandr[abi_x86_32(-)] ]
  NonsolvableDepsInStable: version 6.0.0.52: nonsolvable depset(rdepend) keyword(~amd64) stable profile (default/linux/amd64/17.1/no-multilib) (6 total): solutions: [ >=app-emulation/vkd3d-1.0[abi_x86_32(-)], >=dev-libs/libxml2-2.9.0[abi_x86_32(-)], dev-libs/opencl-icd-loader[abi_x86_32(-)], >=media-libs/alsa-lib-1.0.16[abi_x86_32(-)], media-libs/fontconfig[abi_x86_32(-)], media-libs/freetype:2[abi_x86_32(-)], media-libs/glu[abi_x86_32(-)], media-libs/gst-plugins-base[abi_x86_32(-)], media-libs/lcms:2[abi_x86_32(-)], media-libs/libcanberra[abi_x86_32(-),pulseaudio], >=media-libs/libgphoto2-2.5.10[abi_x86_32(-)], media-libs/libjpeg-turbo[abi_x86_32(-)], media-libs/mesa[abi_x86_32(-),osmesa], >=media-libs/openal-1.14[abi_x86_32(-)], >=media-sound/mpg123-1.13.7[abi_x86_32(-)], >=net-libs/libpcap-0.9.8[abi_x86_32(-)], >=net-nds/openldap-2.4.7[abi_x86_32(-)], sys-devel/gettext[abi_x86_32(-)], sys-libs/ncurses[abi_x86_32(-)], sys-libs/ncurses-compat:5[abi_x86_32(-)], >=sys-libs/zlib-1.1.4[abi_x86_32(-)], virtual/libudev[abi_x86_32(-)], virtual/libusb:1[abi_x86_32(-)], x11-libs/libX11[abi_x86_32(-)], x11-libs/libXcursor[abi_x86_32(-)], x11-libs/libXext[abi_x86_32(-)], x11-libs/libXi[abi_x86_32(-)], x11-libs/libXrandr[abi_x86_32(-)] ]

app-office/bytedance-feishu
  RedundantVersion: version 4.11.6.2: slot(0) keywords are overshadowed by versions: 5.9.18, 5.14.14, 5.26.13-r1, 6.9.20
  RedundantVersion: version 5.9.18: slot(0) keywords are overshadowed by versions: 5.14.14, 5.26.13-r1, 6.9.20
  RedundantVersion: version 5.14.14: slot(0) keywords are overshadowed by versions: 5.26.13-r1, 6.9.20
  RedundantVersion: version 5.26.13-r1: slot(0) keywords are overshadowed by version: 6.9.20

app-office/wps-office
  DeprecatedDep: version 11.1.0.10976-r1: RDEPEND: deprecated dependency: media-sound/pulseaudio
  RedundantVersion: version 11.1.0.10976-r1: slot(0) keywords are overshadowed by versions: 11.1.0.11698, 11.1.0.11704
  DeprecatedDep: version 11.1.0.11698: RDEPEND: deprecated dependency: media-sound/pulseaudio
  RedundantVersion: version 11.1.0.11698: slot(0) keywords are overshadowed by version: 11.1.0.11704
  DeprecatedDep: version 11.1.0.11704: RDEPEND: deprecated dependency: media-sound/pulseaudio

app-text/cajviewer
  UnusedInherits: version 1.3.22: unused eclass: desktop

games-roguelike/nethack
  ExcessiveLineLength: version 3.6.7: excessive line length (over 120 characters) on line: 57
  VariableScope: version 3.6.7: variable 'ED' used in 'src_compile' on lines: 73, 74

games-arcade/osu-lazer
  MissingRemoteId: missing <remote-id type="github">ppy/osu</remote-id> (inferred from URI 'https://github.com/ppy/osu')
  RedundantVersion: version 2023.1008.1: slot(0) keywords are overshadowed by version: 2023.1026.0

media-fonts/sarasa-gothic
  RedundantVersion: version 0.42.0: slot(0) keywords are overshadowed by version: 0.42.3

net-im/deepin-wine-wecom
  NonsolvableDepsInDev: version 4.1.6.6017: nonsolvable depset(depend) keyword(~amd64) dev profile (default/linux/amd64/17.0/musl) (6 total): solutions: [ media-libs/alsa-lib[abi_x86_32], media-libs/libpulse[abi_x86_32], media-libs/openal[abi_x86_32], media-plugins/alsa-plugins[abi_x86_32], media-sound/mpg123[abi_x86_32], >=net-nds/openldap-2.4.0[abi_x86_32] ]
  NonsolvableDepsInDev: version 4.1.6.6017: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/17.0/musl) (6 total): solutions: [ media-libs/alsa-lib[abi_x86_32], media-libs/libpulse[abi_x86_32], media-libs/openal[abi_x86_32], media-plugins/alsa-plugins[abi_x86_32], media-sound/mpg123[abi_x86_32], >=net-nds/openldap-2.4.0[abi_x86_32] ]
  NonsolvableDepsInStable: version 4.1.6.6017: nonsolvable depset(depend) keyword(~amd64) stable profile (default/linux/amd64/17.1/no-multilib) (6 total): solutions: [ media-libs/alsa-lib[abi_x86_32], media-libs/libpulse[abi_x86_32], media-libs/openal[abi_x86_32], media-plugins/alsa-plugins[abi_x86_32], media-sound/mpg123[abi_x86_32], >=net-nds/openldap-2.4.0[abi_x86_32] ]
  NonsolvableDepsInStable: version 4.1.6.6017: nonsolvable depset(rdepend) keyword(~amd64) stable profile (default/linux/amd64/17.1/no-multilib) (6 total): solutions: [ media-libs/alsa-lib[abi_x86_32], media-libs/libpulse[abi_x86_32], media-libs/openal[abi_x86_32], media-plugins/alsa-plugins[abi_x86_32], media-sound/mpg123[abi_x86_32], >=net-nds/openldap-2.4.0[abi_x86_32] ]

net-im/tencent-qq
  NonsolvableDepsInDev: version 3.2.1_p17749: nonsolvable depset(rdepend) keyword(~arm64) dev profile (default/linux/arm64/17.0/hardened/selinux) (4 total): solutions: [ >=media-libs/vips-8.14.2[-pdf] ]
  NonsolvableDepsInStable: version 3.2.1_p17749: nonsolvable depset(rdepend) keyword(~arm64) stable profile (default/linux/arm64/17.0) (24 total): solutions: [ >=media-libs/vips-8.14.2[-pdf] ]

net-im/wemeet
  NonsolvableDepsInDev: version 3.15.0.402: nonsolvable depset(depend) keyword(~amd64) dev profile (default/linux/amd64/17.0/x32) (2 total): solutions: [ dev-qt/qtwebengine:5, dev-qt/qtwebview:5 ]
  NonsolvableDepsInDev: version 3.15.0.402: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/17.0/x32) (2 total): solutions: [ dev-qt/qtwebengine:5, dev-qt/qtwebview:5 ]
  RedundantVersion: version 3.15.0.402: slot(0) keywords are overshadowed by version: 3.15.1.401-r1
  NonsolvableDepsInDev: version 3.15.1.401-r1: nonsolvable depset(depend) keyword(~amd64) dev profile (default/linux/amd64/17.0/x32) (2 total): solutions: [ dev-qt/qtwebengine:5, dev-qt/qtwebview:5 ]
  NonsolvableDepsInDev: version 3.15.1.401-r1: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/17.0/x32) (2 total): solutions: [ dev-qt/qtwebengine:5, dev-qt/qtwebview:5 ]

net-proxy/clash-for-windows-bin
  RedundantVersion: version 0.20.38: slot(0) keywords are overshadowed by version: 0.20.39

net-p2p/qbittorrent-enhanced
  RequiredUseDefaults: version 4.5.5.10: profile: 'default/linux/amd64/17.0/musl' (40 total) failed REQUIRED_USE: ( gui || webui )
  RequiredUseDefaults: version 4.5.5.10: profile: 'default/linux/amd64/17.0/musl' (40 total) failed REQUIRED_USE: gui
  UnquotedVariable: version 4.5.5.10: unquoted variable FILESDIR on line: 64

net-proxy/shadowsocks-rust
  RedundantVersion: version 1.16.2: slot(0) keywords are overshadowed by version: 1.17.0
  PotentialStable: version 1.17.0: slot(0), stabled arches: [ amd64, arm64 ], potential: [ ~x86 ]

net-proxy/v2ray
  RedundantVersion: version 5.7.0-r2: slot(0) keywords are overshadowed by versions: 5.8.0, 5.10.0, 5.10.1
  RedundantVersion: version 5.8.0: slot(0) keywords are overshadowed by versions: 5.10.0, 5.10.1
  RedundantVersion: version 5.10.0: slot(0) keywords are overshadowed by version: 5.10.1

x11-misc/sddm
  NonexistentDeps: version 9999: DEPEND: nonexistent package: >=dev-qt/qtbase-6.6.0:5

www-client/brave
  NonsolvableDepsInDev: version 1.59.124: nonsolvable depset(rdepend) keyword(amd64) dev profile (default/linux/amd64/17.0/musl) (4 total): solutions: [ sys-libs/glibc ]

🔍 QA Keywords Explanation

@Dawn-Xu-helloworld
Copy link
Contributor Author

怎么fail了?我就是原样merge的啊,也能跑

@liangyongxiang
Copy link
Collaborator

怎么fail了?我就是原样merge的啊,也能跑

你需要rebase一下

@liangyongxiang
Copy link
Collaborator

liangyongxiang commented Nov 5, 2023

rebase之后,应该是只有这个commit: 35ef915

@Dawn-Xu-helloworld
Copy link
Contributor Author

rebase不是合并两个branch吗?不懂怎么在这里rebase

@liangyongxiang
Copy link
Collaborator

liangyongxiang commented Nov 6, 2023

你的提交里现在有4个commit, 一个是merge, 一个是nethack, 还有两个是wps-office的。
rebase的目的是去掉除了nethack之外的commits

大体步骤是在本地执行

git fetch --all
git rebase -i origin/master

这时候git会打开编辑器,你可以看到3个commit,

pick 63e820cf update wps-office
pick a2714055 fix
pick 35ef9159 nethack, bump to 3.6.7

然后你将wps的两个comiit的pick改成drop就可以通过rebase去掉不需要的commit

然后再git push -f来更新你fork的远程仓库了

@Dawn-Xu-helloworld
Copy link
Contributor Author

你的提交里现在有4个commit, 一个是merge, 一个是nethack, 还有两个是wps-office的。 rebase的目的是去掉除了nethack之外的commits

大体步骤是在本地执行

git fetch --all
git rebase -i origin/master

这时候git会打开编辑器,你可以看到3个commit,

pick 63e820cf update wps-office
pick a2714055 fix
pick 35ef9159 nethack, bump to 3.6.7

然后你将wps的两个comiit的pick改成drop就可以通过rebase去掉不需要的commit

然后再git push -f来更新你fork的远程仓库了

可是我rebase的时候只出来了一个noop...
我干脆重新fork一下吧

@Dawn-Xu-helloworld Dawn-Xu-helloworld closed this by deleting the head repository Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants