On Thu May 03, 2018 at 10:34:45PM +0200, Landry Breuil wrote:
> On Thu, May 03, 2018 at 10:25:48PM +0200, Rafael Sadowski wrote:
> > On Thu May 03, 2018 at 10:16:13PM +0200, Landry Breuil wrote:
> > > On Thu, May 03, 2018 at 09:52:38PM +0200, Rafael Sadowski wrote:
> > > > On Mon Apr 30, 2018 at 07:30:33AM +0200, Landry Breuil wrote:
> > > > > On Sun, Apr 29, 2018 at 10:20:42PM +0200, Rafael Sadowski wrote:
> > > > > > On Sun Apr 29, 2018 at 12:01:21PM +0200, Landry Breuil wrote:
> > > > > > > On Sun, Apr 29, 2018 at 11:58:02AM +0200, Rafael Sadowski wrote:
> > > > > > > > On Sun Apr 29, 2018 at 11:01:11AM +0200, Landry Breuil wrote:
> > > > > > > > > On Sun, Apr 29, 2018 at 10:04:25AM +0200, Rafael Sadowski
> > > > > > > > > wrote:
> > > > > > > > > > $ cat x11/kde-applications/libkdcraw/pkg/DESCR
> > > > > > > > > > Libkdcraw is a C++ interface around LibRaw library used to
> > > > > > > > > > decode RAW picture
> > > > > > > > > > files.
> > > > > > > > > >
> > > > > > > > > > Looks simple but it feels like a trap. libkdcraw-17.12.3
> > > > > > > > > > has no
> > > > > > > > > > conflicts with libkdcraw from KDE4 but we can't just commit
> > > > > > > > > > because all
> > > > > > > > > > KDE4 applications will grep/find libkdcraw-17.12.3 instead
> > > > > > > > > > libkdcraw-4.*, which is wrong.
> > > > > > > > >
> > > > > > > > > Do you mean at install time ? just because the pkgname is
> > > > > > > > > the same ?
> > > > > > > > > use @option is-branch maybe ?
> > > > > > > > >
> > > > > > > >
> > > > > > > > Exactly, pkgname is the same but somehow everything looks okay:
> > > > > > > >
> > > > > > > > $ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add
> > > > > > > > gwenview
> > > > > > > > gwenview-4.14.3p3:libkdcraw-4.14.3p2: ok
> > > > > > > > gwenview-4.14.3p3:libkipi-4.14.3p2: ok
> > > > > > > > gwenview-4.14.3p3: ok
> > > > > > > >
> > > > > > > > The 17.12.3 packages will not fetch. kde4 is smart enough,
> > > > > > > > anyway ok?
> > > > > > >
> > > > > > > I'm not 100% sure but i think you *have* to at least set @option
> > > > > > > no-default-config (maybe is-branch?), otherwise the packages will
> > > > > > > conflict by default since they have the same name, even if they
> > > > > > > don't
> > > > > > > have actual files conflicting.
> > > > > > >
> > > > > >
> > > > > > Yes, both options make sense to me. Btw I didn't know them, so far:
> > > > > >
> > > > > > @option is-branch
> > > > > > @option no-default-conflict
> > > > > >
> > > > > > Ok (I think a second updated tarball is nor necessary, isn't)?
> > > > >
> > > > > I think testing that it does what it's supposed to do with various
> > > > > combinations of the options is necessary :)
> > > > >
> > > >
> > > >
> > > > With all options 1-4 I run ine the same inputs/outputs (A)-(F).
> > > > Did I forget one scenario? If not there is not reason for any option in
> > > > PLIST.
> > > >
> > > > 1)
> > > > @option is-branch
> > > > @option no-default-conflict
> > > >
> > > > 2)
> > > > @option no-default-conflict
> > > >
> > > > 3)
> > > > @option is-branch
> > > >
> > > > 4) none
> > >
> > > Without @option no-default-conflict, can you install both versions of
> > > libkdcraw at the same time ?
> >
> > No with NO 1-4 option I can install both
>
> Too many negations :)
ops, I'ts too late. Should be: "No, with all options (1-3) I can't install
both"
>
> If with none of both options you can install both versions alongside,
> then things are fine without them. Just wanted to make sure.
>
> > > > (F)
> > > > $ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add gwenview
> > > > Can't install gwenview-4.14.3p3 because of libraries
> > > > |library lib/kde4/libs/kdcraw.51.0 not found
> > > > | not found anywhere
> > >
> > > Sounds like a failure to me. It should install libkdcraw-4....
> > >
> > Even if libkdcraw-17.12.3 is installed? In scenario F libkdcraw-17.12.3
> > is installed.
>
> As i understand it, gwenview only works with libkdcraw 4. So whatever is
> installed on the system, if you try to install gwenview, it should
> install the version of libkdcraw it requires, not fail and complain
> about a missing lib.
>
> Having had a quick look at gwenview i think you should adjust gwenview
> dependency on libkdcraw, which is currently
> '${MODKDE4_DEP_DIR}/libkdcraw>=${MODKDE4_DEP_VERSION}' (where, even if
> MODKDE4_DEP_DIR doesnt match the path for the newer libkdcraw, the
> pkgname and version will match it) for something like
> '>=${MODKDE4_DEP_VERSION},<5'maybe, so that the newer libkdcraw doesnt
> match and it uses *the one it needs*.
>
That's the final clue! Scenario F looks like the following with the diff
below:
TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add gwenview
Can't install libkdcraw-4.14.3p2 because of conflicts
(libkdcraw-17.12.3)
Can't install gwenview-4.14.3p3: can't resolve libkdcraw-4.14.3p2
--- libkdcraw-4.14.3p2 -------------------
Can't install libkdcraw-4.14.3p2: conflicts
All in all, the options are not necessary but the consumers needs tweak
until they're replaced, too.
ok with the diff below? However, big thanks landry@ for your support.
Index: graphics-thumbnailers/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/graphics-thumbnailers/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- graphics-thumbnailers/Makefile 27 Jul 2017 11:57:48 -0000 1.11
+++ graphics-thumbnailers/Makefile 3 May 2018 21:02:23 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE thumbnail creation plugins
DISTNAME = kdegraphics-thumbnailers-${MODKDE4_VERSION}
-REVISION = 1
+REVISION = 2
WANTLIB = m pthread
WANTLIB += ${COMPILER_LIBCXX}
@@ -12,6 +12,6 @@ WANTLIB += ${KDE4LIB}/kdcraw ${KDE4LIB}/
WANTLIB += ${KDE4LIB}/kio
LIB_DEPENDS = ${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION} \
- ${MODKDE4_DEP_DIR}/libkdcraw>=${MODKDE4_DEP_VERSION}
+ ${MODKDE4_DEP_DIR}/libkdcraw>=${MODKDE4_DEP_VERSION},<5
.include <bsd.port.mk>
Index: gwenview/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/gwenview/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- gwenview/Makefile 27 Jul 2017 11:57:48 -0000 1.18
+++ gwenview/Makefile 3 May 2018 21:02:23 -0000
@@ -3,7 +3,7 @@
COMMENT = KDE image viewer
DISTNAME = gwenview-${MODKDE4_VERSION}
PKGSPEC = gwenview-${MODKDE4_SPEC}
-REVISION = 3
+REVISION = 4
SHARED_LIBS = gwenviewlib 52.0 # 4.7
@@ -35,7 +35,7 @@ LIB_DEPENDS = databases/soprano>=${MIN_
graphics/png \
${MODKDE4_DEP_DIR}/baseapps>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/kactivities>=${MIN_ACTIVITIES_VERSION} \
- ${MODKDE4_DEP_DIR}/libkdcraw>=${MODKDE4_DEP_VERSION} \
+ ${MODKDE4_DEP_DIR}/libkdcraw>=${MODKDE4_DEP_VERSION},<5 \
${MODKDE4_DEP_DIR}/libkipi>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/baloo>=${MODKDE4_DEP_VERSION}
