[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-52-g7df70cf
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Jan 28 19:02:05 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, kleo-kf5 has been updated
via 7df70cf214a6ece070186b813f1f74b257037415 (commit)
from 8021720eb50f2538e4e33a3e83224756e19acff0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7df70cf214a6ece070186b813f1f74b257037415
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 28 19:00:10 2016 +0100
Remove DBus
* src/inst-dbus.nsi, src/uninst-dbus.nsi: Removed.
* configure.ac, src/config.nsi.in, src/Makefile.am,
packages/packages.current, src/inst-sections.nsi: Update accordingly.
--
I am nearly certain now that we can provide Kleopatra for Windows
without dbus.
diff --git a/configure.ac b/configure.ac
index 6c59636..515345f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,9 +339,8 @@ GPG4WIN_IPKG([compendium])
GPG4WIN_BPKG_BINSRC([gnupg-w32])
# Qt related stuff.
-GPG4WIN_BPKG_GNUWIN32([dbus])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
-GPG4WIN_SPKG([qtbase], [dbus libpng])
+GPG4WIN_SPKG([qtbase], [libpng])
GPG4WIN_SPKG([qttools], [qtbase])
GPG4WIN_SPKG([qtwinextras], [qtbase])
GPG4WIN_SPKG([qtsvg], [qtbase])
diff --git a/packages/packages.current b/packages/packages.current
index 7566488..21ef378 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -516,22 +516,6 @@ chk 0a9bbe73a2a2f24ee2addfb47f642646d2eae996
file libkleo/libkleo-201601221448.tar.xz
chk 668b115e7e025b5408f53ced73056f5c4f660993
-#
-# Qt links DBus and Kleopatra / KDE libs needs it
-#
-
-server http://files.kolab.org/local/gpg4win/libs/
-
-file dbus-x86-mingw4-1.4.24-20130417-1-bin.tar.bz2
-chk 59abdc742ce87011dadbc58e96ed870a927d0045
-
-file dbus-x86-mingw4-1.4.24-20130417-lib.tar.bz2
-chk fc557d7eb161881e1d6c091f215dd8e0615682cb
-
-file dbus-x86-mingw4-1.4.24-20130417-src.tar.bz2
-chk f03ffd02333f786a5e540c4430d3109952b5553e
-
-
# oxygen-icons
server http://files.kolab.org/local/gpg4win
diff --git a/src/Makefile.am b/src/Makefile.am
index ea7ac4f..99e490a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-w32pth.nsi uninst-w32pth.nsi \
inst-zlib.nsi uninst-zlib.nsi \
inst-kconfig.nsi uninst-kconfig.nsi \
- inst-dbus.nsi uninst-dbus.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
inst-bzip2.nsi uninst-bzip2.nsi \
@@ -354,7 +353,7 @@ gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
# Supported binary packages.
gpg4win_bpkgs = pkgconfig pango expat freetype fontconfig \
- cairo atk dbus oxygen-icons kleopatra bsfilter gnupg-w32
+ cairo atk oxygen-icons kleopatra bsfilter gnupg-w32
# libiconv needs some special magic to generate a usable import
# library.
diff --git a/src/config.nsi.in b/src/config.nsi.in
index e3ccb7c..d80c1d9 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -172,12 +172,6 @@
!define gpg4win_pkg_gettext_version @gpg4win_pkg_gettext_version@
!define gpg4win_pkg_gettext_src @gpg4win_pkg_gettext_src@
- at HAVE_PKG_DBUS@
-!define gpg4win_pkg_dbus @gpg4win_pkg_dbus@
-!define gpg4win_pkg_dbus_version @gpg4win_pkg_dbus_version@
-!define gpg4win_pkg_dbus_dev @gpg4win_pkg_dbus_dev@
-!define gpg4win_pkg_dbus_src @gpg4win_pkg_dbus_src@
-
@HAVE_PKG_QTBASE@
!define gpg4win_pkg_qtbase @gpg4win_pkg_qtbase@
!define gpg4win_pkg_qtbase_version @gpg4win_pkg_qtbase_version@
diff --git a/src/inst-dbus.nsi b/src/inst-dbus.nsi
deleted file mode 100644
index e213096..0000000
--- a/src/inst-dbus.nsi
+++ /dev/null
@@ -1,70 +0,0 @@
-# inst-dbus.nsi - Snippet for dbus. -*- 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}/dbus-${gpg4win_pkg_dbus_version}
-
-!ifdef DEBUG
-Section "dbus" SEC_dbus
-!else
-Section "-dbus" SEC_dbus
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_dbus_src}"
-!else
- SetOutPath "$INSTDIR\bin"
- ClearErrors
- SetOverwrite try
- File ${prefix}/bin/dbus-daemon.exe
- SetOverwrite lastused
- IfErrors 0 +3
- File /oname=dbus-daemon.exe.tmp ${prefix}/bin/dbus-daemon.exe
- Rename /REBOOTOK dbus-daemon.exe.tmp dbus-daemon.exe
-
- File ${prefix}/bin/dbus-launch.exe
- File ${prefix}/bin/dbus-env.bat
- File ${prefix}/bin/dbus-monitor.exe
- File ${prefix}/bin/dbus-send.exe
-
- ClearErrors
- SetOverwrite try
- File ${prefix}/bin/libdbus-1.dll
- SetOverwrite lastused
- IfErrors 0 +3
- File /oname=libdbus-1.dll.tmp ${prefix}/bin/libdbus-1.dll
- Rename /REBOOTOK libdbus-1.dll.tmp libdbus-1.dll
-
- ClearErrors
- SetOverwrite try
- File ${prefix}/bin/libexpat.dll
- SetOverwrite lastused
- IfErrors 0 +3
- File /oname=libexpat.dll.tmp ${prefix}/bin/libexpat.dll
- Rename /REBOOTOK libexpat.dll.tmp libexpat.dll
-
- SetOutPath "$INSTDIR\etc"
- File ${prefix}/etc/dbus-1/session.conf
- File ${prefix}/etc/dbus-1/system.conf
-
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 8209380..c7bd1e2 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -29,9 +29,6 @@
!ifdef HAVE_PKG_BZIP2
!include "inst-bzip2.nsi"
!endif
-!ifdef HAVE_PKG_DBUS
-!include "inst-dbus.nsi"
-!endif
!ifdef HAVE_PKG_LIBICONV
!include "inst-libiconv.nsi"
!endif
@@ -317,9 +314,6 @@
!ifdef HAVE_PKG_LIBICONV
!include "uninst-libiconv.nsi"
!endif
-!ifdef HAVE_PKG_DBUS
-!include "uninst-dbus.nsi"
-!endif
!ifdef HAVE_PKG_QTTOOLS
!include "uninst-qttools.nsi"
!endif
@@ -601,9 +595,6 @@ Function CalcDepends
!ifdef HAVE_PKG_CURL
!insertmacro UnselectSection ${SEC_curl}
!endif
-!ifdef HAVE_PKG_DBUS
- !insertmacro UnselectSection ${SEC_dbus}
-!endif
!ifdef HAVE_PKG_QTBASE
!insertmacro UnselectSection ${SEC_qtbase}
!endif
@@ -781,11 +772,10 @@ Function CalcDepends
!insertmacro SectionFlagIsSet ${SEC_qtbase} \
${SF_SELECTED} have_qt skip_qt
have_qt:
- !insertmacro SelectSection ${SEC_dbus}
+ !insertmacro SelectSection ${SEC_libpng}
skip_qt:
!endif
- # Package "dbus" has no dependencies.
# Package "oxygen-icons" has no dependencies.
!ifdef HAVE_PKG_GPGME
diff --git a/src/uninst-dbus.nsi b/src/uninst-dbus.nsi
deleted file mode 100644
index 6688a9f..0000000
--- a/src/uninst-dbus.nsi
+++ /dev/null
@@ -1,52 +0,0 @@
-# uninst-dbus.nsi - Snippet for dbus. -*- 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}/dbus-${gpg4win_pkg_dbus_version}
-
-
-; Uninstaller section.
-Section "-un.dbus"
-!ifdef SOURCES
- Push "${gpg4win_pkg_dbus_src}"
- Call un.SourceDelete
-!else
- Delete /REBOOTOK "$INSTDIR\bin\dbus-daemon.exe"
-
- Delete "$INSTDIR\bin\dbus-env.bat"
- Delete "$INSTDIR\bin\dbus-launch.exe"
- Delete "$INSTDIR\bin\dbus-monitor.exe"
- Delete "$INSTDIR\bin\dbus-send.exe"
-
- # FIXME: Force dbus installed in our prefix down.
- Delete /REBOOTOK "$INSTDIR\bin\libdbus-1.dll"
- Delete /REBOOTOK "$INSTDIR\bin\libexpat.dll"
-
- Delete "$INSTDIR\etc\session.conf"
- Delete "$INSTDIR\etc\system.conf"
- RMDir "$INSTDIR\etc"
-
- RMDir "$INSTDIR\bin"
-
- RMDir "$INSTDIR"
-!endif
-SectionEnd
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 3 +-
packages/packages.current | 16 -----------
src/Makefile.am | 3 +-
src/config.nsi.in | 6 ----
src/inst-dbus.nsi | 70 -----------------------------------------------
src/inst-sections.nsi | 12 +-------
src/uninst-dbus.nsi | 52 -----------------------------------
7 files changed, 3 insertions(+), 159 deletions(-)
delete mode 100644 src/inst-dbus.nsi
delete mode 100644 src/uninst-dbus.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list