On Mon, Jan 14, 2019 at 10:49:46AM +0100, Rafael Sadowski wrote: > On Sat Jan 12, 2019 at 04:56:24PM +0100, Antoine Jacoutot wrote: > > On Sat, Jan 12, 2019 at 03:18:32PM +0100, Rafael Sadowski wrote: > > > On Mon Jan 07, 2019 at 04:05:25PM +0100, Antoine Jacoutot wrote: > > > > Hi. > > > > > > > > This failed in my last bulk because libksane-4.14.3p3 conflicts with > > > > libksane-kf5-18.12.0. > > > > > > > > > > > > > > > > > > Hi Antoine and thanks for your report. > > > > > > First shot to avoid conflicts with libksane KDE4 and KDE5. I see -icons > > > pattern in some KDE4 ports to avoid conflicts with KDE3, so here is my > > > first try to do the same. > > > > All this kde3+kde4+kde5 co-existence looks really complex to me :-( > > Can't we get rid of libksane-4.14.3p3? > > > > Not without switching from graphics/digikam-kde4 to graphics/digikam > (Qt5).
Well, is libksane-4.14.3p3 a *hard* dependency for graphics/digikam-kde4? > BTW: I had no luck with OpenCV 3 and x11/kde-applications/libkface > (KDE4). The API changes are large and old patches[1] do not apply > anymore. So there is no way to coexist digikam-kde4 and digikam5. > > Solution 1: We build digikam-kde4 without libksane,libkface,opencv > support. (concern by espie@) Ah it's not, so problem solved ;-) > > Solution 2: We simply update (concern by espie@) > > [1]: https://bugs.kde.org/show_bug.cgi?id=349601 > > > > > > > > > 1.) I can build/package libksane-kde4 if kde5 is installed. > > > 2.) Upgrade process aslo looks okay: > > > > > > ===> Updating for libksane-kf5-18.12.0p0 > > > ===> libksane-kf5-18.12.0p0 depends on: libksane-kf5-icons-* - not found > > > ===> Verifying package for libksane-kf5-icons-* in > > > x11/kde-applications/libksane > > > ===> Returning to build of libksane-kf5-18.12.0p0 > > > ===> Verifying specs: c++ c++abi pthread KF5I18n KF5SonnetUi > > > KF5TextWidgets KF5Wallet KF5WidgetsAddons Qt5Core Qt5Gui Qt5Widgets m sane > > > ===> found c++.2.0 c++abi.0.1 pthread.25.1 KF5I18n.4.2 KF5SonnetUi.3.2 > > > KF5TextWidgets.4.1 KF5Wallet.4.2 KF5WidgetsAddons.4.2 Qt5Core.2.2 > > > Qt5Gui.2.2 Qt5Widgets.2.2 m.10.1 sane.2.0 > > > Upgrading from libksane-kf5-18.12.0 > > > libksane-kf5-18.12.0p0:libksane-kf5-18.12.0->libksane-kf5-icons-18.12.0: > > > ok > > > .libs-libksane-kf5-18.12.0->libksane-kf5-18.12.0p0: ok > > > Running tags: ok > > > Read shared items: ok > > > ===> Updating for libksane-kf5-icons-18.12.0 > > > > > > Best regards, > > > > > > RS > > > > > > > > > Index: Makefile > > > =================================================================== > > > RCS file: /cvs/ports/x11/kde-applications/libksane/Makefile,v > > > retrieving revision 1.2 > > > diff -u -p -u -p -r1.2 Makefile > > > --- Makefile 18 Dec 2018 09:39:21 -0000 1.2 > > > +++ Makefile 12 Jan 2019 14:17:07 -0000 > > > @@ -1,28 +1,46 @@ > > > # $OpenBSD: Makefile,v 1.2 2018/12/18 09:39:21 rsadowski Exp $ > > > > > > -COMMENT = KDE SANE (scanner) wrapper library > > > +COMMENT-main = KDE SANE (scanner) wrapper library > > > +COMMENT-icons = icons for libkipi > > > + > > > DISTNAME = libksane-${VERSION} > > > -PKGNAME = libksane-kf5-${VERSION} > > > + > > > +FULLPKGNAME= libksane-kf5-${VERSION} > > > +PKGNAME-main = libksane-kf5-${VERSION} > > > +PKGNAME-icons = libksane-kf5-icons-${VERSION} > > > + > > > +REVISION-main = 0 > > > + > > > CATEGORIES = graphics devel > > > > > > KDE5 = Yes > > > > > > SHARED_LIBS += KF5Sane 0.0 # 5.1 > > > > > > -WANTLIB += ${COMPILER_LIBCXX} KF5I18n KF5SonnetUi KF5TextWidgets > > > -WANTLIB += KF5Wallet KF5WidgetsAddons Qt5Core Qt5Gui Qt5Widgets > > > -WANTLIB += m sane > > > - > > > -MODKDE5_ICON_CACHE = yes > > > -MODKDE5_TRANSLATIONS = yes > > > - > > > -MODULES += x11/kde-applications > > > - > > > -LIB_DEPENDS += devel/kf5/ki18n \ > > > - devel/kf5/ktextwidgets \ > > > - devel/kf5/kwallet \ > > > - devel/kf5/kwidgetsaddons \ > > > - devel/kf5/sonnet \ > > > - graphics/sane-backends > > > +WANTLIB-icons = > > > + > > > +WANTLIB-main += ${COMPILER_LIBCXX} KF5I18n KF5SonnetUi KF5TextWidgets > > > +WANTLIB-main += KF5Wallet KF5WidgetsAddons Qt5Core Qt5Gui Qt5Widgets > > > +WANTLIB-main += m sane ${WANTLIB} > > > + > > > +MULTI_PACKAGES = -main -icons > > > + > > > +MODULES += x11/kde-applications > > > + > > > +RUN_DEPENDS-icons = x11/gtk+3,-guic > > > + > > > +RUN_DEPENDS-main = ${RUN_DEPENDS} \ > > > + ${BUILD_PKGPATH},-icons > > > + > > > +BUILD_DEPENDS += devel/gettext-tools > > > + > > > +LIB_DEPENDS-icons = > > > + > > > +LIB_DEPENDS-main += devel/kf5/ki18n \ > > > + devel/kf5/ktextwidgets \ > > > + devel/kf5/kwallet \ > > > + devel/kf5/kwidgetsaddons \ > > > + devel/kf5/sonnet \ > > > + graphics/sane-backends > > > > > > .include <bsd.port.mk> > > > Index: pkg/DESCR > > > =================================================================== > > > RCS file: pkg/DESCR > > > diff -N pkg/DESCR > > > --- pkg/DESCR 9 Dec 2018 10:21:30 -0000 1.1.1.1 > > > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > > > @@ -1,6 +0,0 @@ > > > -A library for dealing with scanners. LibKSane is a KDE interface for > > > -SANE library to control flat scanners. > > > - > > > -This library provides a widget to control a scanner, KSaneWidget. > > > -Internally, it will use the SANE library (or directly use TWAIN on > > > -Windows if SANE is not available). > > > Index: pkg/DESCR-icons > > > =================================================================== > > > RCS file: pkg/DESCR-icons > > > diff -N pkg/DESCR-icons > > > --- /dev/null 1 Jan 1970 00:00:00 -0000 > > > +++ pkg/DESCR-icons 12 Jan 2019 14:17:07 -0000 > > > @@ -0,0 +1,2 @@ > > > +This package contains shareable icons for libksane, used to allow KDE 4 > > > and 5 > > > +to be installed simultaneously. > > > Index: pkg/DESCR-main > > > =================================================================== > > > RCS file: pkg/DESCR-main > > > diff -N pkg/DESCR-main > > > --- /dev/null 1 Jan 1970 00:00:00 -0000 > > > +++ pkg/DESCR-main 12 Jan 2019 14:17:07 -0000 > > > @@ -0,0 +1,6 @@ > > > +A library for dealing with scanners. LibKSane is a KDE interface for SANE > > > +library to control flat scanners. > > > + > > > +This library provides a widget to control a scanner, KSaneWidget. > > > Internally, > > > +it will use the SANE library (or directly use TWAIN on Windows if SANE > > > is not > > > +available). > > > Index: pkg/PLIST > > > =================================================================== > > > RCS file: pkg/PLIST > > > diff -N pkg/PLIST > > > --- pkg/PLIST 18 Dec 2018 09:39:21 -0000 1.2 > > > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > > > @@ -1,69 +0,0 @@ > > > -@comment $OpenBSD: PLIST,v 1.2 2018/12/18 09:39:21 rsadowski Exp $ > > > -@conflict kde-l10n-* > > > -@conflict kde-i18n-* > > > -@conflict libksane-<=4 > > > -include/KF5/KSane/ > > > -include/KF5/KSane/KSaneWidget > > > -include/KF5/KSane/ksane_export.h > > > -include/KF5/KSane/ksanewidget.h > > > -include/KF5/ksane_version.h > > > -lib/cmake/KF5Sane/ > > > -lib/cmake/KF5Sane/KF5SaneConfig.cmake > > > -lib/cmake/KF5Sane/KF5SaneConfigVersion.cmake > > > -lib/cmake/KF5Sane/KF5SaneTargets${MODCMAKE_BUILD_SUFFIX} > > > -lib/cmake/KF5Sane/KF5SaneTargets.cmake > > > -@lib lib/libKF5Sane.so.${LIBKF5Sane_VERSION} > > > -share/icons/hicolor/16x16/actions/black-white.png > > > -share/icons/hicolor/16x16/actions/color.png > > > -share/icons/hicolor/16x16/actions/gray-scale.png > > > -share/locale/ar/LC_MESSAGES/libksane.mo > > > -share/locale/bg/LC_MESSAGES/libksane.mo > > > -share/locale/bs/LC_MESSAGES/libksane.mo > > > -share/locale/ca/LC_MESSAGES/libksane.mo > > > -share/locale/ca@valencia/LC_MESSAGES/libksane.mo > > > -share/locale/cs/LC_MESSAGES/libksane.mo > > > -share/locale/da/LC_MESSAGES/libksane.mo > > > -share/locale/de/LC_MESSAGES/libksane.mo > > > -share/locale/el/LC_MESSAGES/libksane.mo > > > -share/locale/en_GB/LC_MESSAGES/libksane.mo > > > -share/locale/eo/LC_MESSAGES/libksane.mo > > > -share/locale/es/LC_MESSAGES/libksane.mo > > > -share/locale/et/LC_MESSAGES/libksane.mo > > > -share/locale/eu/LC_MESSAGES/libksane.mo > > > -share/locale/fi/LC_MESSAGES/libksane.mo > > > -share/locale/fr/LC_MESSAGES/libksane.mo > > > -share/locale/ga/LC_MESSAGES/libksane.mo > > > -share/locale/gl/LC_MESSAGES/libksane.mo > > > -share/locale/hi/LC_MESSAGES/libksane.mo > > > -share/locale/hr/LC_MESSAGES/libksane.mo > > > -share/locale/hu/LC_MESSAGES/libksane.mo > > > -share/locale/ia/LC_MESSAGES/libksane.mo > > > -share/locale/is/LC_MESSAGES/libksane.mo > > > -share/locale/it/LC_MESSAGES/libksane.mo > > > -share/locale/ja/LC_MESSAGES/libksane.mo > > > -share/locale/kk/LC_MESSAGES/libksane.mo > > > -share/locale/km/LC_MESSAGES/libksane.mo > > > -share/locale/ko/LC_MESSAGES/libksane.mo > > > -share/locale/lt/LC_MESSAGES/libksane.mo > > > -share/locale/lv/LC_MESSAGES/libksane.mo > > > -share/locale/mr/LC_MESSAGES/libksane.mo > > > -share/locale/nb/LC_MESSAGES/libksane.mo > > > -share/locale/nds/LC_MESSAGES/libksane.mo > > > -share/locale/nl/LC_MESSAGES/libksane.mo > > > -share/locale/nn/LC_MESSAGES/libksane.mo > > > -share/locale/pa/LC_MESSAGES/libksane.mo > > > -share/locale/pl/LC_MESSAGES/libksane.mo > > > -share/locale/pt/LC_MESSAGES/libksane.mo > > > -share/locale/pt_BR/LC_MESSAGES/libksane.mo > > > -share/locale/ro/LC_MESSAGES/libksane.mo > > > -share/locale/ru/LC_MESSAGES/libksane.mo > > > -share/locale/sk/LC_MESSAGES/libksane.mo > > > -share/locale/sl/LC_MESSAGES/libksane.mo > > > -share/locale/sv/LC_MESSAGES/libksane.mo > > > -share/locale/tr/LC_MESSAGES/libksane.mo > > > -share/locale/ug/LC_MESSAGES/libksane.mo > > > -share/locale/uk/LC_MESSAGES/libksane.mo > > > -share/locale/wa/LC_MESSAGES/libksane.mo > > > -share/locale/zh_CN/LC_MESSAGES/libksane.mo > > > -share/locale/zh_TW/LC_MESSAGES/libksane.mo > > > -@tag gtk-update-icon-cache %D/share/icons/hicolor > > > Index: pkg/PLIST-icons > > > =================================================================== > > > RCS file: pkg/PLIST-icons > > > diff -N pkg/PLIST-icons > > > --- /dev/null 1 Jan 1970 00:00:00 -0000 > > > +++ pkg/PLIST-icons 12 Jan 2019 14:17:07 -0000 > > > @@ -0,0 +1,7 @@ > > > +@comment $OpenBSD: PLIST-icons,v 1.3 2018/06/29 22:16:31 espie Exp $ > > > +@conflict libksane-<=4 > > > +@conflict libksane-kf5->=17,<18.12.0p0 > > > +share/icons/hicolor/16x16/actions/black-white.png > > > +share/icons/hicolor/16x16/actions/color.png > > > +share/icons/hicolor/16x16/actions/gray-scale.png > > > +@tag gtk-update-icon-cache %D/share/icons/hicolor > > > Index: pkg/PLIST-main > > > =================================================================== > > > RCS file: pkg/PLIST-main > > > diff -N pkg/PLIST-main > > > --- /dev/null 1 Jan 1970 00:00:00 -0000 > > > +++ pkg/PLIST-main 12 Jan 2019 14:17:07 -0000 > > > @@ -0,0 +1,65 @@ > > > +@option no-default-conflict > > > +@conflict kde-l10n-* > > > +@conflict kde-i18n-* > > > +@pkgpath x11/kde-applications/libksane > > > +include/KF5/KSane/ > > > +include/KF5/KSane/KSaneWidget > > > +include/KF5/KSane/ksane_export.h > > > +include/KF5/KSane/ksanewidget.h > > > +include/KF5/ksane_version.h > > > +lib/cmake/KF5Sane/ > > > +lib/cmake/KF5Sane/KF5SaneConfig.cmake > > > +lib/cmake/KF5Sane/KF5SaneConfigVersion.cmake > > > +lib/cmake/KF5Sane/KF5SaneTargets${MODCMAKE_BUILD_SUFFIX} > > > +lib/cmake/KF5Sane/KF5SaneTargets.cmake > > > +@lib lib/libKF5Sane.so.${LIBKF5Sane_VERSION} > > > +share/locale/ar/LC_MESSAGES/libksane.mo > > > +share/locale/bg/LC_MESSAGES/libksane.mo > > > +share/locale/bs/LC_MESSAGES/libksane.mo > > > +share/locale/ca/LC_MESSAGES/libksane.mo > > > +share/locale/ca@valencia/LC_MESSAGES/libksane.mo > > > +share/locale/cs/LC_MESSAGES/libksane.mo > > > +share/locale/da/LC_MESSAGES/libksane.mo > > > +share/locale/de/LC_MESSAGES/libksane.mo > > > +share/locale/el/LC_MESSAGES/libksane.mo > > > +share/locale/en_GB/LC_MESSAGES/libksane.mo > > > +share/locale/eo/LC_MESSAGES/libksane.mo > > > +share/locale/es/LC_MESSAGES/libksane.mo > > > +share/locale/et/LC_MESSAGES/libksane.mo > > > +share/locale/eu/LC_MESSAGES/libksane.mo > > > +share/locale/fi/LC_MESSAGES/libksane.mo > > > +share/locale/fr/LC_MESSAGES/libksane.mo > > > +share/locale/ga/LC_MESSAGES/libksane.mo > > > +share/locale/gl/LC_MESSAGES/libksane.mo > > > +share/locale/hi/LC_MESSAGES/libksane.mo > > > +share/locale/hr/LC_MESSAGES/libksane.mo > > > +share/locale/hu/LC_MESSAGES/libksane.mo > > > +share/locale/ia/LC_MESSAGES/libksane.mo > > > +share/locale/is/LC_MESSAGES/libksane.mo > > > +share/locale/it/LC_MESSAGES/libksane.mo > > > +share/locale/ja/LC_MESSAGES/libksane.mo > > > +share/locale/kk/LC_MESSAGES/libksane.mo > > > +share/locale/km/LC_MESSAGES/libksane.mo > > > +share/locale/ko/LC_MESSAGES/libksane.mo > > > +share/locale/lt/LC_MESSAGES/libksane.mo > > > +share/locale/lv/LC_MESSAGES/libksane.mo > > > +share/locale/mr/LC_MESSAGES/libksane.mo > > > +share/locale/nb/LC_MESSAGES/libksane.mo > > > +share/locale/nds/LC_MESSAGES/libksane.mo > > > +share/locale/nl/LC_MESSAGES/libksane.mo > > > +share/locale/nn/LC_MESSAGES/libksane.mo > > > +share/locale/pa/LC_MESSAGES/libksane.mo > > > +share/locale/pl/LC_MESSAGES/libksane.mo > > > +share/locale/pt/LC_MESSAGES/libksane.mo > > > +share/locale/pt_BR/LC_MESSAGES/libksane.mo > > > +share/locale/ro/LC_MESSAGES/libksane.mo > > > +share/locale/ru/LC_MESSAGES/libksane.mo > > > +share/locale/sk/LC_MESSAGES/libksane.mo > > > +share/locale/sl/LC_MESSAGES/libksane.mo > > > +share/locale/sv/LC_MESSAGES/libksane.mo > > > +share/locale/tr/LC_MESSAGES/libksane.mo > > > +share/locale/ug/LC_MESSAGES/libksane.mo > > > +share/locale/uk/LC_MESSAGES/libksane.mo > > > +share/locale/wa/LC_MESSAGES/libksane.mo > > > +share/locale/zh_CN/LC_MESSAGES/libksane.mo > > > +share/locale/zh_TW/LC_MESSAGES/libksane.mo > > > > -- > > Antoine > > -- Antoine
