[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam-software-compilation] project/appimage: try to handle camera connection event from Solid
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-11-16 14:23:42
Message-ID: E1c717m-0007Cw-Mh () code ! kde ! org
[Download RAW message or body]

Git commit eba7dcfa15fe1f55899f6610462695d27e932080 by Gilles Caulier.
Committed on 16/11/2016 at 14:23.
Pushed by cgilles into branch 'master'.

try to handle camera connection event from Solid

M  +6    -2    project/appimage/04-build-appimage.sh
M  +1    -1    project/appimage/data/AppRun

http://commits.kde.org/scratch/mwiesweg/digikam-sc/eba7dcfa15fe1f55899f6610462695d27e932080


diff --git a/project/appimage/04-build-appimage.sh \
b/project/appimage/04-build-appimage.sh index 36b3359..fbb2c82 100755
--- a/project/appimage/04-build-appimage.sh
+++ b/project/appimage/04-build-appimage.sh
@@ -174,8 +174,12 @@ cp $(ldconfig -p | grep /usr/$LIB_PATH_ALT/libEGL.so.1      | \
cut -d ">" -f 2 |  # For Fedora 20
 cp $(ldconfig -p | grep /usr/$LIB_PATH_ALT/libfreetype.so.6 | cut -d ">" -f 2 | \
xargs) ./usr/lib/  
-cp /usr/bin/digikam     ./usr/bin
-cp /usr/bin/showfoto    ./usr/bin
+cp /usr/bin/digikam                 ./usr/bin
+cp /usr/bin/showfoto                ./usr/bin
+
+# For Solid action when camera is connected to computer
+cp /usr/$LIB_PATH_ALT/qt5/bin/qdbus ./usr/share/digikam/utils
+sed -i "/Exec=/c\Exec=digikam-camera downloadFromUdi %i" \
./usr/share/solid/action/digikam-opencamera.desktop  
 #################################################################################################
  
diff --git a/project/appimage/data/AppRun b/project/appimage/data/AppRun
index d1b7500..46da95b 100755
--- a/project/appimage/data/AppRun
+++ b/project/appimage/data/AppRun
@@ -20,7 +20,7 @@ export APPIMAGE_ORIGINAL_PATH=$PATH
 export LD_LIBRARY_PATH=$DIR/usr/lib/:$LD_LIBRARY_PATH
 export QT_PLUGIN_PATH=\$DIR/usr/lib/qt5/plugins/
 export XDG_DATA_DIRS=$DIR/usr/share/:$XDG_DATA_DIRS
-export PATH=$DIR/usr/bin:$DIR/usr/lib:$DIR/usr/lib/libexec/kf5:$PATH
+export PATH=$DIR/usr/bin:$DIR/usr/lib:$DIR/usr/lib/libexec/kf5:$DIR/usr/share/digikam/utils:$PATH
  export KDE_FORK_SLAVES=1
 export CAMLIBS=$DIR/usr/lib/libgphoto2
 export IOLIBS=$DIR/usr/lib/libgphoto2_port


[prev in list] [next in list] [prev in thread] [next in thread]