Opened 4 years ago

Closed 4 years ago

#46359 closed update (fixed)

kde4-workspace: update to 4.11.14

Reported by: NicosPavlov Owned by: RJVB (René Bertin)
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch Cc:
Port: kde4-workspace

Description

Following the update of KDE to 4.14.3, kde4-workspace could be updated to its latest version.

Attachments (10)

patch-Portfile.diff (1017 bytes) - added by NicosPavlov 4 years ago.
patch-libs-CMakeLists.patch (862 bytes) - added by RJVB (René Bertin) 4 years ago.
patch-kcontrol.patch (2.4 KB) - added by RJVB (René Bertin) 4 years ago.
patch-CMakeLists-for-OSX.patch (3.3 KB) - added by RJVB (René Bertin) 4 years ago.
no-oxygen-theme.patch (563 bytes) - added by RJVB (René Bertin) 4 years ago.
this one was faulty
systemsettings-correct-menuplacement.patch (747 bytes) - added by RJVB (René Bertin) 4 years ago.
systemsettings.app : put the various About menu items in the proper places (menus)
kde4-workspace-diff.patch (3.3 KB) - added by RJVB (René Bertin) 4 years ago.
> How are the new seven patches to be used in regards to the previous four ones? As shown in the updated Portfile ... which I completely forgot to add :-/
kde4-workspace-4.14.4-2.diff (2.1 KB) - added by NicosPavlov 4 years ago.
kde4-workspace-4.14.4.diff (3.2 KB) - added by RJVB (René Bertin) 4 years ago.
patch-plasma.patch (29.4 KB) - added by RJVB (René Bertin) 4 years ago.
build the few plasma components that make sense on OS X

Download all attachments as: .zip

Change History (17)

Changed 4 years ago by NicosPavlov

Attachment: patch-Portfile.diff added

Changed 4 years ago by RJVB (René Bertin)

Attachment: patch-libs-CMakeLists.patch added

Changed 4 years ago by RJVB (René Bertin)

Attachment: patch-kcontrol.patch added

Changed 4 years ago by RJVB (René Bertin)

Changed 4 years ago by RJVB (René Bertin)

Attachment: no-oxygen-theme.patch added

this one was faulty

Changed 4 years ago by RJVB (René Bertin)

systemsettings.app : put the various About menu items in the proper places (menus)

comment:1 Changed 4 years ago by NicosPavlov

How are the new seven patches to be used in regards to the previous four ones? Only one seems to be a straightforward replacement when comparing filenames.

Furthermore, several patches do not apply cleanly in Macports. There seem to be issues with stripping options, or patches made from git which have sometimes problems with Macports.

Changed 4 years ago by RJVB (René Bertin)

Attachment: kde4-workspace-diff.patch added

How are the new seven patches to be used in regards to the previous four ones? As shown in the updated Portfile ... which I completely forgot to add :-/

comment:2 in reply to:  1 Changed 4 years ago by RJVB (René Bertin)

Replying to nicos@…:

Furthermore, several patches do not apply cleanly in Macports. There seem to be issues with stripping options, or patches made from git which have sometimes problems with Macports.

This is also solved through the updated Portfile. Not all seven patches are to be used (I don't seem to be able to delete obsolete attachments...)

comment:3 Changed 4 years ago by NicosPavlov

There several things which seem to require corrections in my point of view:

  • You removed the use of plasmaversion, to directly use the kde-workspace version. This would require an increase of epoch for users to see the upgrade.
  • The revision field is unneeded for an upgrade
  • The emails should be encoded with :, as it is in the Portfile
  • The line
    if { [variant_isset nostrip] } { 
    
    is unneeded, as the existing code in the Portfile does that already.
  • The variants in no_foo or without_foo should not be added, and replaced by +foo.
  • In the without_oxygen variant, you delete the use of a patch which is never included.
  • Why suppressing the livecheck?

comment:4 in reply to:  3 Changed 4 years ago by RJVB (René Bertin)

Replying to nicos@…:

  • You removed the use of plasmaversion, to directly use the kde-workspace version. This would require an increase of epoch for users to see the upgrade.

Yes, I didn't realise I was retrograding the version number by switching back to the actual kde-workspace versioning. Undone.

is unneeded, as the existing code in the Portfile does that already.

Oh?

  • In the without_oxygen variant, you delete the use of a patch which is never included.

Because I messed up. The patch should have been expanded. To address your previous comment about the "without_" variant, I reversed the logic and created a default +oxygen variant.

  • Why suppressing the livecheck?

Because I'm now using git-based ports. KDE4 development has slowed down and it's not sure if and when modifications make it to an official release, so it makes sense to me to update ports from time to time when important or useful changes have been pushed.

comment:5 Changed 4 years ago by NicosPavlov

There are some additional things I would change before committing (see attached file)

  • Avoid hardcoding of /opt/local
  • Do not add phonon as dependency (redundant with kde4-1.1 portgroup)
  • Do not suppress existing nostrip variant (should be made obsolete before suppression)
  • Use variant syntax for oxygen one
  • Keep mention of livecheck to make explicit the fact that it is not used

Changed 4 years ago by NicosPavlov

Changed 4 years ago by RJVB (René Bertin)

Attachment: kde4-workspace-4.14.4.diff added

comment:6 Changed 4 years ago by RJVB (René Bertin)

I realised I had forgotten to address Nicos' issues above (comment 5).

In addition this version builds all of plasma. It turned out that most of the work making X11 optional/hidden had already been done upstream. There is probably little interest to running either of the plasma shells, but at least KDevelop uses plasma functionality for its "dashboard" feature.

Changed 4 years ago by RJVB (René Bertin)

Attachment: patch-plasma.patch added

build the few plasma components that make sense on OS X

comment:7 Changed 4 years ago by NicosPavlov

Resolution: fixed
Status: newclosed

Committed in r135138, with some minor changes:

  • Adding a date to the obsolete variant to know when to remove it
  • Do not declare an empty variant to use an if block later
  • not using the patch-plasma patch, as it was already committed and thus irrelevant
  • not committing the alternative download, which could lead to errors in some cases for users
Note: See TracTickets for help on using tickets.