update/14.0.8 #172

Merged
SlavekB merged 1 commits from update/14.0.8 into master 3 years ago
Collaborator

14.0.8 ebuilds for all of tdebase, tdeartwork, and tdeutils plus dependencies (with the exception of tdefilereplace, which throws "ninja: error: unknown target 'install'" and so needs work).

Deletion of 14.0.6 ebuilds, as I was only ever intending to maintain ebuilds for the last two stable versions.

Addition of kworldclock-14.0.7.ebuild as an indirect dependency of tdeartwork-meta-14.0.7.

Bonus attachment: the bump script that generated most of these ebuilds (a few needed to be edited before they would work). As you can see, it's just a few lines of Perl glue, really.

I have all of tdegames-meta ready to go once this goes through.

14.0.8 ebuilds for all of tdebase, tdeartwork, and tdeutils plus dependencies (with the exception of tdefilereplace, which throws "ninja: error: unknown target 'install'" and so needs work). Deletion of 14.0.6 ebuilds, as I was only ever intending to maintain ebuilds for the last two stable versions. Addition of kworldclock-14.0.7.ebuild as an indirect dependency of tdeartwork-meta-14.0.7. Bonus attachment: the bump script that generated most of these ebuilds (a few needed to be edited before they would work). As you can see, it's just a few lines of Perl glue, really. I have all of tdegames-meta ready to go once this goes through.
Owner

I tried to rebase and merge the changes against the master branch. Please check and test it if you can.

I tried to rebase and merge the changes against the master branch. Please check and test it if you can.
Poster
Collaborator

I have some concerns about roughly a dozen of the individual patches (some of the errors are likely my fault and not yours).

krootbacking, kxkb, tdeartwork-icewm-themes, tdeinit, tdesu, and tdm all incorrectly revert corrections made to improve English usage in descriptions or warnings.

khelpcenter and tdeutils-doc add the garbage warning about memory usage back in (they didn't eat significant RAM building at -j15).

tqtinterface, kcontrol, ksmserver, tdelibs, tdm have more significant changes that I need to review. This might take a couple of days, especially since I don't remember what the problem was with tdelibs and udevil.

Not sure what's going on with kworldclock and superkaramba.

I have some concerns about roughly a dozen of the individual patches (some of the errors are likely my fault and not yours). krootbacking, kxkb, tdeartwork-icewm-themes, tdeinit, tdesu, and tdm all incorrectly revert corrections made to improve English usage in descriptions or warnings. khelpcenter and tdeutils-doc add the garbage warning about memory usage back in (they didn't eat significant RAM building at -j15). tqtinterface, kcontrol, ksmserver, tdelibs, tdm have more significant changes that I need to review. This might take a couple of days, especially since I don't remember what the problem was with tdelibs and udevil. Not sure what's going on with kworldclock and superkaramba.
Owner

I tried to keep the changes as they were designed. It's true that there were some moves of lines with KEYWORDS, which I did a little differently – to make it similarly located as in other files.

For the changes you mention – tqtinterface, tdelibs,… there it seems that for R14.0.8 the changes were taken from the master branch (live builds).

Anyway, take your time to review it. And do not hesitate to make any additional changes. To obtain the repository in the current state of the branch (PR), use:

git fetch --all
git checkout update/14.0.8
git pull --rebase

When you make some changes, you may want to update an existing commit instead of creating a new one:

git add --all
git commit -s --amend
git push origin HEAD -f

Note: I noticed that your commits did not use -s to automatically append your line Signed-off-by:.... Please, this should be for each of your commits.

I tried to keep the changes as they were designed. It's true that there were some moves of lines with KEYWORDS, which I did a little differently – to make it similarly located as in other files. For the changes you mention – tqtinterface, tdelibs,… there it seems that for R14.0.8 the changes were taken from the master branch (live builds). Anyway, take your time to review it. And do not hesitate to make any additional changes. To obtain the repository in the current state of the branch (PR), use: ``` git fetch --all git checkout update/14.0.8 git pull --rebase ``` When you make some changes, you may want to update an existing commit instead of creating a new one: ``` git add --all git commit -s --amend git push origin HEAD -f ``` Note: I noticed that your commits did not use `-s` to automatically append your line `Signed-off-by:...`. Please, this should be for each of your commits.
Poster
Collaborator

I think I've gotten this sorted—sorry I took so long. The problem (except for the missing superkaramba ebuild) was indeed mostly due to insufficiently-inspected mechanical bumping.

(I also apologize, once again, for being a git dunce. I normally use Mercurial, and that actively trips me up.)

I think I've gotten this sorted—sorry I took so long. The problem (except for the missing superkaramba ebuild) was indeed mostly due to insufficiently-inspected mechanical bumping. (I also apologize, once again, for being a git dunce. I normally use Mercurial, and that actively trips me up.)
Owner

I see that you managed to revert the merge with the master branch that I did. Never mind, I have a commit here, so I'll merge your subsequent commits into mine and then I'll push it again.

I see that you managed to revert the merge with the master branch that I did. Never mind, I have a commit here, so I'll merge your subsequent commits into mine and then I'll push it again.
Poster
Collaborator

Perhaps "git jinx" would be a better description of my association with that piece of software. Sorry.

Perhaps "git jinx" would be a better description of my association with that piece of software. Sorry.
Owner

Perhaps "git jinx" would be a better description of my association with that piece of software. Sorry.

As I advised, I incorporated your new commits into the one I recently did merge on the master branch. After picking, I did a squash again to merge it into one commit.

> Perhaps "git jinx" would be a better description of my association with that piece of software. Sorry. As I advised, I incorporated your new commits into the one I recently did merge on the master branch. After picking, I did a squash again to merge it into one commit.
Owner

Please, is it ready for merging?

Please, is it ready for merging?
Poster
Collaborator

Sorry, I didn't realize you were waiting for my input. Yes, as far as I can tell it's good now. Merge it.

Sorry, I didn't realize you were waiting for my input. Yes, as far as I can tell it's good now. Merge it.
SlavekB merged commit 7ed6b42adb into master 3 years ago
SlavekB deleted branch update/14.0.8 3 years ago
SlavekB added this to the R14.0.10 release milestone 3 years ago
The pull request has been merged as 7ed6b42adb.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tde-packaging-gentoo#172
Loading…
There is no content yet.