Skip to content

onedrive and onedrive-gui fixes#136

Closed
MrDuartePT wants to merge 2 commits intogentoo:masterfrom
MrDuartePT:onedrive-fix
Closed

onedrive and onedrive-gui fixes#136
MrDuartePT wants to merge 2 commits intogentoo:masterfrom
MrDuartePT:onedrive-fix

Conversation

@MrDuartePT
Copy link
Contributor

Issue: #135

@MrDuartePT MrDuartePT force-pushed the onedrive-fix branch 2 times, most recently from aa01300 to 7b0a16b Compare March 4, 2025 19:28
@the-horo
Copy link
Contributor

the-horo commented Mar 4, 2025

It's night for me so I'll review this tomorrow. Thank you for your work 👍

Copy link
Contributor

@the-horo the-horo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some more changes and we will be all good. Before you submit your changes run pkgcheck scan net-misc. It will catch a lot of mistakes and you can get straight to fixing them rather than waiting for me to comment.

@MrDuartePT
Copy link
Contributor Author

Should be correct now

@the-horo
Copy link
Contributor

the-horo commented Mar 5, 2025

You've got some conflicts regarding your improve ebuild commit.

@Karlson2k
Copy link
Contributor

Sorry, I've noticed this PR when I created mine: #138

@MrDuartePT
Copy link
Contributor Author

MrDuartePT commented Mar 7, 2025

You've got some conflicts regarding your improve ebuild commit.

Tomorrow I gonna solve it, maybe was when rebasing some commit

@MrDuartePT
Copy link
Contributor Author

Solve the conflicts and reduce to only to commits no need for multiple ones

Copy link
Contributor

@the-horo the-horo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you solve these:

$ pkgcheck scan --net net-misc/onedrivegui*
net-misc/onedrivegui-bin
  NoFinalNewline: version 1.0.3-r3: ebuild lacks an ending newline
  RedundantVersion: version 1.0.3-r3: slot(0) keywords are overshadowed by version: 1.1.1-r2
  VariableOrderWrong: version 1.0.3-r3: variable SRC_URI should occur before SLOT
  VariableShadowed: version 1.0.3-r3: variable 'SLOT' may be shadowed, on lines: 10, 19
  WhitespaceFound: version 1.0.3-r3: ebuild has leading whitespace on lines: 14, 15, 23, 24, 30, 31, 33, 34, 35
  VariableOrderWrong: version 1.1.1-r2: variable SRC_URI should occur before SLOT
  VariableShadowed: version 1.1.1-r2: variable 'SLOT' may be shadowed, on lines: 10, 19
  WhitespaceFound: version 1.1.1-r2: ebuild has leading whitespace on lines: 14, 15, 23, 24, 30, 31, 33, 34, 35
  DeadUrl: version 1.1.1-r2: SRC_URI: 404 Client Error: Not Found for url: https://github.com/bpozdena/OneDriveGUI/releases/download/v1.1.1/OneDriveGUI-1.1.1_fix150-x86_64.AppImage

net-misc/onedrivegui
  NoFinalNewline: version 1.0.3-r3: ebuild lacks an ending newline
  NonsolvableDepsInDev: version 1.0.3-r3: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/23.0/x32) (20 total): solutions: [ dev-python/pyside[gui(+),python_targets_python3_10(-),python_targets_python3_11(-),python_targets_python3_12(-),python_targets_python3_13(-),webengine(+),widgets(+)] ]
  NonsolvableDepsInStable: version 1.0.3-r3: nonsolvable depset(rdepend) keyword(~x86) stable profile (default/linux/x86/23.0/i486) (34 total): solutions: [ dev-python/pyside[gui(+),python_targets_python3_10(-),python_targets_python3_11(-),python_targets_python3_12(-),python_targets_python3_13(-),webengine(+),widgets(+)] ]
  RedundantVersion: version 1.0.3-r3: slot(0) keywords are overshadowed by version: 1.1.1-r2
  WhitespaceFound: version 1.0.3-r3: ebuild has leading whitespace on lines: 23, 29
  NonsolvableDepsInDev: version 1.1.1-r2: nonsolvable depset(rdepend) keyword(~amd64) dev profile (default/linux/amd64/23.0/x32) (20 total): solutions: [ dev-python/pyside[gui(+),python_targets_python3_10(-),python_targets_python3_11(-),python_targets_python3_12(-),python_targets_python3_13(-),webengine(+),widgets(+)] ]
  NonsolvableDepsInStable: version 1.1.1-r2: nonsolvable depset(rdepend) keyword(~x86) stable profile (default/linux/x86/23.0/i486) (34 total): solutions: [ dev-python/pyside[gui(+),python_targets_python3_10(-),python_targets_python3_11(-),python_targets_python3_12(-),python_targets_python3_13(-),webengine(+),widgets(+)] ]
  WhitespaceFound: version 1.1.1-r2: ebuild has leading whitespace on lines: 23, 29
  WhitespaceFound: version 9999: ebuild has leading whitespace on lines: 23, 29

