Re: Review Request 125284: make install name of applications.menu file a cached cmake variable

2015-09-25 Thread Harald Sitter 

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125284/
---

(Updated Sept. 25, 2015, 7:47 a.m.)


Status
--

This change has been marked as submitted.


Review request for KDE Frameworks, David Faure, Jonathan Riddell, and Rex 
Dieter.


Changes
---

Submitted with commit 16e6b2b6a10622b060c22201085e26e8abcd60e2 by Harald Sitter 
to branch master.


Repository: kservice


Description
---

To not conflict with kde4runtime nor gnome nor xfce, distributions may
choose to have a different name for their applications.menu file.
To enable this without pitchy patching make the installed name fully
parameterized via the cmake variable APPLICATIONS_MENU_NAME.

This is based on the debian/kubuntu patch to rename the file:
http://anonscm.debian.org/cgit/pkg-kde/frameworks/kservice.git/tree/debian/patches/kubuntu_rename-application-menu-file.diff?h=kubuntu_wily_archive=de26b631f641b0aa5e2e184443ff6970ed5e8b56


Diffs
-

  CMakeLists.txt 958db4a4891a982b7e9a1bd5c903cb4d126e1cdc 
  src/CMakeLists.txt 5ea5b002411a098a0111a6ee552c554ec461cc28 
  src/config-ksycoca.h.cmake f47b1f67383b558c0a99eccb5c24f32b32fdb1db 
  src/sycoca/kbuildsycoca.cpp ccb935012b158ca75f28dbc337bb77b56d748ab5 

Diff: https://git.reviewboard.kde.org/r/125284/diff/


Testing
---

clean cmake && make && make install
> -- Installing: ./etc/xdg/menus/applications.menu

changed cached var && make && make install
> -- Installing: ./etc/xdg/menus/kf5-applications.menu


Thanks,

Harald Sitter

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

Re: Review Request 125284: make install name of applications.menu file a cached cmake variable

2015-09-24 Thread David Faure 

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125284/#review85891
---

Ship it!


Ship It!

- David Faure


On Sept. 21, 2015, 11:35 a.m., Harald Sitter wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125284/
> ---
> 
> (Updated Sept. 21, 2015, 11:35 a.m.)
> 
> 
> Review request for KDE Frameworks, David Faure, Jonathan Riddell, and Rex 
> Dieter.
> 
> 
> Repository: kservice
> 
> 
> Description
> ---
> 
> To not conflict with kde4runtime nor gnome nor xfce, distributions may
> choose to have a different name for their applications.menu file.
> To enable this without pitchy patching make the installed name fully
> parameterized via the cmake variable APPLICATIONS_MENU_NAME.
> 
> This is based on the debian/kubuntu patch to rename the file:
> http://anonscm.debian.org/cgit/pkg-kde/frameworks/kservice.git/tree/debian/patches/kubuntu_rename-application-menu-file.diff?h=kubuntu_wily_archive=de26b631f641b0aa5e2e184443ff6970ed5e8b56
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 958db4a4891a982b7e9a1bd5c903cb4d126e1cdc 
>   src/CMakeLists.txt 5ea5b002411a098a0111a6ee552c554ec461cc28 
>   src/config-ksycoca.h.cmake f47b1f67383b558c0a99eccb5c24f32b32fdb1db 
>   src/sycoca/kbuildsycoca.cpp ccb935012b158ca75f28dbc337bb77b56d748ab5 
> 
> Diff: https://git.reviewboard.kde.org/r/125284/diff/
> 
> 
> Testing
> ---
> 
> clean cmake && make && make install
> > -- Installing: ./etc/xdg/menus/applications.menu
> 
> changed cached var && make && make install
> > -- Installing: ./etc/xdg/menus/kf5-applications.menu
> 
> 
> Thanks,
> 
> Harald Sitter
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

Re: Review Request 125284: make install name of applications.menu file a cached cmake variable

2015-09-21 Thread Harald Sitter 


