claws: Cleanup removed packages NSI code.
authorWerner Koch <wk@gnupg.org>
Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 10 May 2013 16:53:20 +0000 (18:53 +0200)
* src/inst-sections.nsi: Enable libxml2 if rssyl is selected.  Remove
dependency checks for removed plugin packages.
* include/config.nsi.in: Remove code for remove plugin packages.
claws: Cleanup removed packages NSI code.

configure.ac
src/inst-sections.nsi

index e9cd5a5..f9937a5 100644 (file)
@@ -366,10 +366,9 @@ GPG4WIN_SPKG([libxml2], [zlib])
 GPG4WIN_SPKG([regex])
 GPG4WIN_SPKG([crypt])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
-                            gpgme pthreads-w32 crypt regex libetpan gnutls])
+                            gpgme pthreads-w32 crypt regex libetpan gnutls dnl
+                            libxml2])
 GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
-GPG4WIN_SPKG([vcalendar], [curl claws-mail])
-GPG4WIN_SPKG([rssyl], [curl claws-mail])
 GPG4WIN_IPKG([compendium])
 
 # Qt related stuff.
index 08265ad..9ef0eb0 100644 (file)
@@ -637,27 +637,9 @@ Function CalcDepends
 !ifdef HAVE_PKG_LIBXML2
   !insertmacro UnselectSection ${SEC_libxml2}
 !endif
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
-  !insertmacro UnselectSection ${SEC_notification_plugin}
-!endif
 !ifdef HAVE_PKG_GTKHTML2_VIEWER
   !insertmacro UnselectSection ${SEC_gtkhtml2_viewer}
 !endif
-!ifdef HAVE_PKG_VCALENDAR
-  !insertmacro UnselectSection ${SEC_vcalendar}
-!endif
-!ifdef HAVE_PKG_RSSYL
-  !insertmacro UnselectSection ${SEC_rssyl}
-!endif
-!ifdef HAVE_PKG_TNEF_PARSE
-  !insertmacro UnselectSection ${SEC_tnef_parse}
-!endif
-!ifdef HAVE_PKG_ATTACHWARNER
-  !insertmacro UnselectSection ${SEC_attachwarner}
-!endif
-!ifdef HAVE_PKG_BSFILTER_PLUGIN
-  !insertmacro UnselectSection ${SEC_bsfilter_plugin}
-!endif
 !ifdef HAVE_PKG_DBUS
   !insertmacro UnselectSection ${SEC_dbus}
 !endif
@@ -790,14 +772,7 @@ Function CalcDepends
   !insertmacro SelectSection ${SEC_gnutls}
   # These are not build dependencies, but we always want to install
   # all plugins.
-  !insertmacro SelectSection ${SEC_bsfilter}
-  !insertmacro SelectSection ${SEC_notification_plugin}
   !insertmacro SelectSection ${SEC_gtkhtml2_viewer}
-  !insertmacro SelectSection ${SEC_vcalendar}
-  !insertmacro SelectSection ${SEC_rssyl}
-  !insertmacro SelectSection ${SEC_tnef_parse}
-  !insertmacro SelectSection ${SEC_attachwarner}
-  !insertmacro SelectSection ${SEC_bsfilter_plugin}
   skip_claws_mail:
 !endif
 
@@ -823,20 +798,6 @@ Function CalcDepends
   # Package "dbus" has no dependencies.
   # Package "oxygen-icons" has no dependencies.
 
-!ifdef HAVE_PKG_RSSYL
-  !insertmacro SectionFlagIsSet ${SEC_rssyl} ${SF_SELECTED} have_rssyl skip_rssyl
-  have_rssyl:
-  !insertmacro SelectSection ${SEC_curl}
-  skip_rssyl:
-!endif
-
-!ifdef HAVE_PKG_VCALENDAR
-  !insertmacro SectionFlagIsSet ${SEC_vcalendar} ${SF_SELECTED} have_vcalendar skip_vcalendar
-  have_vcalendar:
-  !insertmacro SelectSection ${SEC_curl}
-  skip_vcalendar:
-!endif
-
 !ifdef HAVE_PKG_GTKHTML2_VIEWER
   !insertmacro SectionFlagIsSet ${SEC_gtkhtml2_viewer} ${SF_SELECTED} have_gtkhtml2_viewer skip_gtkhtml2_viewer
   have_gtkhtml2_viewer:
@@ -845,13 +806,6 @@ Function CalcDepends
   skip_gtkhtml2_viewer:
 !endif
 
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
-  !insertmacro SectionFlagIsSet ${SEC_notification_plugin} ${SF_SELECTED} have_notification_plugin skip_notification_plugin
-  have_notification_plugin:
-  !insertmacro SelectSection ${SEC_curl}
-  skip_notification_plugin:
-!endif
-
 !ifdef HAVE_PKG_LIBXML2
   !insertmacro SectionFlagIsSet ${SEC_libxml2} ${SF_SELECTED} have_libxml2 skip_libxml2
   have_libxml2: