Page MenuHomeFreeBSD

Fix x11-themes/kde4-windeco-crystal's, deskutils/plasma-applet-daisy and deskutils/plasma-applet-yawp build with newer kdelibs
ClosedPublic

Authored by tcberner on Mar 29 2017, 7:17 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 6, 6:23 PM
Unknown Object (File)
Tue, Nov 5, 12:38 AM
Unknown Object (File)
Wed, Oct 30, 10:58 AM
Unknown Object (File)
Thu, Oct 17, 1:06 AM
Unknown Object (File)
Oct 16 2024, 10:19 AM
Unknown Object (File)
Oct 15 2024, 2:46 PM
Unknown Object (File)
Oct 15 2024, 1:10 AM
Unknown Object (File)
Oct 13 2024, 10:40 AM
Subscribers

Details

Reviewers
rakuco
mat
jhale
Group Reviewers
kde
Commits
rP437770: Unbreak after r436971.
Summary
  1. Cmake policy CMP0005 automatically escapes add_defintions arguments
  2. Use the variables from the kde4 cmake files to link against the libraries.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tcberner retitled this revision from Fix x11-themes/kde4-windeco-crystal's build with newer kdelibs to Fix x11-themes/kde4-windeco-crystal's, deskutils/plasma-applet-daisy and deskutils/plasma-applet-yawp build with newer kdelibs.Mar 29 2017, 7:18 AM
This revision is now accepted and ready to land.Mar 29 2017, 8:02 AM

deskutils/plasma-applet-daisy won't actually link to the taskmanager library because find_package(KDE4Workspace REQUIRED) is needed to define ${KDE4WORKSPACE_TASKMANAGER_LIBRARY}. It will build and link, but will cause a crash of plasma-desktop on startup. I already have fixes for deskutils/plasma-applet-daisy and deskutils/plasma-applet-yawp that add some missing dependencies and license updates as well, so please leave those to me.

tcberner edited edge metadata.

Get rid of the incomplete fixes to deskutils/plasma-* as requested by jhale@.

This revision now requires review to proceed.Mar 29 2017, 8:47 AM

deskutils/plasma-applet-daisy fixed in https://reviews.freebsd.org/rP437186
deskutils/plasma-applet-yawp fixed in https://reviews.freebsd.org/rP437187

x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt
11 ↗(On Diff #26754)

I'm seeing a build failure because of this change:

  • client/CMakeFiles/kwin3_crystal.dir/crystalclient.o ---

/usr/home/Jason/src/freebsd/ports/x11-themes/kde4-windeco-crystal/work/crystal-2.2.1/client/crystalclient.cpp:121:71: error: invalid suffix '.1' on floating constant

sprintf(c,"<center><b>Crystal %s Preview</b><br>Built: %s</center>",VERSION, __DATE__);
                                                                    ^

<command line>:11:20: note: expanded from here
#define VERSION 2.2.1

^

1 error generated.

x11-themes/kde4-windeco-crystal/files/patch-client_CMakeLists.txt
10 ↗(On Diff #26754)

You need to add find_package(KDE4Workspace REQUIRED) somewhere for ${KDE4WORKSPACE_KDECORATIONS_LIBS} to be defined. It isn't linking to it otherwise.

x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt
11 ↗(On Diff #26754)

Hm, this worked for me. Is your x11/kdelibs up to date? -- Maybe I should forcefully set CMP0005 to NEW additionally, or set it to OLD and do nothing.

x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt
11 ↗(On Diff #26754)

I'm still using the previous x11/kdelibs4, however setting cmake_minimum_required(VERSION 2.8.9) fixes the problem.

Additionally set CMP0005 to NEW, and include find_package call for KDE4-Worspace.

Still lgtm.

x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt
23 ↗(On Diff #26757)

I'm OK with this, but another way to solve this is escaping it the way kde-gtk-config does in its patch in files/.

tcberner added inline comments.
x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt
23 ↗(On Diff #26757)

I trust cmake more to properly escape it, than myself :D

@jhale are you ok with this like it is now?

This revision is now accepted and ready to land.Apr 4 2017, 8:59 PM
This revision was automatically updated to reflect the committed changes.