WhitespaceFound means you're indenting with spaces instead of tabs. I will go and add a .editorconfig file to the repo to prevent these issues from happening. In the meantime please fix it manually

NonsolvableDepsInDev is actually unsolvable for us right now because we are in an overlay and we don't have access to the profiles directory in ::gentoo. I'm working on a workaround for this as well. NonsolvableDepsInStable you must fix though.

RedundantVersion you can ignore, we want to keep both a 2.4 and 2.5 compatible versions of onedrivegui

KEYWORDS="~amd64"
S="${WORKDIR}/${M_PN}-${PV}"
SRC_URI="https://github.com/bpozdena/${M_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="-* ~amd64"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With onedrivegui-bin we put KEYWORDS='-* ~amd64' because it's a binary package that we know will not work on anything other than amd64. With onedrivegui, however, we only tested amd64 but we have no idea whether it works on other arches. For this reason KEYWORDS should be "~amd64", without the -*


inherit desktop xdg-utils
SRC_URI="
https://github.com/bpozdena/${M_PN}/releases/download/v${PV}/${M_PN}-${PV}_fix150-x86_64.AppImage -> ${P}.AppImage
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

% pkgcheck scan --net net-misc/onedrivegui-bin
net-misc/onedrivegui-bin
  DeadUrl: version 1.1.1-r2: SRC_URI: 404 Client Error: Not Found for url: https://github.com/bpozdena/OneDriveGUI/releases/download/v1.1.1/OneDriveGUI-1.1.1-x86_64.AppImage
  RedundantVersion: version 1.0.3-r3: slot(0) keywords are overshadowed by version: 1.1.1-r2

If you try to go to that URL you will find it 404. Upstream seems to have renamed it to https://github.com/bpozdena/OneDriveGUI/releases/tag/v1.1.1a (note the a at the end).

You can run pkgdev manifest -f until you are able to download all the files.

inherit desktop xdg-utils
SRC_URI="
https://github.com/bpozdena/${M_PN}/releases/download/v${PV}/${M_PN}-${PV}_fix150-x86_64.AppImage -> ${P}.AppImage
https://github.com/bpozdena/${M_PN}/raw/refs/heads/v${PV}/src/resources/images/${M_PN}.png -> OneDriveGUI-${PV}.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
Copy link
Contributor

@the-horo the-horo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for stalling you, just a few more changes and this is good to go

inherit desktop xdg-utils
SRC_URI="
https://github.com/bpozdena/${M_PN}/releases/download/v${PV}/${M_PN}-${PV}_fix150-x86_64.AppImage -> ${P}.AppImage
https://raw.githubusercontent.com/bpozdena/${M_PN}/refs/tags/v${PV}/src/resources/images/${M_PN}.png -> OneDriveGUI-${PV}.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to update the manifests. You can do that with:

rm Manifest && sudo pkgdev manifest

In the net-misc/onedrivegui-bin directory

Copy link
Contributor Author

@MrDuartePT MrDuartePT Mar 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that forcing manifest update some times don't update🙃


M_PN=OneDriveGUI
DISTUTILS_USE_PEP517=no
PYTHON_COMPAT=(python3_{9..13})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop python3_9 from here, it's no longer available


M_PN=OneDriveGUI
DISTUTILS_USE_PEP517=no
PYTHON_COMPAT=(python3_{9..13})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

@the-horo
Copy link
Contributor

@MrDuartePT I can make the changes myself and merge them if you'd prefer that

@MrDuartePT
Copy link
Contributor Author

MrDuartePT commented Mar 11, 2025

It better I will be away of the pc for a while

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.

3 participants