D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Christophe Giboudeaux
cgiboudeaux added a comment.


  Reverted and the version was fixed.

REPOSITORY
  R6 KActivities

REVISION DETAIL
  https://phabricator.kde.org/D17718

To: cgiboudeaux, cfeck, #build_system
Cc: pino, alexeymin, kde-frameworks-devel, michaelh, ngraham, bruns


D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Christophe Giboudeaux
cgiboudeaux removed a reviewer: alexeymin.
cgiboudeaux added a comment.


  In D17718#380267 , @pino wrote:
  
  > In D17718#380261 , @alexeymin 
wrote:
  >
  > > I tested this, it indeed fixes 390225
  > >  Withoug this patch, generated pkgconfig file was:
  > >
  > >   prefix=/usr
  > >   exec_prefix=bin
  > >   libdir=lib/x86_64-linux-gnu
  > >   includedir=include
  > >  
  > >   Name: libKActivities
  > >   Description: libKActivities is a C++ library for using KDE activities
  > >   URL: http://www.kde.org
  > >   Requires: Qt5Core
  > >   Version: 
  > >   Libs: -Llib/x86_64-linux-gnu -lKF5Activities
  > >   Cflags: -Iinclude
  > >
  > >
  > > With this, version field is filled in and full paths are specified:
  > >
  > >   Name: libKActivities
  > >   Description: libKActivities is a C++ library for using KDE activities
  > >   Version: 5.54.0
  > >   Libs: -L/usr/lib/x86_64-linux-gnu -llibKActivities
  >
  >
  > This seems wrong to me, the library is called `KF5Activities` and not 
`libKActivities`.
  >
  > > Cflags: -I/usr/include/libKActivities
  >
  > Ditto.
  
  
  mmh, right, and ECMGeneratePkgConfigFile doesn't understand why the Name: and 
the library name should be different. I'm reverting and just fixing the version 
in the .pc.cmake file.

REPOSITORY
  R6 KActivities

REVISION DETAIL
  https://phabricator.kde.org/D17718

To: cgiboudeaux, cfeck, #build_system
Cc: pino, alexeymin, kde-frameworks-devel, michaelh, ngraham, bruns


D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Pino Toscano
pino added a comment.


  In D17718#380261 , @alexeymin 
wrote:
  
  > I tested this, it indeed fixes 390225
  >  Withoug this patch, generated pkgconfig file was:
  >
  >   prefix=/usr
  >   exec_prefix=bin
  >   libdir=lib/x86_64-linux-gnu
  >   includedir=include
  >  
  >   Name: libKActivities
  >   Description: libKActivities is a C++ library for using KDE activities
  >   URL: http://www.kde.org
  >   Requires: Qt5Core
  >   Version: 
  >   Libs: -Llib/x86_64-linux-gnu -lKF5Activities
  >   Cflags: -Iinclude
  >
  >
  > With this, version field is filled in and full paths are specified:
  >
  >   Name: libKActivities
  >   Description: libKActivities is a C++ library for using KDE activities
  >   Version: 5.54.0
  >   Libs: -L/usr/lib/x86_64-linux-gnu -llibKActivities
  
  
  This seems wrong to me, the library is called `KF5Activities` and not 
`libKActivities`.
  
  > Cflags: -I/usr/include/libKActivities
  
  Ditto.

REPOSITORY
  R6 KActivities

REVISION DETAIL
  https://phabricator.kde.org/D17718

To: cgiboudeaux, cfeck, #build_system, alexeymin
Cc: pino, alexeymin, kde-frameworks-devel, michaelh, ngraham, bruns


D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Christophe Giboudeaux
This revision was automatically updated to reflect the committed changes.
Closed by commit R6:52267908a1e4: Use ECMGeneratePkgConfigFile to create the 
pkgconfig file. (authored by cgiboudeaux).

REPOSITORY
  R6 KActivities

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D17718?vs=47934=47935

REVISION DETAIL
  https://phabricator.kde.org/D17718

AFFECTED FILES
  src/lib/CMakeLists.txt
  src/lib/libKActivities.pc.cmake

To: cgiboudeaux, cfeck, #build_system, alexeymin
Cc: alexeymin, kde-frameworks-devel, michaelh, ngraham, bruns


D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Alexey Min
alexeymin accepted this revision.
alexeymin added a comment.
This revision is now accepted and ready to land.


  I tested this, it indeed fixes 390225
  Withoug this patch, generated pkgconfig file was:
  
prefix=/usr
exec_prefix=bin
libdir=lib/x86_64-linux-gnu
includedir=include

Name: libKActivities
Description: libKActivities is a C++ library for using KDE activities
URL: http://www.kde.org
Requires: Qt5Core
Version: 
Libs: -Llib/x86_64-linux-gnu -lKF5Activities
Cflags: -Iinclude
  
  With this, version field is filled in and full paths are specified:
  
Name: libKActivities
Description: libKActivities is a C++ library for using KDE activities
Version: 5.54.0
Libs: -L/usr/lib/x86_64-linux-gnu -llibKActivities
Cflags: -I/usr/include/libKActivities 
Requires: Qt5Core
  
  So, +1

REPOSITORY
  R6 KActivities

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D17718

To: cgiboudeaux, cfeck, #build_system, alexeymin
Cc: alexeymin, kde-frameworks-devel, michaelh, ngraham, bruns


D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Christophe Giboudeaux
cgiboudeaux added reviewers: cfeck, Build System.

REPOSITORY
  R6 KActivities

REVISION DETAIL
  https://phabricator.kde.org/D17718

To: cgiboudeaux, cfeck, #build_system
Cc: kde-frameworks-devel, michaelh, ngraham, bruns


D17718: Use ECMGeneratePkgConfigFile to create the pkgconfig file.

2018-12-21 Thread Christophe Giboudeaux
cgiboudeaux created this revision.
Herald added a project: Frameworks.
Herald added a subscriber: kde-frameworks-devel.
cgiboudeaux requested review of this revision.

REVISION SUMMARY
  This also fixes the version in the .pc file.
  
  BUG 390225
  FIXED-IN: 5.55

REPOSITORY
  R6 KActivities

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D17718

AFFECTED FILES
  src/lib/CMakeLists.txt
  src/lib/libKActivities.pc.cmake

To: cgiboudeaux
Cc: kde-frameworks-devel, michaelh, ngraham, bruns