On Thursday 09 February 2012 00:35:27 you wrote: > I still need to build KMyMoney with the plugin (I'm waiting for kdelibs > rigth now) but I'm confident that it will work.
After building kdelibs I finally got to kmymoney and needed to: 1. set PKG_CONFIG_PATH=E:/kmgw/lib/pkgconfig (E:/kmgw <- this is the sandbox) in order to detect gwenhywfar and aqbanking when configuring kmymoney 2. Use the updated patch (attached) which adds '--no-undefined' to the LDFLAGS of the qt4 ui lib of gwenhywfar so that the dll will be produced and used to link the KBanking plugin 3. Ran kmymoney, the plugin was there and usable - we still need some runtime checks though > Please add these packages to the list of built packages as you can. I really > would like to see these packages moved out of 'testing' to their proper > places. > > Thanks, -- Regards, Cristian Oneț
>From 9bb1f9b6fcc31cad46013f83061b936f8fc532c5 Mon Sep 17 00:00:00 2001
From: Cristian Onet <onet.crist...@gmail.com>
Date: Thu, 9 Feb 2012 00:13:23 +0200
Subject: [PATCH] Package the latest versions of aqbanking andgwenhywfar on mingw.
This involved packaging gnutls and installing the gpg-error-config shell script
plus changing the gpg-error library name from liblibgpg-error.dll to libgpg-error.dll
I hope this is OK with the rest of the packages depending on gpg-error.
---
.../aqbanking-src/aqbanking-src-20110921.py | 11 +--
portage/testing/gnutls-src/gnutls-src-2.8.6.py | 4 +-
.../gwenhywfar-src/gwenhywfar-4.3.1-20120208.diff | 105 +++++++++++++++++++
.../gwenhywfar-src/gwenhywfar-src-20110104.py | 15 ++--
.../testing/libgcrypt-src/libgcrypt-src-1.4.4.py | 7 +-
.../gpg-error-src/gpg-error-src-1.10.py | 2 +-
.../gpg-error-src/libgpg-error-r267-20120207.diff | 110 ++++++++++++++++++++
7 files changed, 234 insertions(+), 20 deletions(-)
create mode 100644 portage/testing/gwenhywfar-src/gwenhywfar-4.3.1-20120208.diff
create mode 100644 portage/win32libs-sources/gpg-error-src/libgpg-error-r267-20120207.diff
diff --git a/portage/testing/aqbanking-src/aqbanking-src-20110921.py b/portage/testing/aqbanking-src/aqbanking-src-20110921.py
index 9c09864..69f64fc 100644
--- a/portage/testing/aqbanking-src/aqbanking-src-20110921.py
+++ b/portage/testing/aqbanking-src/aqbanking-src-20110921.py
@@ -13,14 +13,12 @@ class subinfo(info.infoclass):
self.buildDependencies['dev-util/msys'] = 'default'
def setTargets( self ):
- self.targets['5.0.2'] = 'aqbanking-5.0.2.tar.gz'
- self.targetInstSrc['5.0.2'] = "aqbanking-5.0.2"
- self.targets['5.0.16'] = 'aqbanking-5.0.16.tar.gz'
- self.targetInstSrc['5.0.16'] = "aqbanking-5.0.16"
+ self.targets['5.0.22'] = 'aqbanking-5.0.22.tar.gz'
+ self.targetInstSrc['5.0.22'] = "aqbanking-5.0.22"
self.options.package.withCompiler = False
self.shortDescription = "Generic Online Banking Interface"
- self.defaultTarget = '5.0.16'
+ self.defaultTarget = '5.0.22'
from Package.AutoToolsPackageBase import *
from Package.VirtualPackageBase import *
@@ -32,8 +30,7 @@ class PackageMinGW(AutoToolsPackageBase):
self.subinfo.options.configure.defines = "--enable-shared --disable-static"
def fetch(self):
- utils.wgetFile('"http://www.aquamaniac.de/sites/download/download.php?package=03&release=87&file=01&dummy=aqbanking-5.0.16.tar.gz";', self.downloadDir() , "aqbanking-5.0.16.tar.gz")
- #utils.wgetFile('"http://www.aquamaniac.de/sites/download/download.php?package=03&release=75&file=01&dummy=aqbanking-5.0.2.tar.gz";' , self.downloadDir() , "aqbanking-5.0.2.tar.gz")
+ utils.wgetFile('"http://www.aquamaniac.de/sites/download/download.php?package=03&release=92&file=01&dummy=aqbanking-5.0.22.tar.gz";', self.downloadDir() , "aqbanking-5.0.22.tar.gz")
return True
if compiler.isMinGW():
diff --git a/portage/testing/gnutls-src/gnutls-src-2.8.6.py b/portage/testing/gnutls-src/gnutls-src-2.8.6.py
index 2bf1962..031ebae 100644
--- a/portage/testing/gnutls-src/gnutls-src-2.8.6.py
+++ b/portage/testing/gnutls-src/gnutls-src-2.8.6.py
@@ -21,9 +21,11 @@ class subinfo(info.infoclass):
if compiler.isMinGW():
self.buildDependencies['dev-util/msys'] = 'default'
-class PackageMinGW(AutoToolsBuildSystem):
+class PackageMinGW(PackageBase, MultiSource, AutoToolsBuildSystem):
def __init__( self, **args ):
self.subinfo = subinfo()
+ PackageBase.__init__(self)
+ MultiSource.__init__(self)
AutoToolsBuildSystem.__init__(self)
self.subinfo.options.configure.defines = "--disable-openpgp-authentication --disable-guile"
diff --git a/portage/testing/gwenhywfar-src/gwenhywfar-4.3.1-20120208.diff b/portage/testing/gwenhywfar-src/gwenhywfar-4.3.1-20120208.diff
new file mode 100644
index 0000000..b07c337
--- /dev/null
+++ b/portage/testing/gwenhywfar-src/gwenhywfar-4.3.1-20120208.diff
@@ -0,0 +1,105 @@
+diff -Nru gwenhywfar-4.3.1.orig/configure gwenhywfar-4.3.1/configure
+--- gwenhywfar-4.3.1.orig/configure 2011-12-11 00:26:04.000000000 +0200
++++ gwenhywfar-4.3.1/configure 2012-02-09 21:38:26.147220200 +0200
+@@ -21000,6 +21000,9 @@
+ # This is the name of the qt library to search for.
+ if test "x$OSYSTEM" = "xosx"; then
+ qt_searchname="lib${qt_libname}.4.dylib"
++elif test "x$OSYSTEM" = "xwindows"; then
++ qt_suffix="d4"
++ qt_searchname="lib${qt_libname}${qt_suffix}.a"
+ else
+ qt_searchname="lib${qt_libname}${std_shrext}.4"
+ fi
+@@ -21023,7 +21026,7 @@
+ done
+
+ if test -n "$found_dir" ; then
+- qt4_libs="-L$found_dir -l${qt_libname} -lQtCore"
++ qt4_libs="-L$found_dir -l${qt_libname}${qt_suffix} -lQtCore${qt_suffix}"
+ fi
+ fi
+
+diff -Nru gwenhywfar-4.3.1.orig/gui/qt4/libtest.cpp gwenhywfar-4.3.1/gui/qt4/libtest.cpp
+--- gwenhywfar-4.3.1.orig/gui/qt4/libtest.cpp 2010-07-14 13:58:21.000000000 +0300
++++ gwenhywfar-4.3.1/gui/qt4/libtest.cpp 2012-02-09 21:38:26.162845200 +0200
+@@ -11,6 +11,8 @@
+
+ #include <qapplication.h>
+
++#include <windows.h>
++#define sleep(n) Sleep(1000 * n)
+
+ int test1(int argc, char **argv) {
+ QApplication a(argc, argv);
+diff -Nru gwenhywfar-4.3.1.orig/gui/qt4/Makefile.in gwenhywfar-4.3.1/gui/qt4/Makefile.in
+--- gwenhywfar-4.3.1.orig/gui/qt4/Makefile.in 2011-12-11 00:26:02.000000000 +0200
++++ gwenhywfar-4.3.1/gui/qt4/Makefile.in 2012-02-09 22:31:50.834559300 +0200
+@@ -88,6 +88,7 @@
+ libgwengui_qt4_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/src/$(gwenhywfar_internal_libname) \
+ $(builddir)/../cpp/libgwengui-cpp.la
++libgwengui_qt4_la_LDFLAGS = -no-undefined
+ am_libgwengui_qt4_la_OBJECTS = qt4dialogbox.lo qt4_gui.lo \
+ qt4_gui_dialog.lo
+ nodist_libgwengui_qt4_la_OBJECTS =
+@@ -99,6 +100,7 @@
+ libtest_DEPENDENCIES = libgwengui-qt4.la \
+ $(top_builddir)/src/$(gwenhywfar_internal_libname) \
+ $(am__DEPENDENCIES_1) \
++ $(builddir)/../cpp/libgwengui-cpp.la \
+ $(builddir)/../testdialogs/libgwengui-test.la
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -415,7 +417,7 @@
+
+ libtest_SOURCES = libtest.cpp
+ libtest_LDADD = libgwengui-qt4.la $(top_builddir)/src/$(gwenhywfar_internal_libname) $(qt4_libs) \
+- $(builddir)/../testdialogs/libgwengui-test.la
++ $(builddir)/../cpp/libgwengui-cpp.la $(builddir)/../testdialogs/libgwengui-test.la
+
+ SUFFIXES = .ui .ui.hpp .ui.cpp .moc
+ BUILT_SOURCES = $(MOC_FILES) $(nodist_libgwengui_qt4_la_SOURCES)
+diff -Nru gwenhywfar-4.3.1.orig/src/Makefile.am gwenhywfar-4.3.1/src/Makefile.am
+--- gwenhywfar-4.3.1.orig/src/Makefile.am 2011-06-22 23:48:38.000000000 +0300
++++ gwenhywfar-4.3.1/src/Makefile.am 2012-02-09 21:38:26.162845200 +0200
+@@ -56,6 +56,7 @@
+ cryptmsg/libcryptmsg.la \
+ sio/libsio.la \
+ os/libos.la \
++ os/@GWEN_OS@/libosimpl.la \
+ parser/libparser.la \
+ html/libgwenhtml.la \
+ gui/libgui.la \
+diff -Nru gwenhywfar-4.3.1.orig/src/Makefile.in gwenhywfar-4.3.1/src/Makefile.in
+--- gwenhywfar-4.3.1.orig/src/Makefile.in 2011-12-11 00:26:03.000000000 +0200
++++ gwenhywfar-4.3.1/src/Makefile.in 2012-02-09 21:38:26.162845200 +0200
+@@ -87,7 +87,7 @@
+ am__DEPENDENCIES_1 =
+ libgwenhywfar_la_DEPENDENCIES = base/libbase.la crypt3/libcrypt3.la \
+ crypttoken/libcrypttoken.la cryptmsg/libcryptmsg.la \
+- sio/libsio.la os/libos.la parser/libparser.la \
++ sio/libsio.la os/libos.la os/@GWEN_OS@/libosimpl.la parser/libparser.la \
+ html/libgwenhtml.la gui/libgui.la sar/libsar.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -451,6 +451,7 @@
+ cryptmsg/libcryptmsg.la \
+ sio/libsio.la \
+ os/libos.la \
++ os/@GWEN_OS@/libosimpl.la \
+ parser/libparser.la \
+ html/libgwenhtml.la \
+ gui/libgui.la \
+diff -Nru gwenhywfar-4.3.1.orig/src/os/windows/inetsocket.c gwenhywfar-4.3.1/src/os/windows/inetsocket.c
+--- gwenhywfar-4.3.1.orig/src/os/windows/inetsocket.c 2011-06-13 18:47:03.000000000 +0300
++++ gwenhywfar-4.3.1/src/os/windows/inetsocket.c 2012-02-09 21:38:26.178470200 +0200
+@@ -42,6 +42,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/time.h>
++#include <Winsock2.h>
++#include <Winerror.h>
+
+
+
diff --git a/portage/testing/gwenhywfar-src/gwenhywfar-src-20110104.py b/portage/testing/gwenhywfar-src/gwenhywfar-src-20110104.py
index a546f99..9962a08 100644
--- a/portage/testing/gwenhywfar-src/gwenhywfar-src-20110104.py
+++ b/portage/testing/gwenhywfar-src/gwenhywfar-src-20110104.py
@@ -8,20 +8,19 @@ class subinfo(info.infoclass):
def setDependencies( self ):
self.buildDependencies['virtual/base'] = 'default'
self.buildDependencies['testing/gnutls-src'] = 'default'
+ self.buildDependencies['libs/qt'] = 'default'
+ self.buildDependencies['win32libs-sources/gettext-src'] = 'default'
if compiler.isMinGW():
self.buildDependencies['dev-util/msys'] = 'default'
def setTargets( self ):
- self.targets['4.0.3'] = 'gwenhywfar-4.0.3.tar.gz'
- self.targetInstSrc['4.0.3'] = "gwenhywfar-4.0.3"
- self.patchToApply['4.0.3'] = ('gwenhywfar-4.0.3-20110122.diff', 1)
- self.targets['4.3.0'] = 'gwenhywfar-4.3.0.tar.gz'
- self.targetInstSrc['4.3.0'] = "gwenhywfar-4.3.0"
- self.patchToApply['4.3.0'] = ('gwenhywfar-4.0.3-20110122.diff', 1)
+ self.targets['4.3.1'] = 'gwenhywfar-4.3.1.tar.gz'
+ self.targetInstSrc['4.3.1'] = "gwenhywfar-4.3.1"
+ self.patchToApply['4.3.1'] = ('gwenhywfar-4.3.1-20120208.diff', 1)
self.options.package.withCompiler = False
self.shortDescription = "A multi-platform helper library for other libraries"
- self.defaultTarget = '4.0.3'
+ self.defaultTarget = '4.3.1'
from Package.AutoToolsPackageBase import *
from Package.VirtualPackageBase import *
@@ -34,7 +33,7 @@ class PackageMinGW(AutoToolsPackageBase):
self.subinfo.options.configure.defines = "--enable-shared --disable-static --with-guis=qt4 --with-qt4-includes=" + mergeroot + "/include --with-qt4-libs=" + mergeroot + "/lib --with-qt4-moc=" + mergeroot + "/bin/moc.exe --with-qt4-uic=" + mergeroot + "/bin/uic.exe"
def fetch(self):
- utils.wgetFile('"http://www.aquamaniac.de/sites/download/download.php?package=01&release=56&file=01&dummy=gwenhywfar-4.0.3.tar.gz";' , self.downloadDir() , "gwenhywfar-4.0.3.tar.gz")
+ utils.wgetFile('"http://www.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-4.3.1.tar.gz";' , self.downloadDir() , "gwenhywfar-4.3.1.tar.gz")
return True
if compiler.isMinGW():
diff --git a/portage/testing/libgcrypt-src/libgcrypt-src-1.4.4.py b/portage/testing/libgcrypt-src/libgcrypt-src-1.4.4.py
index 7a0768e..551cbd0 100644
--- a/portage/testing/libgcrypt-src/libgcrypt-src-1.4.4.py
+++ b/portage/testing/libgcrypt-src/libgcrypt-src-1.4.4.py
@@ -9,10 +9,11 @@ from Package.PackageBase import *
class subinfo(info.infoclass):
def setTargets( self ):
- self.targets['1.4.4'] = 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.4.tar.bz2'
- self.targetInstSrc['1.4.4'] = 'libgcrypt-1.4.4'
+ for ver in ['1.4.4', '1.5.0']:
+ self.targets[ ver ] = 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-' + ver + '.tar.bz2'
+ self.targetInstSrc[ ver ] = 'libgcrypt-' + ver
self.patchToApply['1.4.4'] = ('libgcrypt-1.4.4-20091017.diff', 1)
- self.defaultTarget = '1.4.4'
+ self.defaultTarget = '1.5.0'
self.options.package.withCompiler = False
def setDependencies( self ):
diff --git a/portage/win32libs-sources/gpg-error-src/gpg-error-src-1.10.py b/portage/win32libs-sources/gpg-error-src/gpg-error-src-1.10.py
index 0dc92dd..0ff1b70 100644
--- a/portage/win32libs-sources/gpg-error-src/gpg-error-src-1.10.py
+++ b/portage/win32libs-sources/gpg-error-src/gpg-error-src-1.10.py
@@ -16,7 +16,7 @@ class subinfo(info.infoclass):
self.targets['267'] = "http://download.sourceforge.net/kde-windows/libgpg-error-r267.tar.bz2";
self.targetInstSrc['267'] = "libgpg-error-r267"
self.targetDigests['267'] = '001d8ec3b2b922664a0730e9dddac87f03c23f5f'
- self.patchToApply['267'] = [('libgpg-error-r267-20101205.diff', 1), ('libgpg-error-cmake.diff', 1)]
+ self.patchToApply['267'] = [('libgpg-error-r267-20101205.diff', 1), ('libgpg-error-cmake.diff', 1), ('libgpg-error-r267-20120207.diff', 1)]
self.shortDescription = "a small library with error codes and descriptions shared by most GnuPG related software"
self.defaultTarget = '267'
diff --git a/portage/win32libs-sources/gpg-error-src/libgpg-error-r267-20120207.diff b/portage/win32libs-sources/gpg-error-src/libgpg-error-r267-20120207.diff
new file mode 100644
index 0000000..5294b1d
--- /dev/null
+++ b/portage/win32libs-sources/gpg-error-src/libgpg-error-r267-20120207.diff
@@ -0,0 +1,110 @@
+diff -Nru libgpg-error-r267.orig/CMakeLists.txt libgpg-error-r267/CMakeLists.txt
+--- libgpg-error-r267.orig/CMakeLists.txt 2012-02-07 22:47:30.515230400 +0200
++++ libgpg-error-r267/CMakeLists.txt 2012-02-07 22:46:48.608980400 +0200
+@@ -150,6 +150,8 @@
+ COMMAND ${GREP_EXECUTABLE} -v "\"^$$\"" ${BIN_DIR}/gpg-error.def.tmp > ${BIN_DIR}/gpg-error.def
+ DEPENDS ${BIN_DIR}/gpg-error.def.h)
+
++configure_file(src/gpg-error-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/gpg-error-config)
++
+ set(gpg_error_SRCS
+ mkw32errmap.map.c
+ src/init.c
+@@ -185,6 +187,7 @@
+
+ add_library(libgpg-error ${_shared} ${gpg_error_SRCS} ${gpg_error_GENERATED_SRCS})
+ set_target_properties(libgpg-error PROPERTIES DEFINE_SYMBOL DLL_EXPORT)
++set_target_properties(libgpg-error PROPERTIES OUTPUT_NAME "gpg-error")
+
+ if(BUILD_TOOL)
+ set(gpg_error_SRCS
+@@ -214,6 +217,7 @@
+ ARCHIVE DESTINATION lib)
+
+ install(FILES ${BIN_DIR}/gpg-error.h DESTINATION include)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpg-error-config DESTINATION bin)
+ if(WIN32 AND NOT BUILD_STATIC)
+ install(FILES ${BIN_DIR}/gpg-error.def DESTINATION lib)
+ endif(WIN32 AND NOT BUILD_STATIC)
+diff -Nru libgpg-error-r267.orig/src/gpg-error-config.cmake libgpg-error-r267/src/gpg-error-config.cmake
+--- libgpg-error-r267.orig/src/gpg-error-config.cmake 1970-01-01 02:00:00.000000000 +0200
++++ libgpg-error-r267/src/gpg-error-config.cmake 2012-02-07 22:46:14.046480400 +0200
+@@ -0,0 +1,78 @@
++#!/bin/sh
++# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
++#
++# This file is free software; as a special exception the author gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++#
++# This file is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++
++prefix="@CMAKE_INSTALL_PREFIX@"
++exec_prefix="@CMAKE_INSTALL_PREFIX@"
++includedir="@CMAKE_INSTALL_PREFIX@/include"
++libdir="@CMAKE_INSTALL_PREFIX@/lib"
++
++output=""
++
++usage()
++{
++ cat <<EOF
++Usage: gpg-error-config [OPTIONS]
++Options:
++ [--prefix]
++ [--exec-prefix]
++ [--version]
++ [--libs]
++ [--cflags]
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*)
++ optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
++ ;;
++ *)
++ optarg=
++ ;;
++ esac
++
++ case $1 in
++ --prefix)
++ output="$output $prefix"
++ ;;
++ --exec-prefix)
++ output="$output $exec_prefix"
++ ;;
++ --version)
++ echo @VERSION@
++ exit 0
++ ;;
++ --cflags)
++ if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
++ output="$output -I$includedir"
++ fi
++ output="$output @CMAKE_C_FLAGS@"
++ ;;
++ --libs)
++ if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
++ output="$output -L$libdir"
++ fi
++ output="$output -lgpg-error"
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++echo $output
--
1.7.4.msysgit.0
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-windows mailing list Kde-windows@kde.org https://mail.kde.org/mailman/listinfo/kde-windows
