2007-09-25 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 25 Sep 2007 14:43:16 +0000 (14:43 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 25 Sep 2007 14:43:16 +0000 (14:43 +0000)
* src/gpg4win.nsi: Disable kdelibs, kdesupport, oxygen-icons in
light installer.
* configure.ac: Add check for kdelibs.
* include/config.nsi.in: Add macros for kdelibs.
* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi: New files.
* src/Makefile.am (gpg4win_bpkgs): Add kdelibs.
(EXTRA_DIST): Add inst-kdelibs.nsi and uninst-kdelibs.nsi.
* src/inst-sections.nsi: Add support for kdelibs.
* packages/packages.current: Add kdelibs.

ChangeLog
configure.ac
include/config.nsi.in
packages/packages.current
src/Makefile.am
src/gpg4win.nsi
src/inst-kdelibs.nsi [new file with mode: 0644]
src/inst-sections.nsi
src/uninst-kdelibs.nsi [new file with mode: 0644]

index 3370c56..c09bde4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2007-09-25  Marcus Brinkmann  <marcus@g10code.de>
 
+       * src/gpg4win.nsi: Disable kdelibs, kdesupport, oxygen-icons in
+       light installer.
+       * configure.ac: Add check for kdelibs.
+       * include/config.nsi.in: Add macros for kdelibs.
+       * src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi: New files.
+       * src/Makefile.am (gpg4win_bpkgs): Add kdelibs.
+       (EXTRA_DIST): Add inst-kdelibs.nsi and uninst-kdelibs.nsi.
+       * src/inst-sections.nsi: Add support for kdelibs.
+       * packages/packages.current: Add kdelibs.
+
        * configure.ac: Add check for oxygen-icons.
        * include/config.nsi.in: Add macros for oxygen-icons.
        * m4/gpg4win.m4: Fix translit expression (dash must come first or last).
index 2d8c5ae..fac8ce8 100644 (file)
@@ -217,6 +217,7 @@ GPG4WIN_IPKG([man_novice_en])
 GPG4WIN_BPKG_GNUWIN32([kdesupport])
 GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
 GPG4WIN_BPKG_BINSRC([oxygen-icons])
+GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
 
 GPG4WIN_FINALIZE
 
index 0faef51..e961098 100644 (file)
 !define gpg4win_pkg_oxygen_icons_version @gpg4win_pkg_oxygen_icons_version@
 !define gpg4win_pkg_oxygen_icons_src @gpg4win_pkg_oxygen_icons_src@
 
+@HAVE_PKG_KDELIBS@
+!define gpg4win_pkg_kdelibs @gpg4win_pkg_kdelibs@
+!define gpg4win_pkg_kdelibs_version @gpg4win_pkg_kdelibs_version@
+!define gpg4win_pkg_kdelibs_dev @gpg4win_pkg_kdelibs_dev@
+!define gpg4win_pkg_kdelibs_src @gpg4win_pkg_kdelibs_src@
+
 # Internal packages.
 @HAVE_PKG_MAN_NOVICE_DE@
 
index 88fea08..0f7d419 100644 (file)
@@ -322,3 +322,21 @@ name oxygen-icons-20070918-bin.zip
 file oxygen-icons-20070918.zip
 link oxygen-icons-20070918-src.zip
 chk cefb58affdf099069d3b4e14029b4d26abb03ae1
+
+# kdelibs
+
+server ftp://ftp.kdab.net/pub/gpg4win
+
+name kdelibs-20070918-bin.zip
+file kdelibs-for-kleo-20070918-bin.zip
+chk 188d64379b68a839562b230bc80ba0f4b39555f1
+
+name kdelibs-20070918-lib.zip
+file kdelibs-for-kleo-20070918-dev.zip
+chk f5080386d81155ab6111d6658817a5ecf4d11f08
+
+name kdelibs-20070918-src.zip
+# FIXME: This is very wrong.  It's not a zip file and does not contain
+# all the sources.
+file kdelibs-svn713936.tar.bz2
+chk 7c2b10819ed4eb1c17e7b5076b9e494ad8bdddbb
index e84521c..e909d86 100644 (file)
@@ -62,6 +62,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         inst-qt.nsi               uninst-qt.nsi              \
         inst-kdesupport.nsi       uninst-kdesupport.nsi      \
         inst-oxygen-icons.nsi             uninst-oxygen-icons.nsi    \
+        inst-kdelibs.nsi          uninst-kdelibs.nsi         \
        inst-bzip2.nsi             uninst-bzip2.nsi
 
 # Need to clean the dll because we bypassed automake.
@@ -217,7 +218,7 @@ gpg4win_pkg_bzip2_make_args_inst = \
 
 # Supported binary packages.
 gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
-               atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons
+               atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs
 
 # libiconv needs some special magic to generate a usable import
 # library.
@@ -310,9 +311,10 @@ endef
 
 
 # kdesupport ships gettext, which we already have.  Remove a stow
-# conflict.
+# conflict about that.  Also remove a stow conflict with kdelibs-lib.
 define gpg4win_pkg_kdesupport_post_install
-(rm -fR "$$$${pkgidir_dev}/share/locale")
+(rm -fR "$$$${pkgidir_dev}/share/locale"; \
+ rm -fR "$$$${pkgidir_dev}/share/apps/cmake/modules")
 endef
 
 
index fcc31a5..7927854 100644 (file)
 !undef HAVE_PKG_MAN_NOVICE_DE
 !undef HAVE_PKG_MAN_NOVICE_EN
 !undef HAVE_PKG_MAN_ADVANCED_DE
+!ifdef HAVE_PKG_KDELIBS
+!undef HAVE_PKG_KDELIBS
+!endif
+!ifdef HAVE_PKG_KDESUPPORT
+!undef HAVE_PKG_KDESUPPORT
+!endif
+!ifdef HAVE_PKG_OXYGEN_ICONS
+!undef HAVE_PKG_OXYGEN_ICONS
+!endif
 !ifdef HAVE_PKG_QT
 !undef HAVE_PKG_QT
 !endif
diff --git a/src/inst-kdelibs.nsi b/src/inst-kdelibs.nsi
new file mode 100644 (file)
index 0000000..95a3002
--- /dev/null
@@ -0,0 +1,111 @@
+# inst-kdelibs.nsi - Installer snippet for kdelibs.      -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kdelibs-${gpg4win_pkg_kdelibs_version}
+
+!ifdef DEBUG
+Section "kdelibs" SEC_kdelibs
+!else
+Section "-kdelibs" SEC_kdelibs
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_kdelibs_src}"
+!else
+
+  File ${prefix}/bin/kcmdwrapper.exe
+  File ${prefix}/bin/libkdecore.dll
+  File ${prefix}/bin/libkdeui.dll
+  File ${prefix}/bin/libkdefx.dll
+
+  SetOutPath "$INSTDIR\lib\kde4"
+
+  File ${prefix}/lib/kde4/kded_globalaccel.dll
+
+  SetOutPath "$INSTDIR\share\apps\kcharselect"
+
+  File ${prefix}/share/apps/kcharselect/kcharselect-data
+
+  SetOutPath "$INSTDIR\share\apps\kdeui\pics"
+
+  File ${prefix}/share/apps/kdeui/pics/ktip-background.png
+  File ${prefix}/share/apps/kdeui/pics/aboutkde.png
+  File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
+
+  SetOutPath "$INSTDIR\share\apps\kdeui\about"
+
+  File ${prefix}/share/apps/kdeui/about/box-middle-left.png
+  File ${prefix}/share/apps/kdeui/about/bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/bar-middle-left.png
+  File ${prefix}/share/apps/kdeui/about/bar-bottom-left.png
+  File ${prefix}/share/apps/kdeui/about/box-top-right.png
+  File ${prefix}/share/apps/kdeui/about/bar-bottom-middle.png
+  File ${prefix}/share/apps/kdeui/about/bar-bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/bar-top-middle.png
+  File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/box-bottom-middle.png
+  File ${prefix}/share/apps/kdeui/about/bar-middle-right.png
+  File ${prefix}/share/apps/kdeui/about/box-middle-right.png
+  File ${prefix}/share/apps/kdeui/about/kde_infopage.css
+  File ${prefix}/share/apps/kdeui/about/bottom-middle.png
+  File ${prefix}/share/apps/kdeui/about/bar-top-left.png
+  File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
+  File ${prefix}/share/apps/kdeui/about/top-middle.png
+  File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
+  File ${prefix}/share/apps/kdeui/about/bar-top-right.png
+  File ${prefix}/share/apps/kdeui/about/box-top-left.png
+  File ${prefix}/share/apps/kdeui/about/top-left.png
+  File ${prefix}/share/apps/kdeui/about/box-top-middle.png
+  File ${prefix}/share/apps/kdeui/about/bottom-left.png
+
+  SetOutPath "$INSTDIR\share\config"
+
+  File ${prefix}/share/config/kdebug.areas
+  File ${prefix}/share/config/kdebugrc
+
+  SetOutPath "$INSTDIR\share\config\colors"
+
+  File ${prefix}/share/config/colors/Web.colors
+  File ${prefix}/share/config/colors/Royal.colors
+  File ${prefix}/share/config/colors/Rainbow.colors
+  File ${prefix}/share/config/colors/40.colors
+
+  SetOutPath "$INSTDIR\share\config\ui"
+
+  File ${prefix}/share/config/ui/ui_standards.rc
+
+  SetOutPath "$INSTDIR\share\kde4\services\kded"
+
+  File ${prefix}/share/kde4/services/kded/kdedglobalaccel.desktop
+
+  SetOutPath "$INSTDIR\share\kde4\servicetypes"
+
+  File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
+  File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
+
+  SetOutPath "$INSTDIR\share\locale"
+
+  File ${prefix}/share/locale/all_languages
+
+!endif
+SectionEnd
index 72bb36f..7c2e3da 100644 (file)
 !ifdef HAVE_PKG_OXYGEN_ICONS
 !include "inst-oxygen-icons.nsi"
 !endif
+!ifdef HAVE_PKG_KDELIBS
+!include "inst-kdelibs.nsi"
+!endif
 !ifdef HAVE_PKG_MAN_NOVICE_EN
 !include "inst-man_novice_en.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_EN
 !include "uninst-man_novice_en.nsi"
 !endif
+!ifdef HAVE_PKG_KDELIBS
+!include "uninst-kdelibs.nsi"
+!endif
 !ifdef HAVE_PKG_OXYGEN_ICONS
 !include "uninst-oxygen-icons.nsi"
 !endif
@@ -496,6 +502,9 @@ Function CalcDepends
 !ifdef HAVE_PKG_OXYGEN_ICONS
   !insertmacro UnselectSection ${SEC_oxygen_icons}
 !endif
+!ifdef HAVE_PKG_KDELIBS
+  !insertmacro UnselectSection ${SEC_kdelibs}
+!endif
 
   # Then enable all dependencies in reverse build list order!
 
@@ -693,6 +702,15 @@ Function CalcDepends
 
   # Package "libiconv" has no dependencies.
 
+!ifdef HAVE_PKG_KDELIBS
+  !insertmacro SectionFlagIsSet ${SEC_kdelibs} \
+               ${SF_SELECTED} have_kdelibs skip_kdelibs
+  have_kdelibs:
+  !insertmacro SelectSection ${SEC_qt}
+  !insertmacro SelectSection ${SEC_oxygen_icons}
+   skip_kdelibs:
+!endif
+
 !ifdef HAVE_PKG_QT
   !insertmacro SectionFlagIsSet ${SEC_qt} \
                ${SF_SELECTED} have_qt skip_qt
diff --git a/src/uninst-kdelibs.nsi b/src/uninst-kdelibs.nsi
new file mode 100644 (file)
index 0000000..a6e7b22
--- /dev/null
@@ -0,0 +1,113 @@
+# uninst-kdelibs.nsi - Installer snippet for kdelibs.    -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kdelibs-${gpg4win_pkg_kdelibs_version}
+
+
+; Uninstaller section.
+Section "-un.kdelibs"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_kdelibs_src}"
+  Call un.SourceDelete
+!else
+
+  Delete "$INSTDIR\kcmdwrapper.exe"
+  Delete "$INSTDIR\libkdecore.dll"
+  Delete "$INSTDIR\libkdeui.dll"
+  Delete "$INSTDIR\libkdefx.dll"
+
+  Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
+
+  RMDir "$INSTDIR\lib\kde4"
+  RMDir "$INSTDIR\lib"
+
+  Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
+
+  RMDir "$INSTDIR\share\apps\kcharselect"
+
+  Delete "$INSTDIR\share\apps\kdeui\pics\ktip-background.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\ktip-bulb.png"
+
+  RMDir "$INSTDIR\share\apps\kdeui\pics"
+  RMDir "$INSTDIR\share\apps\kdeui"
+
+  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
+  Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
+  Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
+
+  RMDir "$INSTDIR\share\apps\kdeui\about"
+  RMDir "$INSTDIR\share\apps\kdeui"
+  RMDir "$INSTDIR\share\apps"
+
+  Delete "$INSTDIR\share\config\kdebug.areas"
+  Delete "$INSTDIR\share\config\kdebugrc"
+
+  Delete "$INSTDIR\share\config\colors\Web.colors"
+  Delete "$INSTDIR\share\config\colors\Royal.colors"
+  Delete "$INSTDIR\share\config\colors\Rainbow.colors"
+  Delete "$INSTDIR\share\config\colors\40.colors"
+
+  RMDir "$INSTDIR\share\config\colors"
+
+  Delete "$INSTDIR\share\config\ui\ui_standards.rc"
+
+  RMDir "$INSTDIR\share\ui"
+
+  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
+
+  RMDir "$INSTDIR\share\kde4\services\kded"
+
+  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
+  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
+
+  RMDir "$INSTDIR\share\kde4\servicetypes"
+
+  Delete "$INSTDIR\share\locale\all_languages"
+
+  RMDir "$INSTDIR\share\locale"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd