Re: [kde-freebsd] ports/134230: graphics/digikam-kde4 does not build from ports
On Friday 05 June 2009 12:27:21 Jason E. Hale wrote: > The build problem in this PR is caused by QT3 style headers in certain > files. I added a replacement list to fix those headers. > > While I was fixing this, I discovered that if KDE3 versions of kipi, > kdcraw, or kexiv2 were installed, the KDE3 version would be picked up > instead of the KDE4 version. This is because CMake looks in the system > paths first and uses that library even if pkg-config is specifically > telling it to use the KDE4 one. My patch uses the newer pkg-config module > and disables the default path. > > I also turned the optional requirements into OPTIONS since not specifically > disabling them or specifically making them dependencies will cause > problems if they are linked to but then deinstalled. I tested all OPTIONS > and no additional files are installed. > > Misc: depend on pkg-config, add more QT_COMPONENTS that digikam > links to, remove share/apps/solid/actions from pkg-plist since it is in > kdehier Oh thanks! It's a great work, and I can use DigKam again! May be kipi-plugins-kde have a similar problem? It also doesn't build from ports with recens kde4 -- Dmitry "Red Fox" Panov @ Home FreeBSD since September, 1995 Khabarovsk, Russia Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/134230: graphics/digikam-kde4 does not build from ports
The build problem in this PR is caused by QT3 style headers in certain files.
I added a replacement list to fix those headers.
While I was fixing this, I discovered that if KDE3 versions of kipi, kdcraw, or
kexiv2 were installed, the KDE3 version would be picked up instead of the
KDE4 version. This is because CMake looks in the system paths first and
uses that library even if pkg-config is specifically telling it to use the KDE4
one. My patch uses the newer pkg-config module and disables the default
path.
I also turned the optional requirements into OPTIONS since not specifically
disabling them or specifically making them dependencies will cause
problems if they are linked to but then deinstalled. I tested all OPTIONS
and no additional files are installed.
Misc: depend on pkg-config, add more QT_COMPONENTS that digikam
links to, remove share/apps/solid/actions from pkg-plist since it is in kdehier
--- 2009-06-04-digikam-kde4.diff begins here ---
diff -ruN digikam-kde4.orig/Makefile digikam-kde4/Makefile
--- digikam-kde4.orig/Makefile 2009-06-04 05:29:52.0 -0400
+++ digikam-kde4/Makefile 2009-06-04 20:43:53.0 -0400
@@ -7,7 +7,7 @@
PORTNAME= digikam
PORTVERSION= 0.10.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES=graphics kde
MASTER_SITES= SFE
@@ -16,7 +16,6 @@
COMMENT= An advanced digital photo management application for KDE4
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
- gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
lcms.1:${PORTSDIR}/graphics/lcms \
png.5:${PORTSDIR}/graphics/png \
jasper.4:${PORTSDIR}/graphics/jasper \
@@ -25,13 +24,50 @@
LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs pimlibs
+USE_KDE4= automoc4 kdehier kdeprefix kdelibs
USE_QT_VER=4
-QT_COMPONENTS= corelib gui sql qmake_build moc_build rcc_build uic_build
+QT_COMPONENTS= gui dbus network qt3support sql svg xml \
+ qmake_build moc_build rcc_build uic_build
+USE_GNOME= pkgconfig
USE_CMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
MAN1= digitaglinktree.1
-.include
+OPTIONS= GPHOTO2 "Compile with gphoto2 support" on \
+ LENSFUN "Compile lens auto-correction image editor plugin" off \
+ MARBLE "Geolocation support (requires misc/kdeedu4)" off \
+ PIMLIBS "Address book support" on
+
+.include
+
+.if defined(WITHOUT_GPHOTO2)
+CMAKE_ARGS+= -DENABLE_GPHOTO2:BOOL=OFF
+.else
+LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+.endif
+
+.if defined(WITH_LENSFUN)
+LIB_DEPENDS+= lensfun.0:${PORTSDIR}/graphics/lensfun
+.else
+CMAKE_ARGS+= -DWITH_LensFun:BOOL=OFF
+.endif
+
+.if defined(WITH_MARBLE)
+LIB_DEPENDS+= marblewidget.5:${PORTSDIR}/misc/kdeedu4
+.else
+CMAKE_ARGS+= -DWITH_MarbleWidget:BOOL=OFF
+.endif
+
+.if defined(WITHOUT_PIMLIBS)
+CMAKE_ARGS+= -DWITH_KdepimLibs:BOOL=OFF
+.else
+USE_KDE4+= pimlibs
+.endif
+
+post-patch:
+ ${GREP} -H -r "#include
diff -ruN digikam-kde4.orig/files/patch-CMakeLists.txt
digikam-kde4/files/patch-CMakeLists.txt
--- digikam-kde4.orig/files/patch-CMakeLists.txt2009-06-04
05:29:52.0 -0400
+++ digikam-kde4/files/patch-CMakeLists.txt 2009-06-04 16:40:17.0
-0400
@@ -1,6 +1,6 @@
CMakeLists.txt.orig2009-01-21 12:32:12.0 -0600
-+++ CMakeLists.txt 2009-01-27 21:31:03.0 -0600
-@@ -45,39 +45,126 @@
+--- ./CMakeLists.txt.orig 2009-03-16 11:39:44.0 -0400
./CMakeLists.txt 2009-06-04 16:40:10.0 -0400
+@@ -45,39 +45,55 @@
MACRO_OPTIONAL_FIND_PACKAGE(PNG)
MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
@@ -24,7 +24,14 @@
-ELSE(NOT WIN32)
-SET(KDCRAW_FOR_DIGIKAM TRUE)
-ENDIF(NOT WIN32)
--
++INCLUDE(FindPkgConfig)
++# Check for KExiv2
++PKG_CHECK_MODULES(LIBKEXIV2 libkexiv2-kde4>=0.5.0)
++FIND_PATH(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h
++ PATHS ${LIBKEXIV2_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
++FIND_LIBRARY(KEXIV2_LIBRARY NAMES kexiv2
++ PATHS ${LIBKEXIV2_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
+
-# Check KExiv2 version installed to compile fine.
-IF(NOT WIN32)
-FIND_PACKAGE(PkgConfig)
@@ -37,121 +44,42 @@
-ELSE(NOT WIN32)
-SET(KEXIV2_FOR_DIGIKAM TRUE)
-ENDIF(NOT WIN32)
-+# use pkg-config to get the directories and then use these values
-+# in the FIND_PATH() and FIND_LIBRARY() calls
-+INCLUDE(UsePkgConfig)
-+
-+message(STATUS "Check Kexiv2 library using pkg-config...")
-+PKGCONFIG(libkexiv2-kde4 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags
_KEXIV2Cflags)
-+if(_KEXIV2LinkFlags)
-+ # query pkg-config asking for a libkexiv2 >= 0.2.0
-+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0
libkexiv2-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE
_pkgconfigDevNull)
-+ if(_return_VALUE STREQUAL "0")
-+message(STATUS "Found
Re: [kde-freebsd] area51/editors/koffice-kde4: update to 2.0.0 release
On Friday 05 June 2009 11:43:25 Alberto Villa wrote: > On Thursday 04 June 2009 04:45:53 Dima Panov wrote: > > Good day! > > > > = > > Index: editors/koffice-kde4/distinfo > > thanks! i've installed it with qt 4.4.3, but it required a lot of patching, > since it is qt 4.5 dependent Yes, qt 4.5 is required by many functions. I've already live with qt-4.5.1 from area51, since kde 4.3.beta1 is also wants to use qt-4.5 rather then 4.4.x -- Dmitry "Red Fox" Panov @ Home FreeBSD since September, 1995 Khabarovsk, Russia Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] area51/editors/koffice-kde4: update to 2.0.0 release
On Thursday 04 June 2009 04:45:53 Dima Panov wrote: > Good day! > > = > Index: editors/koffice-kde4/distinfo thanks! i've installed it with qt 4.4.3, but it required a lot of patching, since it is qt 4.5 dependent -- Alberto Villa ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
[kde-freebsd] area51/misc/kdeedu4: update plist to 4.2.85
* update plist == Index: misc/kdeedu4/pkg-plist === --- misc/kdeedu4/pkg-plist (revision 4809) +++ misc/kdeedu4/pkg-plist (working copy) @@ -41,6 +41,7 @@ include/libkdeedu/keduvocpersonalpronoun.h include/libkdeedu/keduvoctext.h include/libkdeedu/keduvoctranslation.h +include/libkdeedu/keduvocwordflags.h include/libkdeedu/keduvocwordtype.h include/libkdeedu/libkdeedu_science_export.h include/libkdeedu/libkdeedu_ui_export.h @@ -59,36 +60,50 @@ include/libkiten/HistoryPtrList.h include/libkiten/kromajiedit.h include/libkiten/libkitenexport.h +include/marble/AbstractDataPlugin.h +include/marble/AbstractDataPluginModel.h +include/marble/AbstractDataPluginWidget.h +include/marble/AbstractFloatItem.h include/marble/AbstractLayerInterface.h include/marble/AbstractProjection.h include/marble/AbstractProjectionHelper.h -include/marble/BoundingBox.h include/marble/ClipPainter.h include/marble/EquirectProjection.h include/marble/EquirectProjectionHelper.h include/marble/ExtDateTime.h +include/marble/GeoDataAccuracy.h include/marble/GeoDataColorStyle.h include/marble/GeoDataContainer.h +include/marble/GeoDataContainer_p.h include/marble/GeoDataCoordinates.h include/marble/GeoDataCoordinates_p.h include/marble/GeoDataDocument.h +include/marble/GeoDataDocument_p.h include/marble/GeoDataFeature.h +include/marble/GeoDataFeature_p.h include/marble/GeoDataFolder.h include/marble/GeoDataGeometry.h +include/marble/GeoDataGeometry_p.h include/marble/GeoDataHotSpot.h include/marble/GeoDataIconStyle.h include/marble/GeoDataLabelStyle.h include/marble/GeoDataLatLonAltBox.h include/marble/GeoDataLatLonBox.h include/marble/GeoDataLineString.h +include/marble/GeoDataLineString_p.h include/marble/GeoDataLineStyle.h include/marble/GeoDataLinearRing.h +include/marble/GeoDataLinearRing_p.h include/marble/GeoDataMultiGeometry.h +include/marble/GeoDataMultiGeometry_p.h include/marble/GeoDataObject.h include/marble/GeoDataPlacemark.h +include/marble/GeoDataPlacemark_p.h include/marble/GeoDataPoint.h +include/marble/GeoDataPoint_p.h include/marble/GeoDataPolyStyle.h include/marble/GeoDataPolygon.h +include/marble/GeoDataPolygon_p.h include/marble/GeoDataStyle.h include/marble/GeoDataStyleMap.h include/marble/GeoDataStyleSelector.h @@ -98,20 +113,21 @@ include/marble/MapThemeManager.h include/marble/MapThemeSortFilterProxyModel.h include/marble/MarbleAboutDialog.h -include/marble/MarbleAbstractFloatItem.h include/marble/MarbleControlBox.h include/marble/MarbleDataFacade.h include/marble/MarbleDirs.h include/marble/MarbleMap.h include/marble/MarbleModel.h include/marble/MarbleNavigator.h -include/marble/MarbleRenderPlugin.h -include/marble/MarbleRenderPluginInterface.h include/marble/MarbleWidget.h include/marble/MarbleWidgetInputHandler.h include/marble/MercatorProjection.h include/marble/MercatorProjectionHelper.h +include/marble/Planet.h +include/marble/PluginInterface.h include/marble/Quaternion.h +include/marble/RenderPlugin.h +include/marble/RenderPluginInterface.h include/marble/Serializable.h include/marble/SphericalProjection.h include/marble/SphericalProjectionHelper.h @@ -123,16 +139,35 @@ include/marble/geodata_export.h include/marble/global.h include/marble/marble_export.h +lib/avogadro-kalzium/colors/libchargecolor.so +lib/avogadro-kalzium/colors/libdistancecolor.so +lib/avogadro-kalzium/colors/libindexcolor.so +lib/avogadro-kalzium/colors/libresiduecolor.so lib/avogadro-kalzium/engines/liblabelengine.so +lib/avogadro-kalzium/engines/libaxesengine.so +lib/avogadro-kalzium/engines/libcartoonengine.so +lib/avogadro-kalzium/engines/libdipoleengine.so +lib/avogadro-kalzium/engines/libforceengine.so +lib/avogadro-kalzium/engines/libhbondengine.so lib/avogadro-kalzium/engines/liborbitalengine.so +lib/avogadro-kalzium/engines/liboverlayengine.so +lib/avogadro-kalzium/engines/libpolygonengine.so lib/avogadro-kalzium/engines/libribbonengine.so lib/avogadro-kalzium/engines/libringengine.so +lib/avogadro-kalzium/engines/libsimplewireengine.so lib/avogadro-kalzium/engines/libsphereengine.so lib/avogadro-kalzium/engines/libstickengine.so +lib/avogadro-kalzium/engines/libsurfaceengine.so lib/avogadro-kalzium/engines/libwireengine.so +lib/avogadro-kalzium/tools/libaligntool.so +lib/avogadro-kalzium/tools/libautoopttool.so +lib/avogadro-kalzium/tools/libautorotatetool.so +lib/avogadro-kalzium/tools/libbondcentrictool.so lib/avogadro-kalzium/tools/libclickmeasuretool.so lib/avogadro-kalzium/tools/libdrawtool.so +lib/avogadro-kalzium/tools/libmanipulatetool.so lib/avogadro-kalzium/tools/libnavigatetool.so +lib/avogadro-kalzium/tools/libselectrotatetool.so lib/kde4/kigpart.so lib/kde4/libkmplotpart.so lib/kde4/libmarble_part.so @@ -144,12 +179,17 @@ lib/kde4/plasma_engine_parley.so lib/kde4/plugins/designer/kalziumuiwidgets.so lib/kde4/plugins/marble/CompassFloatItem.so +lib/kde4/plugins/m
Re: [kde-freebsd] ports/135261: [patch] graphics/py-qt4-svg: do @dirrmtry instead of @dirrm
Synopsis: [patch] graphics/py-qt4-svg: do @dirrmtry instead of @dirrm Responsible-Changed-From-To: freebsd-ports-bugs->kde Responsible-Changed-By: edwin Responsible-Changed-When: Thu Jun 4 15:50:12 UTC 2009 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=135261 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
[kde-freebsd] PCBSD and Kdevelop
I am using PCBSD and cannot seem to get kdevelop to build a project. I tried following the tutorial for the basic hello world app, but the program crashes when the app wizard is started. From the terminal I can see hundreds of errors related to missing = or ] characters in /PCBSD/local/kde4/share//templates/... These are all related to the appwizard templates and I am thinking that it is related to the fact that this version of kdevelop is "using kde 3.x" while I have kde 4 installed. I cannot seem to get help on the pcbsd forums. Could you please look into this? Thanks, Wesley ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
