[PC-BSD Commits] r3269 - in pbibuild/modules/digikam: . overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Thu Jan 15 08:03:44 PST 2009
Author: kris
Date: 2009-01-15 08:03:43 -0800 (Thu, 15 Jan 2009)
New Revision: 3269
Added:
pbibuild/modules/digikam/overlay-dir/digikamrc
Modified:
pbibuild/modules/digikam/copy-files
pbibuild/modules/digikam/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/digikam/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/digikam/pbi.conf
Log:
Updated digikam, now 100% self-contained, works under KDE4 / PCBSD 7.x
Modified: pbibuild/modules/digikam/copy-files
===================================================================
--- pbibuild/modules/digikam/copy-files 2009-01-15 15:12:03 UTC (rev 3268)
+++ pbibuild/modules/digikam/copy-files 2009-01-15 16:03:43 UTC (rev 3269)
@@ -2,14 +2,18 @@
/usr/local/bin/digikamthemedesigner bin/
/usr/local/bin/digitaglinktree bin/
/usr/local/bin/showfoto bin/
-/usr/local/bin/kdcraw bin/
-/usr/local/lib/libkdcra* autolibs/
+/usr/local/bin/k* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/lib/libg* autolibs/
+/usr/local/lib/libk* autolibs/
/usr/local/lib/libdigi* lib/
-/usr/local/lib/kde3/digi* lib/kde3/
-/usr/local/lib/kde3/kio_digi* lib/kde3/
-/usr/local/share/apps/digikam share/apps/digikam
-/usr/local/share/apps/konqueror/servicemenus/digikam* share/apps/konqueror/servicemenus/
-/usr/local/share/apps/showfoto share/apps/showfoto
-/usr/local/share/services/digi* share/services/
-/usr/local/share/servicetypes/digi* share/servicetypes/
+/usr/local/lib/kde3 lib/
/usr/local/share/icons/hicolor share/icons/
+/usr/local/share/apps share/
+/usr/local/share/config share/
+/usr/local/share/config.kcfg share/
+/usr/local/share/servicetypes share/
+/usr/local/share/mimelnk share/
+/usr/local/share/services share/
+/usr/local/libexec/gam* libexec/
Modified: pbibuild/modules/digikam/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/digikam/overlay-dir/PBI.RemoveScript.sh 2009-01-15 15:12:03 UTC (rev 3268)
+++ pbibuild/modules/digikam/overlay-dir/PBI.RemoveScript.sh 2009-01-15 16:03:43 UTC (rev 3269)
@@ -6,49 +6,7 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm /usr/local/bin/digikam
-rm /usr/local/bin/kdcraw
-rm /usr/local/share/apps/digikam
-rm /usr/local/share/apps/showfoto
-rm /Programs/digiKam
-
-
-# remove our plugin links and such
-cd /Programs/${PROGDIR}/lib/kde3
-for i in `ls`
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-cd /Programs/${PROGDIR}/share/services
-for i in `ls`
-do
- rm /usr/local/share/services/${i}
-done
-
-cd /Programs/${PROGDIR}/share/apps/konqueror/servicemenus
-for i in `ls`
-do
- rm /usr/local/share/apps/konqueror/servicemenus/${i}
-done
-
-cd /Programs/${PROGDIR}/share/servicetypes
-for i in `ls`
-do
- rm /usr/local/share/servicetypes/${i}
-done
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="digikam.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
- rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
-
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/digikam/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/digikam/overlay-dir/PBI.SetupScript.sh 2009-01-15 15:12:03 UTC (rev 3268)
+++ pbibuild/modules/digikam/overlay-dir/PBI.SetupScript.sh 2009-01-15 16:03:43 UTC (rev 3269)
@@ -14,46 +14,29 @@
# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/.sbin/digikam /usr/local/bin/digikam
-ln -s /Programs/${PROGDIR}/bin/kdcraw /usr/local/bin/kdcraw
-ln -s /Programs/${PROGDIR}/share/apps/digikam /usr/local/share/apps/digikam
-ln -s /Programs/${PROGDIR}/share/apps/showfoto /usr/local/share/apps/showfoto
-ln -s /Programs/${PROGDIR} /Programs/digiKam
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+ ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+ ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
-# Copy over the specific kde plugins and services for digikam
-cd /Programs/${PROGDIR}/lib/kde3
+# Copy over our digikamrc file, which bypasses an error about not finding the digikam service
+cd /home
for i in `ls`
do
- ln -s /Programs/${PROGDIR}/lib/kde3/${i} /usr/local/lib/kde3/${i}
+ if [ -d "${i}/.kde" -o -d "${i}/.kde4" ]
+ then
+ if [ ! -e "${i}/.kde/share/config/digikamrc" ]
+ then
+ mkdir -p ${i}/.kde/share/config >/dev/null 2>/dev/null
+ cp /Programs/${PROGDIR}/digikamrc ${i}/.kde/share/config/
+ chown -R ${i}:${i} ${i}/.kde
+ fi
+ fi
done
-cd /Programs/${PROGDIR}/share/services
-for i in `ls`
-do
- ln -s /Programs/${PROGDIR}/share/services/${i} /usr/local/share/services/${i}
-done
-cd /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/
-for i in `ls`
-do
- ln -s /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/${i} /usr/local/share/apps/konqueror/servicemenus/${i}
-done
-
-cd /Programs/${PROGDIR}/share/servicetypes
-for i in `ls`
-do
- ln -s /Programs/${PROGDIR}/share/servicetypes/${i} /usr/local/share/servicetypes/${i}
-done
-
-# Copy over all the LANG files
-LANGFILE="digikam.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
- mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
- cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
-echo "LAUNCHCLOSE: /usr/local/bin/digikam"
+echo "LAUNCHCLOSE: /Programs/bin/digikam"
Modified: pbibuild/modules/digikam/pbi.conf
===================================================================
--- pbibuild/modules/digikam/pbi.conf 2009-01-15 15:12:03 UTC (rev 3268)
+++ pbibuild/modules/digikam/pbi.conf 2009-01-15 16:03:43 UTC (rev 3269)
@@ -28,11 +28,10 @@
OTHERPORT=""
# Enter your custom make options here
-MAKEOPTS="LDFLAGS=\"-Wl,--rpath=/Programs/digiKam/autolibs\"
-PREFIX=/Programs/digiKam"
+MAKEOPTS=""
# Build Key - Change this to anything else to trigger a rebuild
# - The rebuild will take place even if port is still the same ver
-BUILDKEY="11"
+BUILDKEY="01"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
More information about the Commits
mailing list