[Gpg4win-commits] [git] Gpg4win - branch, KDE/4.10-update, updated. gpg4win-2.1.0-126-g8919745
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Apr 18 19:29:49 CEST 2013
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, KDE/4.10-update has been updated
via 8919745d20eb2a23f0940d75f7493a165d89e2d8 (commit)
via 254b79f40aa138eb99cf5532e08c2608ab607199 (commit)
via 66c152c6a6e7cd2985aaea8504b40833d5bc8424 (commit)
via 2ec28d5e7c43fd4b70fe4c50e91cb978607aa22f (commit)
via dcbdc5c4c9deabe432b2eec9b6824c396232c7a2 (commit)
via c0ec582d31a1d531f288f3d7e6e47df1954a1888 (commit)
via 4dfba9a6edcb18e4f593148c8cf1fef4387b8205 (commit)
from 2f0dc549e8c2b154cb9c7d3eeb71d676fa3b333b (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 8919745d20eb2a23f0940d75f7493a165d89e2d8
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 16:50:01 2013 +0000
Add patch for newer mingw-w64 versions
It is now necessary to include winsock2.h explicitly instead
of relying on the catch all windows.h include for some Winsock
structures. Also types.h only defines sigset_t if _POSIX is
defined.
* Makefile.am: Add patch to EXTRA_DIST
diff --git a/Makefile.am b/Makefile.am
index 6a407b8..1589086 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/libetpan-0.57/01-gnutls_compat.patch \
patches/scute-1.2.0/01-bugfixes.patch \
patches/scute-1.3.0/01-wsastartup.patch \
- patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch
+ patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch \
+ patches/w32pth-2.0.2/01_compatibility_with_newer_mingw.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/patches/w32pth-2.0.2/01_compatibility_with_newer_mingw.patch b/patches/w32pth-2.0.2/01_compatibility_with_newer_mingw.patch
new file mode 100755
index 0000000..6a2a3a4
--- /dev/null
+++ b/patches/w32pth-2.0.2/01_compatibility_with_newer_mingw.patch
@@ -0,0 +1,23 @@
+#! /bin/sh
+# Ignore whitespace is necessary because the original context of the patch
+# contains whitespace errors
+patch -p0 -f --ignore-whitespace $* < $0
+exit $?
+
+2013-04-18 Andre Heinecke <aheinecke at intevation.de>
+
+ * pth.h: Include winsock2.h for WSA symbols not defined in windows.h,
+ define _POSIX before including sys/types.h
+
+--- pth.h.orig 2013-04-18 16:14:01.020666575 +0000
++++ pth.h 2013-04-18 16:14:04.108643719 +0000
+@@ -38,6 +38,9 @@
+ heavyweight - may be we should factor such
+ code out to a second header and adjust all
+ user files to include it only if required. */
++#include <winsock2.h>
++
++#define _POSIX /* We want posix type names */
+ #include <sys/types.h> /* For sigset_t. */
+
+ #ifndef W32_PTH_HANDLE_INTERNAL
commit 254b79f40aa138eb99cf5532e08c2608ab607199
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 16:46:05 2013 +0000
Add patch for newer mingw-w64 versions
The mingw-w64 header included in debian sid define timespec
in time.h for windows. As pthread has not a configurable
build system we check for a definition made by the header
instead of checking for the struct.
* Makefile.am: Add patch to EXTRA_DIST
diff --git a/Makefile.am b/Makefile.am
index b638f42..6a407b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ SUBDIRS = po packages include doc src
EXTRA_DIST = autogen.sh README.GIT ONEWS \
build-aux/git-log-footer build-aux/git-log-fix \
patches/pthreads-w32-2-8-0-release/01-make.patch \
+ patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch \
patches/glib-2.12.12/01-giowin32.patch \
patches/glib-2.12.12/02-gspawn-w32.patch \
patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
diff --git a/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch b/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
new file mode 100755
index 0000000..cc83013
--- /dev/null
+++ b/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Ignore whitespace is necessary because the original context of the patch
+# contains whitespace errors
+patch -p0 -f --ignore-whitespace $* < $0
+exit $?
+
+2013-04-18 Andre Heinecke <aheinecke at intevation.de>
+
+ * pthread.h: Handle that struct timespec might be defined
+ on windows without _UWIN definition.
+
+--- pthread.h.orig 2013-04-18 15:52:11.470656381 +0000
++++ pthread.h 2013-04-18 15:52:14.762630601 +0000
+@@ -110,7 +110,6 @@
+ #endif
+
+ #ifdef _UWIN
+-# define HAVE_STRUCT_TIMESPEC 1
+ # define HAVE_SIGNAL_H 1
+ # undef HAVE_CONFIG_H
+ # pragma comment(lib, "pthread")
+@@ -227,6 +226,12 @@
+ #include <setjmp.h>
+ #include <limits.h>
+
++// Check if someone defined timespec
++#if defined(_UWIN) || defined(_TIMESPEC_DEFINED)
++# define HAVE_STRUCT_TIMESPEC 1
++#endif
++
++
+ /*
+ * Boolean values to make us independent of system includes.
+ */
commit 66c152c6a6e7cd2985aaea8504b40833d5bc8424
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 16:20:04 2013 +0000
Fix dependencies for qt and dbus
configure.ac: Remove kdesupport and replace it with dbus
diff --git a/configure.ac b/configure.ac
index 094aab6..94382b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,9 +328,9 @@ GPG4WIN_SPKG([bsfilter_plugin], [claws-mail])
GPG4WIN_IPKG([compendium])
# Qt related stuff.
-GPG4WIN_BPKG_GNUWIN32([kdesupport])
+GPG4WIN_BPKG_GNUWIN32([dbus])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
-GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
+GPG4WIN_BPKG_GNUWIN32([qt], [dbus])
GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 kdelibs])
#GPG4WIN_BPKG_GNUWIN32([kleopatra], [gpgme gnupg2 kdelibs])
commit 2ec28d5e7c43fd4b70fe4c50e91cb978607aa22f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 15:15:57 2013 +0000
Comment out claws download for now
The packages are no longer available for download from
claws-mail.org
packages/packages.current: Comment out files from claws-mail.org
diff --git a/packages/packages.current b/packages/packages.current
index 9b2b1bd..1c3aac9 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -59,10 +59,10 @@ chk bff911d4fd7389aa6698a644b3748eb2d23715bc
#
# (Kept on our own mirror due to Sourceforge peculiarities.)
-server http://www.claws-mail.org/win32
-
-file libetpan-0.58.tar.gz
-chk 98a5689bbe99dc77d689c2ea1e8294f217a3b49c
+#server http://www.claws-mail.org/win32
+#
+#file libetpan-0.58.tar.gz
+#chk 98a5689bbe99dc77d689c2ea1e8294f217a3b49c
#
# curl for Claws plugins
@@ -99,16 +99,16 @@ chk 04b4c2ac296499d378f4a35bbeb1b129165b2e61
#
# bsfilter.exe for antispam in Claws
#
-server http://www.claws-mail.org/win32
-
-file bsfilter-1.0.16-bin.tar.gz
-chk 5ed34f22ebf433d83cd3571309b5cbc52c45d6d2
-
-file bsfilter-1.0.16-lib.tar.gz
-chk c7fa5ec9c70c75b7b1bc852bac8eb0a5ec9e01ea
-
-file bsfilter-1.0.16-src.tar.gz
-chk fe718884dd7ca0652613a2cb5c302ac6323605d8
+#server http://www.claws-mail.org/win32
+#
+#file bsfilter-1.0.16-bin.tar.gz
+#chk 5ed34f22ebf433d83cd3571309b5cbc52c45d6d2
+#
+#file bsfilter-1.0.16-lib.tar.gz
+#chk c7fa5ec9c70c75b7b1bc852bac8eb0a5ec9e01ea
+#
+#file bsfilter-1.0.16-src.tar.gz
+#chk fe718884dd7ca0652613a2cb5c302ac6323605d8
#
# Enchant for Claws
@@ -123,31 +123,31 @@ chk 321f9cf0abfa1937401676ce60976d8779c39536
#
# (Kept on our own mirror due to Sourceforge peculiarities.)
-server http://www.claws-mail.org/win32
-
-file claws-mail-3.8.1.tar.bz2
-chk 4b9fa17bff8986098c72c4b8723e1540e2b058d1
-
-file attachwarner-0.2.24cvs1.tar.gz
-chk 616356ad9697e2698b294901e562897e9d0c40e1
-
-file bsfilter_plugin-1.0.8cvs1.tar.gz
-chk 1577366fe46ad30d188c84a30c75fd2bcaafdb7e
-
-file gtkhtml2_viewer-0.33.tar.gz
-chk b2a7047af55b2273e031e16806859458762d74a1
-
-file notification_plugin-0.30.tar.gz
-chk 2c6237b0dfbdb028e2d12b26ff2dc3430a96b47f
-
-file rssyl-0.33.tar.gz
-chk aecf28d0901c8e670eabe1abcfeb362f1685cc75
-
-file tnef_parse-0.3.13.tar.gz
-chk 8d0de3c82048c5a9e7985786ddc624d2920ba8a1
-
-file vcalendar-2.0.13.tar.gz
-chk 1e8171340dde04eda4468b72c23104233dd76bae
+#server http://www.claws-mail.org/win32
+#
+#file claws-mail-3.8.1.tar.bz2
+#chk 4b9fa17bff8986098c72c4b8723e1540e2b058d1
+#
+#file attachwarner-0.2.24cvs1.tar.gz
+#chk 616356ad9697e2698b294901e562897e9d0c40e1
+#
+#file bsfilter_plugin-1.0.8cvs1.tar.gz
+#chk 1577366fe46ad30d188c84a30c75fd2bcaafdb7e
+#
+#file gtkhtml2_viewer-0.33.tar.gz
+#chk b2a7047af55b2273e031e16806859458762d74a1
+#
+#file notification_plugin-0.30.tar.gz
+#chk 2c6237b0dfbdb028e2d12b26ff2dc3430a96b47f
+#
+#file rssyl-0.33.tar.gz
+#chk aecf28d0901c8e670eabe1abcfeb362f1685cc75
+#
+#file tnef_parse-0.3.13.tar.gz
+#chk 8d0de3c82048c5a9e7985786ddc624d2920ba8a1
+#
+#file vcalendar-2.0.13.tar.gz
+#chk 1e8171340dde04eda4468b72c23104233dd76bae
#
# Pthreads for Windows.
commit dcbdc5c4c9deabe432b2eec9b6824c396232c7a2
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 15:03:16 2013 +0000
Fix qt-src filename
* packages/packages.current: qt-src now also includes the build date
in the filename
diff --git a/packages/packages.current b/packages/packages.current
index 4ef88f4..9b2b1bd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -430,7 +430,7 @@ chk 2ad50b6890268efdc980bffc79426012380065f3
file qt-x86-mingw4-4.8.4-20130418-lib.tar.bz2
chk 386a044ee4b87fea312c7bb7a75e34a60a7dc67b
-file qt-x86-mingw4-4.8.4-src.tar.bz2
+file qt-x86-mingw4-4.8.4-20130418-src.tar.bz2
chk caaa01e15ce534de5020b019d23c052eb042bfb3
#
commit c0ec582d31a1d531f288f3d7e6e47df1954a1888
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 15:01:50 2013 +0000
Libpng 1.4 hosting location has changed
* packages/packages.current: Update libpng download location
diff --git a/packages/packages.current b/packages/packages.current
index eeda626..4ef88f4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -293,7 +293,7 @@ chk d063e705812e1ee7feb8f35d51b3cad04ca13b0d
# PNG
# note: 2012-03-28 wk - Changed server from sf.net
-server ftp://ftp.simplesystems.org/pub/png/src
+server ftp://ftp.simplesystems.org/pub/png/src/libpng14
file libpng-1.4.12.tar.bz2
chk 275cfa90c0558601f6216019317fc37a03ebee01
commit 4dfba9a6edcb18e4f593148c8cf1fef4387b8205
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 14:50:58 2013 +0000
Handle updated qt and removed kdesupport package
The pkgconfig copy should now longer be needed
kdesupport is now renamed to dbus and should no longer
contain some extra files that don't belong there.
The NSIS files for inst-/uninst- dbus are wrong for
now as they still contain files that were in kdesupport
* src/Makefile.am: Change dependencies and filenames, remove postinst
workarounds for kdesupport.
* src/QtCore.pc, src/QtGui.pc: Removed
* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Renamed to dbus
diff --git a/src/Makefile.am b/src/Makefile.am
index e6ad550..a4648d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
inst-zlib.nsi uninst-zlib.nsi \
inst-bsfilter.nsi uninst-bsfilter.nsi \
inst-qt.nsi uninst-qt.nsi \
- inst-kdesupport.nsi uninst-kdesupport.nsi \
+ inst-dbus.nsi uninst-dbus.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
inst-kdelibs.nsi uninst-kdelibs.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
@@ -352,7 +352,7 @@ gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig pango expat freetype fontconfig cairo \
- atk qt kdesupport oxygen-icons kdelibs kleopatra bsfilter
+ atk qt dbus oxygen-icons kdelibs kleopatra bsfilter
# libiconv needs some special magic to generate a usable import
# library.
@@ -464,27 +464,6 @@ cd $$$${pkgidir}/lib; \
$(DLLTOOL) --output-lib libiconv.dll.a --def libiconv.def)
endef
-# Qt is missing the pkgconfig files.
-define gpg4win_pkg_qt_post_install
-(mkdir $$$${pkgidir_dev}/lib/pkgconfig; \
- cp $(srcdir)/QtCore.pc $(srcdir)/QtGui.pc $$$${pkgidir_dev}/lib/pkgconfig/)
-endef
-
-
-# kdesupport ships gettext, which we already have. Remove a stow
-# 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/apps/cmake/modules")
-endef
-
-# libxml2 ships some binaries, which we already have from kdesupport. Remove a stow
-# conflict about that.
-define gpg4win_pkg_libxml2_post_install
-(rm -f "$$$${pkgidir}/bin/xmllint.exe"; \
- rm -f "$$$${pkgidir}/bin/xmlcatalog.exe")
-endef
-
# Supported internal packages. Internal packages do not require any
# special support. Thus, this variable is actually unused, and no
# rules are added in gpg4win.mk.
diff --git a/src/QtCore.pc b/src/QtCore.pc
deleted file mode 100644
index 8b243f7..0000000
--- a/src/QtCore.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include/QtCore
-
-Name: Qtcore
-Description: Qtcore Library
-Version: 4.5.0
-Libs: -L${libdir} -lQtCore4
-Cflags: -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I${includedir}
-
diff --git a/src/QtGui.pc b/src/QtGui.pc
deleted file mode 100644
index a9f8ba5..0000000
--- a/src/QtGui.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include/QtGui
-
-Name: Qtgui
-Description: Qtgui Library
-Version: 4.5.0
-Libs: -L${libdir} -lQtGui4
-Cflags: -DQT_GUI_LIB -I${includedir}
-Requires: QtCore
-
diff --git a/src/inst-kdesupport.nsi b/src/inst-dbus.nsi
similarity index 88%
rename from src/inst-kdesupport.nsi
rename to src/inst-dbus.nsi
index 5f49c17..6551fb3 100644
--- a/src/inst-kdesupport.nsi
+++ b/src/inst-dbus.nsi
@@ -1,4 +1,4 @@
-# inst-kdesupport.nsi - Snippet for kdesupport. -*- coding: latin-1; -*-
+# inst-dbus.nsi - Snippet for dbus. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007 g10 Code GmbH
#
# This file is part of GPG4Win.
@@ -21,16 +21,16 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/kdesupport-${gpg4win_pkg_kdesupport_version}
+!define prefix ${ipdir}/dbus-${gpg4win_pkg_dbus_version}
!ifdef DEBUG
-Section "kdesupport" SEC_kdesupport
+Section "dbus" SEC_dbus
!else
-Section "-kdesupport" SEC_kdesupport
+Section "-dbus" SEC_dbus
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_kdesupport_src}"
+ File "${gpg4win_pkg_dbus_src}"
!else
# FIXME: Figure out how to relocate dbus-daemon (and kleopatra).
SetOutPath "$INSTDIR\bin"
@@ -55,7 +55,7 @@ Section "-kdesupport" SEC_kdesupport
# FIXME: From the lib package. This is wrong.
!undef prefix
-!define prefix ${ipdir}/kdesupport-dev-${gpg4win_pkg_kdesupport_version}
+!define prefix ${ipdir}/dbus-dev-${gpg4win_pkg_dbus_version}
SetOutPath "$INSTDIR"
File ${prefix}/bin/giflib4.dll
diff --git a/src/uninst-kdesupport.nsi b/src/uninst-dbus.nsi
similarity index 89%
rename from src/uninst-kdesupport.nsi
rename to src/uninst-dbus.nsi
index 3ccbd1a..28cbda4 100644
--- a/src/uninst-kdesupport.nsi
+++ b/src/uninst-dbus.nsi
@@ -1,4 +1,4 @@
-# uninst-kdesupport.nsi - Snippet for kdesupport. -*- coding: latin-1; -*-
+# uninst-dbus.nsi - Snippet for dbus. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007 g10 Code GmbH
#
# This file is part of GPG4Win.
@@ -21,16 +21,16 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/kdesupport-${gpg4win_pkg_kdesupport_version}
+!define prefix ${ipdir}/dbus-${gpg4win_pkg_dbus_version}
; Uninstaller section.
-Section "-un.kdesupport"
+Section "-un.dbus"
!ifdef SOURCES
- Push "${gpg4win_pkg_kdesupport_src}"
+ Push "${gpg4win_pkg_dbus_src}"
Call un.SourceDelete
!else
- # FIXME: See inst-kdesupport.nsi.
+ # FIXME: See inst-dbus.nsi.
Delete /REBOOTOK "$INSTDIR\bin\dbus-daemon.exe"
RMDir "$INSTDIR\bin"
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 +-
configure.ac | 4 +-
packages/packages.current | 82 ++++++++++----------
.../02-mingw_w64_timespec_compatibility.patch | 34 ++++++++
.../01_compatibility_with_newer_mingw.patch | 23 ++++++
src/Makefile.am | 25 +------
src/QtCore.pc | 11 ---
src/QtGui.pc | 12 ---
src/{inst-kdesupport.nsi => inst-dbus.nsi} | 12 ++--
src/{uninst-kdesupport.nsi => uninst-dbus.nsi} | 10 +-
10 files changed, 116 insertions(+), 101 deletions(-)
create mode 100755 patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
create mode 100755 patches/w32pth-2.0.2/01_compatibility_with_newer_mingw.patch
delete mode 100644 src/QtCore.pc
delete mode 100644 src/QtGui.pc
rename src/{inst-kdesupport.nsi => inst-dbus.nsi} (88%)
rename src/{uninst-kdesupport.nsi => uninst-dbus.nsi} (89%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list