[Gpg4win-commits] r823 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-05-28 11:18:34 +0200 (Wed, 28 May 2008)
New Revision: 823

Modified:
   trunk/ChangeLog
   trunk/src/inst-kdelibs.nsi
   trunk/src/kleowrap.c
   trunk/src/uninst-kdelibs.nsi
Log:
Adjust for new kbuildsyscoca4 requirement.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-05-28 09:06:19 UTC (rev 822)
+++ trunk/ChangeLog	2008-05-28 09:18:34 UTC (rev 823)
@@ -1,5 +1,9 @@
 2008-05-28  Werner Koch  <wk at g10code.com>
 
+	* src/inst-kdelibs.nsi: Install kbuildsycoca4 into bin/.
+	* src/uninst-kdelibs.nsi: Uninstall it.
+	* src/kleowrap.c (run_kbuildsycoca): Execute kbuildsycoca4 via bin/.
+
 	* patches/gpa/01-no-uiserver.patch: Remove.
 
 	* patches/gpgol/01-last-minute.patch: Remove.

Modified: trunk/src/inst-kdelibs.nsi
===================================================================
--- trunk/src/inst-kdelibs.nsi	2008-05-28 09:06:19 UTC (rev 822)
+++ trunk/src/inst-kdelibs.nsi	2008-05-28 09:18:34 UTC (rev 823)
@@ -36,9 +36,9 @@
   # Relocate this when dbus-daemon is relocated.
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/kcmdwrapper.exe
+  File ${prefix}/bin/kbuildsycoca4.exe
   SetOutPath "$INSTDIR"
 
-  File ${prefix}/bin/kbuildsycoca4.exe
   File ${prefix}/bin/libgpgme++-glib.dll
   File ${prefix}/bin/libgpgme++-qt.dll
   File ${prefix}/bin/libgpgme++.dll

Modified: trunk/src/kleowrap.c
===================================================================
--- trunk/src/kleowrap.c	2008-05-28 09:06:19 UTC (rev 822)
+++ trunk/src/kleowrap.c	2008-05-28 09:18:34 UTC (rev 823)
@@ -236,9 +236,9 @@
     }
 
   argv[0] = NULL;
-  rc = spawn_process_and_wait ("kbuildsycoca4.exe", argv);
+  rc = spawn_process_and_wait ("bin\\kbuildsycoca4.exe", argv);
   if (rc)
-    fprintf (stderr, "Executing kbuildsycoca4.exe failed: %i\n", rc);
+    fprintf (stderr, "Executing bin\\kbuildsycoca4.exe failed: %i\n", rc);
 
   return rc;
 }

Modified: trunk/src/uninst-kdelibs.nsi
===================================================================
--- trunk/src/uninst-kdelibs.nsi	2008-05-28 09:06:19 UTC (rev 822)
+++ trunk/src/uninst-kdelibs.nsi	2008-05-28 09:18:34 UTC (rev 823)
@@ -33,6 +33,7 @@
 
   # FIXME: See inst-kleopatra.nsi
   Delete "$INSTDIR\bin\kcmdwrapper.exe"
+  Delete "$INSTDIR\bin\kbuildsycoca4.exe"
   RMDir "$INSTDIR\bin"
 
   Delete "$INSTDIR\kded_globalaccel.dll"
@@ -44,6 +45,7 @@
   Delete "$INSTDIR\libgpgme++.dll"
   Delete "$INSTDIR\libgpgme++-qt.dll"
   Delete "$INSTDIR\libgpgme++-glib.dll"
+  # Old (but correct) location, better delete it too.
   Delete "$INSTDIR\kbuildsycoca4.exe"
 
   Delete "$INSTDIR\share\locale\all_languages"