Hi All,
I don't understand the discussion about my last commit. What is happen
in my last kservice commit? I drop the following line
@sample ${SYSCONFDIR}/xdg/menus/applications-kde5.menu
because ${SYSCONFDIR}/xdg .aka /etc/xdg is wrong and don't exes it.
Antoine, you'll see the following approach, correct? (btw I've solved
post-isnatll more beautifully in addition.)
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/kservice/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile 6 Sep 2018 05:05:47 -0000 1.9
+++ Makefile 7 Sep 2018 11:48:18 -0000
@@ -2,7 +2,7 @@
COMMENT = plugin framework for KDE desktop services
DISTNAME = kservice-${VERSION}
-REVISION = 0
+REVISION = 1
SHARED_LIBS = KF5Service 4.1
@@ -23,14 +23,11 @@ LIB_DEPENDS = devel/kf5/kconfig \
devel/kf5/kdbusaddons \
devel/kf5/ki18n
-CONFIGURE_ARGS = -DCMAKE_POLICY_DEFAULT_CMP0058=OLD
+# avoid conflict with KDE4
+CONFIGURE_ARGS = -DCMAKE_POLICY_DEFAULT_CMP0058=OLD \
+ -DAPPLICATIONS_MENU_NAME:STRING="applications-kde5.menu"
TEST_IS_INTERACTIVE = X11
PORTHOME = ${WRKDIR}
-
-# avoid conflict with KDE4
-post-install:
- cd ${WRKINST}/etc/xdg/menus; \
- mv applications.menu applications-kde5.menu
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kf5/kservice/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 6 Sep 2018 05:05:47 -0000 1.4
+++ pkg/PLIST 7 Sep 2018 11:48:18 -0000
@@ -44,7 +44,7 @@ lib/cmake/KF5Service/KF5ServiceTargets.c
@man man/man8/kbuildsycoca5.8
share/examples/xdg/kservice.categories
share/examples/xdg/menus/
-share/examples/xdg/menus/applications-kde5.menu
+@sample share/examples/xdg/menus/applications-kde5.menu
share/kf5/mkspecs/qt_KService.pri
share/kservicetypes5/
share/kservicetypes5/application.desktop
Anyway, a deeper look in kf.port.mk show up the following lines:
# fix {/usr/local,}/etc/{dbus-1,xdg} and friends
MODKF5_EXAMPLES_DIR = ${PREFIX}/share/examples/kde
MODKF5_post-install += \
if [ -d ${PREFIX}/etc ]; then \
cd ${PREFIX}/etc; \
${INSTALL_DATA_DIR} ${MODKF5_EXAMPLES_DIR}; \
pax -rw * ${MODKF5_EXAMPLES_DIR}; \
rm -Rf ${PREFIX}/etc; \
fi; \
if [ -d ${WRKINST}/etc/dbus-1 ]; then \
cd ${WRKINST}/etc; \
${INSTALL_DATA_DIR} ${MODKF5_EXAMPLES_DIR}; \
pax -rw dbus-1 ${MODKF5_EXAMPLES_DIR}; \
rm -Rf ${WRKINST}/etc/dbus-1; \
fi; \
if [ -d ${WRKINST}/etc/xdg ]; then \
cd ${WRKINST}/etc; \
pax -rw xdg ${PREFIX}/share/examples; \
rm -Rf ${WRKINST}/etc/xdg; \
fi;
Why are we doing this? Do we not want to spam KDE stuff under /etc?
On Thu Sep 06, 2018 at 02:45:24PM -0300, Elias M. Mariani wrote:
> Yes, if you install kservice it leaves a xdg folder, the only one
> missing is menus.
>
> 2018-09-06 14:38 GMT-03:00 Antoine Jacoutot <ajacou...@bsdfrog.org>:
> > On Thu, Sep 06, 2018 at 01:09:52PM -0300, Elias M. Mariani wrote:
> >> You are right.
> >> I just review the change.
> >> My proposed change was different:
> >> https://marc.info/?l=openbsd-ports&m=153559615313702
> >>
> >> Already sent a mail to rsadowski@ to consult about this.
> >
> > Yup better :-)
> > Are we sure there's a dependency installing SYSCONFDIR/xdg/ ? make plist
> > should
> > tell us anyway.
> >
> > Thanks.
> >
> >
> >>
> >> Cheers.
> >> Elias.
> >>
> >> 2018-09-06 13:03 GMT-03:00 Antoine Jacoutot <ajacou...@bsdfrog.org>:
> >> > On Thu, Sep 06, 2018 at 12:58:36PM -0300, Elias M. Mariani wrote:
> >> >> A fix for this is already in the CVS:
> >> >> https://marc.info/?l=openbsd-ports-cvs&m=153621035406823
> >> >
> >> > That's not a fix.
> >> > The @sample line was removed altogether instead of sampling the needed
> >> > directory.
> >> >
> >> >> Cheers.
> >> >> Elias.
> >> >>
> >> >> 2018-09-06 3:55 GMT-03:00 Marc Espie <es...@nerim.net>:
> >> >> > On Thu, Sep 06, 2018 at 06:56:35AM +0200, Solene Rapenne wrote:
> >> >> >> Hello, I installed umbrello which brings kservice as a dependency
> >> >> >> and an error
> >> >> >> showed during the install process.
> >> >> >>
> >> >> >> solene@t480 /usr/ports $ doas pkg_add -vi umbrello
> >> >> >> Update candidates: quirks-3.7 -> quirks-3.7
> >> >> >> quirks-3.7 signed on 2018-09-04T22:05:13Z
> >> >> >> File /etc/xdg/menus/applications-kde5.menu could not be installed:
> >> >> >> No such file or directory
> >> >> >> umbrello-17.12.3p1:kservice-5.46.0: ok
> >> >> >>
> >> >> >> The file /etc/xdg/menus/applications-kde5.menu is present in the
> >> >> >> PLIST of
> >> >> >> devel/kf5/kservice like this:
> >> >> >>
> >> >> >> share/examples/xdg/menus/applications-kde5.menu
> >> >> >> @sample ${SYSCONFDIR}/xdg/menus/applications-kde5.menu
> >> >> >>
> >> >> >> I built the package, checked the content of the package tarball and
> >> >> >> it doesn't
> >> >> >> have a /etc folder in it. Why?
> >> >> >
> >> >> > Probably because at some point there was a runtime dependency on stuff
> >> >> > that already had
> >> >> > @sample ${SYSCONFDIR}/xdg/menus/
> >> >> > in it, but that dependency is no longer listed, but the plist hasn't
> >> >> > been
> >> >> > updated ?
> >> >> >
> >> >>
> >> >
> >> > --
> >> > Antoine
> >>
> >
> > --
> > Antoine
>