> On Sept. 20, 2015, 6:37 p.m., David Faure wrote:
> > CMakeLists.txt, line 33
> > 
> >
> > I'm surprised that this compiles, the double-quotes here usually don't 
> > end up in the C++ code, (they get eaten by cmake or make or the shell) - 
> > this requires some more backslashes and double-quotes (there are examples 
> > in other places of the code)...
> > 
> > It's simpler to use configure_file() instead, anyway (and it makes the 
> > define only visible by the one file which needs it).

Now that you mention it, that stringy definition indeed didn't work some years 
ago. Best guess is that cmake3 started auto-escaping. Anyway, switching to the 
existing config file.


- Harald


---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125284/#review85701
---


On Sept. 17, 2015, 9:32 a.m., Harald Sitter wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125284/
> ---
> 
> (Updated Sept. 17, 2015, 9:32 a.m.)
> 
> 
> Review request for KDE Frameworks, David Faure, Jonathan Riddell, and Rex 
> Dieter.
> 
> 
> Repository: kservice
> 
> 
> Description
> ---
> 
> To not conflict with kde4runtime nor gnome nor xfce, distributions may
> choose to have a different name for their applications.menu file.
> To enable this without pitchy patching make the installed name fully
> parameterized via the cmake variable APPLICATIONS_MENU_NAME.
> 
> This is based on the debian/kubuntu patch to rename the file:
> http://anonscm.debian.org/cgit/pkg-kde/frameworks/kservice.git/tree/debian/patches/kubuntu_rename-application-menu-file.diff?h=kubuntu_wily_archive=de26b631f641b0aa5e2e184443ff6970ed5e8b56
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 958db4a4891a982b7e9a1bd5c903cb4d126e1cdc 
>   src/CMakeLists.txt 5ea5b002411a098a0111a6ee552c554ec461cc28 
>   src/sycoca/kbuildsycoca.cpp 60a60662ac014ddc73825ca40f604730e0596537 
> 
> Diff: https://git.reviewboard.kde.org/r/125284/diff/
> 
> 
> Testing
> ---
> 
> clean cmake && make && make install
> > -- Installing: ./etc/xdg/menus/applications.menu
> 
> changed cached var && make && make install
> > -- Installing: ./etc/xdg/menus/kf5-applications.menu
> 
> 
> Thanks,
> 
> Harald Sitter
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

Re: Review Request 125284: make install name of applications.menu file a cached cmake variable

2015-09-20 Thread David Faure 

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125284/#review85701
---



CMakeLists.txt (line 33)


I'm surprised that this compiles, the double-quotes here usually don't end 
up in the C++ code, (they get eaten by cmake or make or the shell) - this 
requires some more backslashes and double-quotes (there are examples in other 
places of the code)...

It's simpler to use configure_file() instead, anyway (and it makes the 
define only visible by the one file which needs it).


- David Faure


On Sept. 17, 2015, 9:32 a.m., Harald Sitter wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125284/
> ---
> 
> (Updated Sept. 17, 2015, 9:32 a.m.)
> 
> 
> Review request for KDE Frameworks, David Faure, Jonathan Riddell, and Rex 
> Dieter.
> 
> 
> Repository: kservice
> 
> 
> Description
> ---
> 
> To not conflict with kde4runtime nor gnome nor xfce, distributions may
> choose to have a different name for their applications.menu file.
> To enable this without pitchy patching make the installed name fully
> parameterized via the cmake variable APPLICATIONS_MENU_NAME.
> 
> This is based on the debian/kubuntu patch to rename the file:
> http://anonscm.debian.org/cgit/pkg-kde/frameworks/kservice.git/tree/debian/patches/kubuntu_rename-application-menu-file.diff?h=kubuntu_wily_archive=de26b631f641b0aa5e2e184443ff6970ed5e8b56
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 958db4a4891a982b7e9a1bd5c903cb4d126e1cdc 
>   src/CMakeLists.txt 5ea5b002411a098a0111a6ee552c554ec461cc28 
>   src/sycoca/kbuildsycoca.cpp 60a60662ac014ddc73825ca40f604730e0596537 
> 
> Diff: https://git.reviewboard.kde.org/r/125284/diff/
> 
> 
> Testing
> ---
> 
> clean cmake && make && make install
> > -- Installing: ./etc/xdg/menus/applications.menu
> 
> changed cached var && make && make install
> > -- Installing: ./etc/xdg/menus/kf5-applications.menu
> 
> 
> Thanks,
> 
> Harald Sitter
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

Review Request 125284: make install name of applications.menu file a cached cmake variable

2015-09-17 Thread Harald Sitter 

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125284/
---

Review request for KDE Frameworks, David Faure, Jonathan Riddell, and Rex 
Dieter.


Repository: kservice


Description
---

To not conflict with kde4runtime nor gnome nor xfce, distributions may
choose to have a different name for their applications.menu file.
To enable this without pitchy patching make the installed name fully
parameterized via the cmake variable APPLICATIONS_MENU_NAME.

This is based on the debian/kubuntu patch to rename the file:
http://anonscm.debian.org/cgit/pkg-kde/frameworks/kservice.git/tree/debian/patches/kubuntu_rename-application-menu-file.diff?h=kubuntu_wily_archive=de26b631f641b0aa5e2e184443ff6970ed5e8b56


Diffs
-

  CMakeLists.txt 958db4a4891a982b7e9a1bd5c903cb4d126e1cdc 
  src/CMakeLists.txt 5ea5b002411a098a0111a6ee552c554ec461cc28 
  src/sycoca/kbuildsycoca.cpp 60a60662ac014ddc73825ca40f604730e0596537 

Diff: https://git.reviewboard.kde.org/r/125284/diff/


Testing
---

clean cmake && make && make install
> -- Installing: ./etc/xdg/menus/applications.menu

changed cached var && make && make install
> -- Installing: ./etc/xdg/menus/kf5-applications.menu


Thanks,

Harald Sitter

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

Re: Review Request 125284: make install name of applications.menu file a cached cmake variable

2015-09-17 Thread Hrvoje Senjan 

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125284/#review85585
---


+1
This will save a lot of patch rebasing :D (i'm assuming every distro renames 
the file)

- Hrvoje Senjan


On Sept. 17, 2015, 11:32 a.m., Harald Sitter wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125284/
> ---
> 
> (Updated Sept. 17, 2015, 11:32 a.m.)
> 
> 
> Review request for KDE Frameworks, David Faure, Jonathan Riddell, and Rex 
> Dieter.
> 
> 
> Repository: kservice
> 
> 
> Description
> ---
> 
> To not conflict with kde4runtime nor gnome nor xfce, distributions may
> choose to have a different name for their applications.menu file.
> To enable this without pitchy patching make the installed name fully
> parameterized via the cmake variable APPLICATIONS_MENU_NAME.
> 
> This is based on the debian/kubuntu patch to rename the file:
> http://anonscm.debian.org/cgit/pkg-kde/frameworks/kservice.git/tree/debian/patches/kubuntu_rename-application-menu-file.diff?h=kubuntu_wily_archive=de26b631f641b0aa5e2e184443ff6970ed5e8b56
> 
> 
> Diffs
> -
> 
>   CMakeLists.txt 958db4a4891a982b7e9a1bd5c903cb4d126e1cdc 
>   src/CMakeLists.txt 5ea5b002411a098a0111a6ee552c554ec461cc28 
>   src/sycoca/kbuildsycoca.cpp 60a60662ac014ddc73825ca40f604730e0596537 
> 
> Diff: https://git.reviewboard.kde.org/r/125284/diff/
> 
> 
> Testing
> ---
> 
> clean cmake && make && make install
> > -- Installing: ./etc/xdg/menus/applications.menu
> 
> changed cached var && make && make install
> > -- Installing: ./etc/xdg/menus/kf5-applications.menu
> 
> 
> Thanks,
> 
> Harald Sitter
> 
>

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel