[digikam] [Bug 339180] New: compiler doesn't pick up libkgeomap plugin header files

[René J.V. Bertin]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #19 from RJVB <[hidden email]> ---
On Thursday September 18 2014 21:59:08 Gilles Caulier wrote:
> https://bugs.kde.org/show_bug.cgi?id=339180
>
> --- Comment #18 from Gilles Caulier <[hidden email]> ---
> How do you install a Macports pre-compiled binary package ?

That's automatic, on the condition that you installed MacPorts in /opt/local .

port install foo

will first check if a package built for your OS version and CPU architecture
exists on the servers. If it does, it pulls the package in and installs it. If
not, it will fetch the source and build from there. This is supposed to be
transparent to the user - except of course that building from source takes much
more time.

Package maintainers also have no effort to make to make binary packages: if a
package passes the selection criteria (= no licensing conflicts) the buildbots
will build it for all supported OS/CPU compinations.

R.

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[René J.V. Bertin]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #20 from RJVB <[hidden email]> ---
(In reply to Gilles Caulier from comment #12)

> https://projects.kde.org/projects/extragear/graphics/kipi-plugins/repository/
> revisions/master/entry/gpssync/CMakeLists.txt#L4

So you're saying that I should have found a `-I...extra/libkgeomap` among the
compiler arguments? Even if there is a /opt/local/include/libkgeomap directory?

> So the question is : where is the problem...

I think the problem must have to do with the presence of that "old" libkgeomap
header directory in /opt/local/include, and the way MacPorts creates a
protected environment.  I'll attach the portfile I worked with. If my guess is
right you too will have a /opt/local/include/libkgeomap directory if you
installed 4.0.0 through MacPorts. So you can try to see for yourself.

NB: MacPort's clang does seem a bit less capable to find header files than
Apple's version and gcc, but until now I noticed that only in Xcode projects
where Apple's compilers seem to find the headers just because they're added to
the project (and no explicit search path is added in the settings).
>
> Gilles Caulier

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #21 from Gilles Caulier <[hidden email]> ---
Git commit f20e21b1d45a0eef9fcddd3c9e852c28cc112337 by Gilles Caulier.
Committed on 02/11/2014 at 22:46.
Pushed by cgilles into branch 'master'.

since TrackManager have been introduced this summer, lib version ID have never
been dumped.
Fix API/ABI id accordingly

M  +5    -4    CMakeLists.txt

http://commits.kde.org/libkgeomap/f20e21b1d45a0eef9fcddd3c9e852c28cc112337

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc25499..862bb98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,9 +62,10 @@
ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKGEOMAP_AREA_CODE_GENERAL})
 # API      ABI
 # 0.1.0 => 0.1.0     (During digiKam GoSC2010)
 # 2.0.0 => 1.0.0     (Included into digiKam 2.0.0 Software Collection)
+# 3.0.0 => 2.0.0     (Including track manager, see bug #333622)

 # Library API version
-SET(KGEOMAP_LIB_MAJOR_VERSION "2")
+SET(KGEOMAP_LIB_MAJOR_VERSION "3")
 SET(KGEOMAP_LIB_MINOR_VERSION "0")
 SET(KGEOMAP_LIB_PATCH_VERSION "0")

@@ -79,15 +80,15 @@ SET(KGEOMAP_LIB_SUFFIX_VERSION "")

 # Library ABI version used by linker.
 # For details :
http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SET(KGEOMAP_LIB_SO_CUR_VERSION "1")
+SET(KGEOMAP_LIB_SO_CUR_VERSION "2")
 SET(KGEOMAP_LIB_SO_REV_VERSION "0")
 SET(KGEOMAP_LIB_SO_AGE_VERSION "0")

 # =======================================================
 # Set env. variables accordinly.

-SET(KGEOMAP_LIB_VERSION_STRING
"${KGEOMAP_LIB_MAJOR_VERSION}.${KGEOMAP_LIB_MINOR_VERSION}.${KGEOMAP_LIB_PATCH_VERSION}${KGEOMAP_LIB_SUFFIX_VERSION}")
-SET(KGEOMAP_LIB_VERSION_ID
"0x0${KGEOMAP_LIB_MAJOR_VERSION}0${KGEOMAP_LIB_MINOR_VERSION}0${KGEOMAP_LIB_PATCH_VERSION}")
+SET(KGEOMAP_LIB_VERSION_STRING  
"${KGEOMAP_LIB_MAJOR_VERSION}.${KGEOMAP_LIB_MINOR_VERSION}.${KGEOMAP_LIB_PATCH_VERSION}${KGEOMAP_LIB_SUFFIX_VERSION}")
+SET(KGEOMAP_LIB_VERSION_ID      
"0x0${KGEOMAP_LIB_MAJOR_VERSION}0${KGEOMAP_LIB_MINOR_VERSION}0${KGEOMAP_LIB_PATCH_VERSION}")
 SET(KGEOMAP_LIB_SO_VERSION_STRING
"${KGEOMAP_LIB_SO_CUR_VERSION}.${KGEOMAP_LIB_SO_REV_VERSION}.${KGEOMAP_LIB_SO_AGE_VERSION}")

 # =======================================================

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #22 from Gilles Caulier <[hidden email]> ---
Git commit 580ef984ee07807da6d58a68d2657ffb89f56537 by Gilles Caulier.
Committed on 02/11/2014 at 22:46.
Pushed by cgilles into branch 'master'.

fix compilation if older libkgeomap is used

M  +3    -0    gpssync/gpssyncdialog.cpp

http://commits.kde.org/kipi-plugins/580ef984ee07807da6d58a68d2657ffb89f56537

diff --git a/gpssync/gpssyncdialog.cpp b/gpssync/gpssyncdialog.cpp
index 33b4257..c8f5d94 100644
--- a/gpssync/gpssyncdialog.cpp
+++ b/gpssync/gpssyncdialog.cpp
@@ -86,6 +86,7 @@
 #include <libkgeomap/kgeomap_widget.h>
 #include <libkgeomap/itemmarkertiler.h>
 #include <libkgeomap/tracks.h>
+#include <libkgeomap/version.h>

 // Local includes

@@ -1222,7 +1223,9 @@ KGeoMapWidget* GPSSyncDialog::makeMapWidget(QWidget**
const pvbox)
     mapWidget->setDragDropHandler(d->mapDragDropHandler);
     mapWidget->addUngroupedModel(d->bookmarkOwner->bookmarkModelHelper());
     mapWidget->addUngroupedModel(d->searchWidget->getModelHelper());
+#if KGEOMAP_VERSION >= 0x030000
     mapWidget->setTrackManager(d->trackManager);
+#endif
     mapWidget->setSortOptionsMenu(d->sortMenu);

     vbox->addWidget(mapWidget);

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #23 from Gilles Caulier <[hidden email]> ---
Git commit 2e283f2a96e6a48cd70fd2f9dde7e9bf33e2a071 by Gilles Caulier.
Committed on 31/10/2014 at 11:32.
Pushed by cgilles into branch 'master'.

make libkgeomap as optional dependency to support Geolocation Maps
BUGS: 267789
FIXED-IN: 4.5.0

M  +52   -22   CMakeLists.txt
M  +3    -1    NEWS
M  +18   -6    app/CMakeLists.txt
M  +5    -0    app/main/digikamapp.cpp
M  +4    -0    app/main/digikamapp_p.h
M  +4    -1    app/utils/config-digikam.h.cmake.in
M  +31   -4    app/views/digikamview.cpp
M  +4    -0    app/views/leftsidebarwidgets.cpp
M  +8    -1    app/views/leftsidebarwidgets.h
M  +1    -1    app/views/mapwidgetview.h
M  +40   -21   app/views/stackedview.cpp
M  +15   -9    app/views/stackedview.h
M  +0    -1    app/views/tableview/tableview.cpp
M  +15   -11   app/views/tableview/tableview_treeview_delegate.cpp
M  +9    -3    libs/dialogs/libsinfodlg.cpp
M  +20   -4    libs/imageproperties/imagepropertiessidebar.cpp
M  +9    -2    libs/imageproperties/imagepropertiessidebar.h
M  +29   -9    libs/imageproperties/imagepropertiessidebarcamgui.cpp
M  +25   -5    libs/imageproperties/imagepropertiessidebardb.cpp
M  +4    -1    libs/kgeomaphelper/digikam2kgeomap_database.h
M  +4    -0    showfoto/CMakeLists.txt
M  +4    -0    utilities/importui/main/importui.cpp
M  +5    -0    utilities/importui/main/importui_p.h
M  +19   -3    utilities/importui/views/importstackedview.cpp
M  +8    -1    utilities/importui/views/importstackedview.h
M  +17   -0    utilities/importui/views/importview.cpp

http://commits.kde.org/digikam/2e283f2a96e6a48cd70fd2f9dde7e9bf33e2a071

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

Gilles Caulier <[hidden email]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|UNCONFIRMED                 |RESOLVED
      Latest Commit|                            |http://commits.kde.org/libk
                   |                            |geomap/c9443120550a552ebc09
                   |                            |e83bce26c272813777b5
   Version Fixed In|                            |4.5.0

--- Comment #24 from Gilles Caulier <[hidden email]> ---
Git commit c9443120550a552ebc09e83bce26c272813777b5 by Gilles Caulier.
Committed on 30/10/2014 at 22:09.
Pushed by cgilles into branch 'master'.

add top level variable rule

M  +21   -16   libkgeomap/CMakeLists.txt

http://commits.kde.org/libkgeomap/c9443120550a552ebc09e83bce26c272813777b5

diff --git a/libkgeomap/CMakeLists.txt b/libkgeomap/CMakeLists.txt
index 128ec71..e3e868d 100644
--- a/libkgeomap/CMakeLists.txt
+++ b/libkgeomap/CMakeLists.txt
@@ -93,19 +93,24 @@ SET_TARGET_PROPERTIES(kgeomap PROPERTIES VERSION
${KGEOMAP_LIB_SO_VERSION_STRING

 INSTALL(TARGETS kgeomap ${INSTALL_TARGETS_DEFAULT_ARGS})

-INSTALL(FILES libkgeomap_export.h
-              abstractmarkertiler.h
-              dragdrophandler.h
-              geocoordinates.h
-              itemmarkertiler.h
-              kgeomap_primitives.h
-              kgeomap_widget.h
-              lookup_altitude.h
-              lookup_factory.h
-              modelhelper.h
-              tileindex.h
-              tracks.h
-              track_reader.h
-              ${CMAKE_CURRENT_BINARY_DIR}/version.h
-        DESTINATION ${INCLUDE_INSTALL_DIR}/libkgeomap COMPONENT Devel
-       )
+# Check if compilation is done through digiKam SC or not. If yes, do not
install header files.
+IF(NOT DIGIKAMSC_USE_PRIVATE_SHAREDLIBS)
+
+    INSTALL(FILES libkgeomap_export.h
+                  abstractmarkertiler.h
+                  dragdrophandler.h
+                  geocoordinates.h
+                  itemmarkertiler.h
+                  kgeomap_primitives.h
+                  kgeomap_widget.h
+                  lookup_altitude.h
+                  lookup_factory.h
+                  modelhelper.h
+                  tileindex.h
+                  tracks.h
+                  track_reader.h
+                  ${CMAKE_CURRENT_BINARY_DIR}/version.h
+            DESTINATION ${INCLUDE_INSTALL_DIR}/libkgeomap COMPONENT Devel
+        )
+
+ENDIF()

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #25 from Gilles Caulier <[hidden email]> ---
Git commit 31620c8aab2885219b2cc5f8e0457a6cb513c2d0 by Gilles Caulier.
Committed on 03/11/2014 at 12:07.
Pushed by cgilles into branch 'master'.

set libkgeomap dependency to 3.0.0 release

M  +40   -21   CMakeLists.txt
M  +1    -1    README

http://commits.kde.org/digikam/31620c8aab2885219b2cc5f8e0457a6cb513c2d0

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #26 from Gilles Caulier <[hidden email]> ---
Git commit bb6ab11388e32bce82894b28b012844b2ff8689a by Gilles Caulier.
Committed on 03/11/2014 at 12:08.
Pushed by cgilles into branch 'master'.

set libkgeomap dependency to 3.0.0 release

M  +94   -75   CMakeLists.txt
M  +3    -3    README
M  +2    -4    gpssync/gpssyncdialog.cpp
M  +1    -1    gpssync/track_correlator.h

http://commits.kde.org/kipi-plugins/bb6ab11388e32bce82894b28b012844b2ff8689a

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #27 from Gilles Caulier <[hidden email]> ---
Git commit 5101c460dc646c8e13f55e9ba936363a735d15f3 by Gilles Caulier.
Committed on 03/11/2014 at 12:41.
Pushed by cgilles into branch 'master'.

fix order to check libkgeomap

M  +23   -19   CMakeLists.txt

http://commits.kde.org/kipi-plugins/5101c460dc646c8e13f55e9ba936363a735d15f3

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

https://bugs.kde.org/show_bug.cgi?id=339180

Gilles Caulier <[hidden email]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|libkgeomap                  |Geolocation

--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel