Update gwenhywfar to the latest stable version and switch to Qt5. This
is one bit to update / unbreak kmymoney.
Feedback, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 12 Jul 2019 20:44:11 -0000 1.24
+++ Makefile 4 Jul 2020 07:28:46 -0000
@@ -2,54 +2,61 @@
COMMENT= helper library for networking and security applications
-# update the "release=XX" in DISTFILES, not just DISTNAME
-DISTNAME= gwenhywfar-4.13.1
-DISTFILES=
${DISTNAME}${EXTRACT_SUFX}{download.php?package=01\&release=78\&file=01}
-REVISION= 10
-
-SHARED_LIBS += gwenhywfar 1.3 # 73.1
-SHARED_LIBS += gwengui-gtk2 0.0 # unknown
-SHARED_LIBS += gwengui-qt4 0.0 # unknown
-SHARED_LIBS += gwengui-cpp 0.0 # unknown
+DISTNAME= gwenhywfar-5.3.0
+
+SHARED_LIBS += gwenhywfar 2.0 # 73.1
+SHARED_LIBS += gwengui-cpp 1.0 # unknown
+SHARED_LIBS += gwengui-gtk3 0.0 # 0.0
+SHARED_LIBS += gwengui-qt5 0.0 # 0.0
CATEGORIES= devel
-HOMEPAGE=
http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1
+HOMEPAGE= https://www.aquamaniac.de
# LGPLv2.1 with OpenSSL exemption
-PERMIT_PACKAGE= Yes
+PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} ICE QtGui SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
-WANTLIB += c cairo crypto expat ffi fontconfig freetype gcrypt
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gmp gnutls gobject-2.0 gpg-error graphite2 gthread-2.0
-WANTLIB += gtk-x11-2.0 harfbuzz hogweed iconv idn2 intl m nettle p11-kit
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png ssl tasn1 unistring xcb xcb-render
-WANTLIB += xcb-shm z fribidi
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets X11
+WANTLIB += X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xxf86vm atk-1.0 atk-bridge-2.0 c cairo
+WANTLIB += cairo-gobject crypto double-conversion drm epoxy execinfo
+WANTLIB += expat ffi fontconfig freetype fribidi gcrypt gdk-3
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gmp
+WANTLIB += gnutls gobject-2.0 gpg-error graphite2 gthread-2.0
+WANTLIB += gtk-3 harfbuzz hogweed iconv icudata icui18n icuio
+WANTLIB += icuuc idn2 intl m nettle p11-kit pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pcre2-16 pixman-1 png ssl tasn1 unistring
+WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render
+WANTLIB += xcb-shm xcb-sync xcb-xfixes xshmfence z zstd
-MASTER_SITES= http://www.aquamaniac.de/sites/download/
+MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/319/
-COMPILER = base-clang ports-gcc base-gcc
+MODULES= x11/qt5
-MODULES= x11/qt4
BUILD_DEPENDS= devel/gettext,-tools
+
LIB_DEPENDS= graphics/png \
security/libgcrypt \
security/gnutls \
- x11/gtk+2
+ x11/gtk+3
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-guis="gtk2 qt4" \
- --with-qt4-includes=${MODQT4_INCDIR} \
- qt4_libs="-L${MODQT4_LIBDIR}
-Wl,-rpath-link,${X11BASE}/lib -lQtGui -lQtCore"
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS= --with-guis="gtk3 qt5 cpp" \
+ --enable-ssl \
+ --with-qt5-moc="${MODQT5_MOC}" \
+ --with-qt5-qmake="${MODQT5_QMAKE}" \
+ --with-qt5-uic="${MODQT5_UIC}"
+
+CONFIGURE_ENV+= QT_LRELEASE="${MODQT5_LRELEASE}" \
+ QT_LUPDATE="${LOCALBASE}/bin/lupdate-qt5" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ CXXFLAGS="-I${MODQT5_INCDIR}/QtWidgets"
pre-configure:
${SUBST_CMD} ${WRKSRC}/gwenhywfar-config.cmake.in \
- ${WRKSRC}/gui/qt4/gwengui-qt4-config.cmake.in
+ ${WRKSRC}/gui/qt5/gwengui-qt5-config.cmake.in \
+ ${WRKSRC}/gui/cpp/gwengui-cpp-config.cmake.in
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 30 Jan 2015 16:20:43 -0000 1.5
+++ distinfo 4 Jul 2020 07:28:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (gwenhywfar-4.13.1.tar.gz) =
S+yoksEjVUjqCuMBMqbS5XkRwiNAdGWFOVzLAdhOxys=
-SIZE (gwenhywfar-4.13.1.tar.gz) = 2518248
+SHA256 (gwenhywfar-5.3.0.tar.gz) = OuxZgvXhNnYYY/S2sSu7TNJrj/tfdVO1ikj3K2pDRKk=
+SIZE (gwenhywfar-5.3.0.tar.gz) = 2358547
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 4 Jul 2020 07:28:46 -0000
@@ -0,0 +1,51 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -23159,43 +23159,16 @@ win32 {
+ CONFIG -= debug_and_release
+ CONFIG += release
+ }
+-qtHaveModule(axcontainer): QT += axcontainer
+-qtHaveModule(axserver): QT += axserver
+-qtHaveModule(concurrent): QT += concurrent
+ qtHaveModule(core): QT += core
+-qtHaveModule(dbus): QT += dbus
+-qtHaveModule(declarative): QT += declarative
+-qtHaveModule(designer): QT += designer
+ qtHaveModule(gui): QT += gui
+-qtHaveModule(help): QT += help
+-qtHaveModule(multimedia): QT += multimedia
+-qtHaveModule(multimediawidgets): QT += multimediawidgets
+-qtHaveModule(network): QT += network
+-qtHaveModule(opengl): QT += opengl
+-qtHaveModule(printsupport): QT += printsupport
+-qtHaveModule(qml): QT += qml
+-qtHaveModule(qmltest): QT += qmltest
+-qtHaveModule(x11extras): QT += x11extras
+-qtHaveModule(script): QT += script
+-qtHaveModule(scripttools): QT += scripttools
+-qtHaveModule(sensors): QT += sensors
+-qtHaveModule(serialport): QT += serialport
+-qtHaveModule(sql): QT += sql
+-qtHaveModule(svg): QT += svg
+-qtHaveModule(testlib): QT += testlib
+-qtHaveModule(uitools): QT += uitools
+-qtHaveModule(webkit): QT += webkit
+-qtHaveModule(webkitwidgets): QT += webkitwidgets
+-qtHaveModule(xml): QT += xml
+-qtHaveModule(xmlpatterns): QT += xmlpatterns
+ qtHaveModule(widgets): QT += widgets
+ percent.target = %
+ percent.commands = @echo -n "\$(\$(@))\ "
+ QMAKE_EXTRA_TARGETS += percent
+ EOF
+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile
+- QT_CXXFLAGS=`make -s -f $am_have_qt_makefile CXXFLAGS INCPATH`
+- QT_LIBS=`make -s -f $am_have_qt_makefile LIBS`
++ QT_CXXFLAGS=`make -s -f $am_have_qt_makefile -VCXXFLAGS -VINCPATH | tr
'\n' ' '`
++ QT_LIBS=`make -s -f $am_have_qt_makefile -VLIBS | tr '\n' ' '`
+ rm $am_have_qt_pro $am_have_qt_makefile
+
+ # Look for specific tools in $PATH
Index: patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
===================================================================
RCS file: patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
diff -N patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gui_cpp_gwengui-cpp-config_cmake_in 4 Jul 2020 07:28:46
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: gui/cpp/gwengui-cpp-config.cmake.in
+--- gui/cpp/gwengui-cpp-config.cmake.in.orig
++++ gui/cpp/gwengui-cpp-config.cmake.in
+@@ -28,7 +28,7 @@ set_and_check(GWENGUI_CPP_INCLUDE_DIRS "@gwenhywfar_he
+ if(WIN32)
+ set_and_check(GWENGUI_CPP_LIBRARIES "@libdir@/libgwengui-cpp.dll.a")
+ else()
+- set_and_check(GWENGUI_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
++ set_and_check(GWENGUI_CPP_LIBRARIES
"@libdir@/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}")
+ endif()
+ set(GWENGUI_CPP_FOUND true)
+
Index: patches/patch-gui_qt4_gwengui-qt4-config_cmake_in
===================================================================
RCS file: patches/patch-gui_qt4_gwengui-qt4-config_cmake_in
diff -N patches/patch-gui_qt4_gwengui-qt4-config_cmake_in
--- patches/patch-gui_qt4_gwengui-qt4-config_cmake_in 12 Jan 2017 16:36:12
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gui_qt4_gwengui-qt4-config_cmake_in,v 1.1 2017/01/12 16:36:12
zhuk Exp $
-Unbreak CMake config file.
---- gui/qt4/gwengui-qt4-config.cmake.in.orig Wed Jan 11 00:46:50 2017
-+++ gui/qt4/gwengui-qt4-config.cmake.in Wed Jan 11 00:47:51 2017
-@@ -22,8 +22,8 @@ if(NOT EXISTS "${_file}")
- set_and_check(exec_prefix "@exec_prefix@")
- set_and_check(includedir "@includedir@")
- set_and_check(GWENGUI_QT4_INCLUDE_DIRS "@gwenhywfar_headerdir@")
-- set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
-- set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
-+ set_and_check(GWENGUI_QT4_LIBRARIES
"@libdir@/libgwengui-qt4.so.${LIBgwengui-qt4_VERSION}")
-+ set_and_check(GWENHYWFAR_CPP_LIBRARIES
"@libdir@/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}")
-
- set(GWENGUI_QT4_LIBRARIES ${GWENGUI_QT4_LIBRARIES}
${GWENHYWFAR_CPP_LIBRARIES})
-
Index: patches/patch-gui_qt5_gwengui-qt5-config_cmake_in
===================================================================
RCS file: patches/patch-gui_qt5_gwengui-qt5-config_cmake_in
diff -N patches/patch-gui_qt5_gwengui-qt5-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gui_qt5_gwengui-qt5-config_cmake_in 4 Jul 2020 07:28:46
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: gui/qt5/gwengui-qt5-config.cmake.in
+--- gui/qt5/gwengui-qt5-config.cmake.in.orig
++++ gui/qt5/gwengui-qt5-config.cmake.in
+@@ -31,7 +31,7 @@ set_and_check(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
+ if(WIN32)
+ set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES
"@libdir@/libgwengui-qt5.dll.a")
+ else()
+- set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES
"@libdir@/libgwengui-qt5.so")
++ set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES
"@libdir@/libgwengui-qt5.so.${LIBgwengui-qt5_VERSION}")
+ endif()
+
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND true)
Index: patches/patch-gwenhywfar-config_cmake_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-gwenhywfar-config_cmake_in
--- patches/patch-gwenhywfar-config_cmake_in 12 Jan 2017 16:36:12 -0000
1.1
+++ patches/patch-gwenhywfar-config_cmake_in 4 Jul 2020 07:28:46 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-gwenhywfar-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config file.
---- gwenhywfar-config.cmake.in.orig Wed Jan 11 00:39:48 2017
-+++ gwenhywfar-config.cmake.in Wed Jan 11 00:40:29 2017
-@@ -23,7 +23,7 @@ set_and_check(prefix "@prefix@")
- set_and_check(exec_prefix "@exec_prefix@")
- set_and_check(includedir "@includedir@")
- set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_headerdir@")
--set_and_check(GWENHYWFAR_LIBRARIES
"@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@")
-+set_and_check(GWENHYWFAR_LIBRARIES
"@libdir@/libgwenhywfar.so.${LIBgwenhywfar_VERSION}")
-
- # find components
+Index: gwenhywfar-config.cmake.in
+--- gwenhywfar-config.cmake.in.orig
++++ gwenhywfar-config.cmake.in
+@@ -26,7 +26,7 @@ set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_hea
+ if(WIN32)
+ set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.dll.a")
+ else()
+- set_and_check(GWENHYWFAR_LIBRARIES
"@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@")
++ set_and_check(GWENHYWFAR_LIBRARIES
"@libdir@/libgwenhywfar.so.${LIBgwenhywfar_VERSION}")
+ endif()
+ set(GWENHYWFAR_FOUND TRUE)
Index: patches/patch-plugins_dbio_csv_Makefile_in
===================================================================
RCS file: patches/patch-plugins_dbio_csv_Makefile_in
diff -N patches/patch-plugins_dbio_csv_Makefile_in
--- patches/patch-plugins_dbio_csv_Makefile_in 30 Jan 2015 16:20:43 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_dbio_csv_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen
Exp $
---- plugins/dbio/csv/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/csv/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = csv.xml
- csv_la_SOURCES = csv.c
- csv_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
- csv_la_LDFLAGS = -no-undefined $(STRIPALL) \
-- -module -version-info 0:1:0
-+ -module -avoid-version
-
- all: all-am
-
Index: patches/patch-plugins_dbio_olddb_Makefile_in
===================================================================
RCS file: patches/patch-plugins_dbio_olddb_Makefile_in
diff -N patches/patch-plugins_dbio_olddb_Makefile_in
--- patches/patch-plugins_dbio_olddb_Makefile_in 30 Jan 2015 16:20:43
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_dbio_olddb_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen
Exp $
---- plugins/dbio/olddb/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/olddb/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = olddb.xml
- olddb_la_SOURCES = olddb.c
- olddb_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
- olddb_la_LDFLAGS = -no-undefined $(STRIPALL) \
-- -module -version-info 0:1:0
-+ -module -avoid-version
-
- all: all-am
-
Index: patches/patch-plugins_dbio_xmldb_Makefile_in
===================================================================
RCS file: patches/patch-plugins_dbio_xmldb_Makefile_in
diff -N patches/patch-plugins_dbio_xmldb_Makefile_in
--- patches/patch-plugins_dbio_xmldb_Makefile_in 30 Jan 2015 16:20:43
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_dbio_xmldb_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen
Exp $
---- plugins/dbio/xmldb/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/xmldb/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = xmldb.xml
- xmldb_la_SOURCES = xmldb.c
- xmldb_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
- xmldb_la_LDFLAGS = -no-undefined $(STRIPALL) \
-- -module -version-info 0:1:0
-+ -module -avoid-version
-
- all: all-am
-
Index: patches/patch-src_sio_syncio_tls_c
===================================================================
RCS file: patches/patch-src_sio_syncio_tls_c
diff -N patches/patch-src_sio_syncio_tls_c
--- patches/patch-src_sio_syncio_tls_c 6 Mar 2016 12:17:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_sio_syncio_tls_c,v 1.1 2016/03/06 12:17:17 ajacoutot Exp $
-
-Fix build with GnutTLS 3.4.
-(from upstream's 4.15.2beta release)
-
---- src/sio/syncio_tls.c.orig Sun Mar 6 10:04:31 2016
-+++ src/sio/syncio_tls.c Sun Mar 6 10:04:52 2016
-@@ -364,7 +364,7 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO *sio) {
- const int proto_prio[2] = { GNUTLS_SSL3, 0 };
-
- DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
-- rv=gnutls_protocol_set_priority(xio->session, proto_prio);
-+ rv=gnutls_priority_set(xio->session, proto_prio);
- if (rv) {
- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv,
gnutls_strerror(rv));
- gnutls_deinit(xio->session);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 30 Jan 2015 16:20:43 -0000 1.4
+++ pkg/PLIST 4 Jul 2020 07:28:46 -0000
@@ -6,174 +6,191 @@ bin/gwenhywfar-config
@bin bin/typemaker
@bin bin/typemaker2
@bin bin/xmlmerge
-include/gwenhywfar4/
-include/gwenhywfar4/gwen-gui-cpp/
-include/gwenhywfar4/gwen-gui-cpp/api.h
-include/gwenhywfar4/gwen-gui-cpp/cppdialog.hpp
-include/gwenhywfar4/gwen-gui-cpp/cppgui.hpp
-include/gwenhywfar4/gwen-gui-cpp/cppwidget.hpp
-include/gwenhywfar4/gwen-gui-gtk2/
-include/gwenhywfar4/gwen-gui-gtk2/gtk2_gui.h
-include/gwenhywfar4/gwen-gui-qt4/
-include/gwenhywfar4/gwen-gui-qt4/qt4_gui.hpp
-include/gwenhywfar4/gwenhywfar/
-include/gwenhywfar4/gwenhywfar/args.h
-include/gwenhywfar4/gwenhywfar/base64.h
-include/gwenhywfar4/gwenhywfar/bindata.h
-include/gwenhywfar4/gwenhywfar/buffer.h
-include/gwenhywfar4/gwenhywfar/cgui.h
-include/gwenhywfar4/gwenhywfar/configmgr.h
-include/gwenhywfar4/gwenhywfar/configmgr_be.h
-include/gwenhywfar4/gwenhywfar/cryptalgo.h
-include/gwenhywfar4/gwenhywfar/cryptdefs.h
-include/gwenhywfar4/gwenhywfar/crypthead.h
-include/gwenhywfar4/gwenhywfar/cryptkey.h
-include/gwenhywfar4/gwenhywfar/cryptkey_be.h
-include/gwenhywfar4/gwenhywfar/cryptkeyrsa.h
-include/gwenhywfar4/gwenhywfar/cryptkeysym.h
-include/gwenhywfar4/gwenhywfar/cryptmgr.h
-include/gwenhywfar4/gwenhywfar/cryptmgr_be.h
-include/gwenhywfar4/gwenhywfar/cryptmgrkeys.h
-include/gwenhywfar4/gwenhywfar/ct.h
-include/gwenhywfar4/gwenhywfar/ct_be.h
-include/gwenhywfar4/gwenhywfar/ct_context.h
-include/gwenhywfar4/gwenhywfar/ct_keyinfo.h
-include/gwenhywfar4/gwenhywfar/ctf_context_be.h
-include/gwenhywfar4/gwenhywfar/ctfile_be.h
-include/gwenhywfar4/gwenhywfar/ctplugin.h
-include/gwenhywfar4/gwenhywfar/ctplugin_be.h
-include/gwenhywfar4/gwenhywfar/db.h
-include/gwenhywfar4/gwenhywfar/dbio.h
-include/gwenhywfar4/gwenhywfar/dbio_be.h
-include/gwenhywfar4/gwenhywfar/debug.h
-include/gwenhywfar4/gwenhywfar/dialog.h
-include/gwenhywfar4/gwenhywfar/dialog_be.h
-include/gwenhywfar4/gwenhywfar/directory.h
-include/gwenhywfar4/gwenhywfar/error.h
-include/gwenhywfar4/gwenhywfar/fastbuffer.h
-include/gwenhywfar4/gwenhywfar/fslock.h
-include/gwenhywfar4/gwenhywfar/gui.h
-include/gwenhywfar4/gwenhywfar/gui_be.h
-include/gwenhywfar4/gwenhywfar/gwen_sar_fileheader.h
-include/gwenhywfar4/gwenhywfar/gwendate.h
-include/gwenhywfar4/gwenhywfar/gwenhywfar.h
-include/gwenhywfar4/gwenhywfar/gwenhywfarapi.h
-include/gwenhywfar4/gwenhywfar/gwensemaphore.h
-include/gwenhywfar4/gwenhywfar/gwensignal.h
-include/gwenhywfar4/gwenhywfar/gwentime.h
-include/gwenhywfar4/gwenhywfar/hashalgo.h
-include/gwenhywfar4/gwenhywfar/htmlctx_be.h
-include/gwenhywfar4/gwenhywfar/htmlfont_be.h
-include/gwenhywfar4/gwenhywfar/htmlimage_be.h
-include/gwenhywfar4/gwenhywfar/htmlobject_be.h
-include/gwenhywfar4/gwenhywfar/htmlprops_be.h
-include/gwenhywfar4/gwenhywfar/httpsession.h
-include/gwenhywfar4/gwenhywfar/i18n.h
-include/gwenhywfar4/gwenhywfar/idlist.h
-include/gwenhywfar4/gwenhywfar/idlist64.h
-include/gwenhywfar4/gwenhywfar/idmap.h
-include/gwenhywfar4/gwenhywfar/inetaddr.h
-include/gwenhywfar4/gwenhywfar/inetsocket.h
-include/gwenhywfar4/gwenhywfar/inherit.h
-include/gwenhywfar4/gwenhywfar/libloader.h
-include/gwenhywfar4/gwenhywfar/list.h
-include/gwenhywfar4/gwenhywfar/list1.h
-include/gwenhywfar4/gwenhywfar/list1.tmpl
-include/gwenhywfar4/gwenhywfar/list2.h
-include/gwenhywfar4/gwenhywfar/list2.tmpl
-include/gwenhywfar4/gwenhywfar/logger.h
-include/gwenhywfar4/gwenhywfar/mdigest.h
-include/gwenhywfar4/gwenhywfar/mdigest_be.h
-include/gwenhywfar4/gwenhywfar/memcache.h
-include/gwenhywfar4/gwenhywfar/memory.h
-include/gwenhywfar4/gwenhywfar/misc.h
-include/gwenhywfar4/gwenhywfar/misc2.h
-include/gwenhywfar4/gwenhywfar/msgengine.h
-include/gwenhywfar4/gwenhywfar/multicache.h
-include/gwenhywfar4/gwenhywfar/mutex.h
-include/gwenhywfar4/gwenhywfar/o_image_be.h
-include/gwenhywfar4/gwenhywfar/padd.h
-include/gwenhywfar4/gwenhywfar/paddalgo.h
-include/gwenhywfar4/gwenhywfar/param.h
-include/gwenhywfar4/gwenhywfar/param_fns.h
-include/gwenhywfar4/gwenhywfar/passwdstore.h
-include/gwenhywfar4/gwenhywfar/path.h
-include/gwenhywfar4/gwenhywfar/pathmanager.h
-include/gwenhywfar4/gwenhywfar/plugin.h
-include/gwenhywfar4/gwenhywfar/plugindescr.h
-include/gwenhywfar4/gwenhywfar/pointerlist.h
-include/gwenhywfar4/gwenhywfar/process.h
-include/gwenhywfar4/gwenhywfar/refptr.h
-include/gwenhywfar4/gwenhywfar/ringbuffer.h
-include/gwenhywfar4/gwenhywfar/sar.h
-include/gwenhywfar4/gwenhywfar/sighead.h
-include/gwenhywfar4/gwenhywfar/sigtail.h
-include/gwenhywfar4/gwenhywfar/smalltresor.h
-include/gwenhywfar4/gwenhywfar/ssl_cert_descr.h
-include/gwenhywfar4/gwenhywfar/ssl_cert_flags.h
-include/gwenhywfar4/gwenhywfar/stringlist.h
-include/gwenhywfar4/gwenhywfar/stringlist2.h
-include/gwenhywfar4/gwenhywfar/syncio.h
-include/gwenhywfar4/gwenhywfar/syncio_buffered.h
-include/gwenhywfar4/gwenhywfar/syncio_file.h
-include/gwenhywfar4/gwenhywfar/syncio_http.h
-include/gwenhywfar4/gwenhywfar/syncio_memory.h
-include/gwenhywfar4/gwenhywfar/syncio_socket.h
-include/gwenhywfar4/gwenhywfar/syncio_tls.h
-include/gwenhywfar4/gwenhywfar/system.h
-include/gwenhywfar4/gwenhywfar/tag16.h
-include/gwenhywfar4/gwenhywfar/text.h
-include/gwenhywfar4/gwenhywfar/tlv.h
-include/gwenhywfar4/gwenhywfar/tree.h
-include/gwenhywfar4/gwenhywfar/types.h
-include/gwenhywfar4/gwenhywfar/url.h
-include/gwenhywfar4/gwenhywfar/urlfns.h
-include/gwenhywfar4/gwenhywfar/version.h
-include/gwenhywfar4/gwenhywfar/widget_be.h
-include/gwenhywfar4/gwenhywfar/xml.h
-include/gwenhywfar4/gwenhywfar/xmlctx.h
-include/gwenhywfar4/gwenhywfar/xsdnode.h
-lib/cmake/gwengui-qt4-4.13/
-lib/cmake/gwengui-qt4-4.13/gwengui-qt4-config-version.cmake
-lib/cmake/gwengui-qt4-4.13/gwengui-qt4-config.cmake
-lib/cmake/gwenhywfar-4.13/
-lib/cmake/gwenhywfar-4.13/gwenhywfar-config-version.cmake
-lib/cmake/gwenhywfar-4.13/gwenhywfar-config.cmake
+include/gwenhywfar5/
+include/gwenhywfar5/gwen-gui-cpp/
+include/gwenhywfar5/gwen-gui-cpp/api.h
+include/gwenhywfar5/gwen-gui-cpp/cppdialog.hpp
+include/gwenhywfar5/gwen-gui-cpp/cppgui.hpp
+include/gwenhywfar5/gwen-gui-cpp/cppwidget.hpp
+include/gwenhywfar5/gwen-gui-gtk3/
+include/gwenhywfar5/gwen-gui-gtk3/gtk3_gui.h
+include/gwenhywfar5/gwen-gui-qt5/
+include/gwenhywfar5/gwen-gui-qt5/qt5_gui.hpp
+include/gwenhywfar5/gwen-gui-qt5/qt5_gui_dialog.hpp
+include/gwenhywfar5/gwen-gui-qt5/qt5dialogbox.hpp
+include/gwenhywfar5/gwenhywfar/
+include/gwenhywfar5/gwenhywfar/args.h
+include/gwenhywfar5/gwenhywfar/base64.h
+include/gwenhywfar5/gwenhywfar/bindata.h
+include/gwenhywfar5/gwenhywfar/buffer.h
+include/gwenhywfar5/gwenhywfar/cgui.h
+include/gwenhywfar5/gwenhywfar/configmgr.h
+include/gwenhywfar5/gwenhywfar/configmgr_be.h
+include/gwenhywfar5/gwenhywfar/cryptalgo.h
+include/gwenhywfar5/gwenhywfar/cryptdefs.h
+include/gwenhywfar5/gwenhywfar/crypthead.h
+include/gwenhywfar5/gwenhywfar/cryptkey.h
+include/gwenhywfar5/gwenhywfar/cryptkey_be.h
+include/gwenhywfar5/gwenhywfar/cryptkeyrsa.h
+include/gwenhywfar5/gwenhywfar/cryptkeysym.h
+include/gwenhywfar5/gwenhywfar/cryptmgr.h
+include/gwenhywfar5/gwenhywfar/cryptmgr_be.h
+include/gwenhywfar5/gwenhywfar/cryptmgrkeys.h
+include/gwenhywfar5/gwenhywfar/ct.h
+include/gwenhywfar5/gwenhywfar/ct_be.h
+include/gwenhywfar5/gwenhywfar/ct_context.h
+include/gwenhywfar5/gwenhywfar/ct_keyinfo.h
+include/gwenhywfar5/gwenhywfar/ctf_context_be.h
+include/gwenhywfar5/gwenhywfar/ctfile_be.h
+include/gwenhywfar5/gwenhywfar/ctplugin.h
+include/gwenhywfar5/gwenhywfar/ctplugin_be.h
+include/gwenhywfar5/gwenhywfar/db.h
+include/gwenhywfar5/gwenhywfar/dbio.h
+include/gwenhywfar5/gwenhywfar/dbio_be.h
+include/gwenhywfar5/gwenhywfar/debug.h
+include/gwenhywfar5/gwenhywfar/dialog.h
+include/gwenhywfar5/gwenhywfar/dialog_be.h
+include/gwenhywfar5/gwenhywfar/directory.h
+include/gwenhywfar5/gwenhywfar/endianfns.h
+include/gwenhywfar5/gwenhywfar/error.h
+include/gwenhywfar5/gwenhywfar/fastbuffer.h
+include/gwenhywfar5/gwenhywfar/fslock.h
+include/gwenhywfar5/gwenhywfar/gui.h
+include/gwenhywfar5/gwenhywfar/gui_be.h
+include/gwenhywfar5/gwenhywfar/gwen_sar_fileheader.h
+include/gwenhywfar5/gwenhywfar/gwendate.h
+include/gwenhywfar5/gwenhywfar/gwenhywfar.h
+include/gwenhywfar5/gwenhywfar/gwenhywfarapi.h
+include/gwenhywfar5/gwenhywfar/gwensemaphore.h
+include/gwenhywfar5/gwenhywfar/gwensignal.h
+include/gwenhywfar5/gwenhywfar/gwentime.h
+include/gwenhywfar5/gwenhywfar/hashalgo.h
+include/gwenhywfar5/gwenhywfar/htmlctx_be.h
+include/gwenhywfar5/gwenhywfar/htmlfont_be.h
+include/gwenhywfar5/gwenhywfar/htmlimage_be.h
+include/gwenhywfar5/gwenhywfar/htmlobject_be.h
+include/gwenhywfar5/gwenhywfar/htmlprops_be.h
+include/gwenhywfar5/gwenhywfar/httpsession.h
+include/gwenhywfar5/gwenhywfar/i18n.h
+include/gwenhywfar5/gwenhywfar/idlist64.h
+include/gwenhywfar5/gwenhywfar/idmap.h
+include/gwenhywfar5/gwenhywfar/inetaddr.h
+include/gwenhywfar5/gwenhywfar/inetsocket.h
+include/gwenhywfar5/gwenhywfar/inherit.h
+include/gwenhywfar5/gwenhywfar/libloader.h
+include/gwenhywfar5/gwenhywfar/list.h
+include/gwenhywfar5/gwenhywfar/list1.h
+include/gwenhywfar5/gwenhywfar/list1.tmpl
+include/gwenhywfar5/gwenhywfar/list2.h
+include/gwenhywfar5/gwenhywfar/list2.tmpl
+include/gwenhywfar5/gwenhywfar/logger.h
+include/gwenhywfar5/gwenhywfar/mdigest.h
+include/gwenhywfar5/gwenhywfar/mdigest_be.h
+include/gwenhywfar5/gwenhywfar/memcache.h
+include/gwenhywfar5/gwenhywfar/memory.h
+include/gwenhywfar5/gwenhywfar/misc.h
+include/gwenhywfar5/gwenhywfar/misc2.h
+include/gwenhywfar5/gwenhywfar/msgengine.h
+include/gwenhywfar5/gwenhywfar/multicache.h
+include/gwenhywfar5/gwenhywfar/mutex.h
+include/gwenhywfar5/gwenhywfar/o_image_be.h
+include/gwenhywfar5/gwenhywfar/padd.h
+include/gwenhywfar5/gwenhywfar/paddalgo.h
+include/gwenhywfar5/gwenhywfar/param.h
+include/gwenhywfar5/gwenhywfar/param_fns.h
+include/gwenhywfar5/gwenhywfar/passwdstore.h
+include/gwenhywfar5/gwenhywfar/path.h
+include/gwenhywfar5/gwenhywfar/pathmanager.h
+include/gwenhywfar5/gwenhywfar/plugin.h
+include/gwenhywfar5/gwenhywfar/plugindescr.h
+include/gwenhywfar5/gwenhywfar/process.h
+include/gwenhywfar5/gwenhywfar/refptr.h
+include/gwenhywfar5/gwenhywfar/ringbuffer.h
+include/gwenhywfar5/gwenhywfar/sar.h
+include/gwenhywfar5/gwenhywfar/sighead.h
+include/gwenhywfar5/gwenhywfar/sigtail.h
+include/gwenhywfar5/gwenhywfar/simpleptrlist.h
+include/gwenhywfar5/gwenhywfar/smalltresor.h
+include/gwenhywfar5/gwenhywfar/ssl_cert_descr.h
+include/gwenhywfar5/gwenhywfar/ssl_cert_flags.h
+include/gwenhywfar5/gwenhywfar/stringlist.h
+include/gwenhywfar5/gwenhywfar/stringlist2.h
+include/gwenhywfar5/gwenhywfar/syncio.h
+include/gwenhywfar5/gwenhywfar/syncio_buffered.h
+include/gwenhywfar5/gwenhywfar/syncio_file.h
+include/gwenhywfar5/gwenhywfar/syncio_http.h
+include/gwenhywfar5/gwenhywfar/syncio_memory.h
+include/gwenhywfar5/gwenhywfar/syncio_socket.h
+include/gwenhywfar5/gwenhywfar/syncio_tls.h
+include/gwenhywfar5/gwenhywfar/system.h
+include/gwenhywfar5/gwenhywfar/tag16.h
+include/gwenhywfar5/gwenhywfar/testframework.h
+include/gwenhywfar5/gwenhywfar/testmodule.h
+include/gwenhywfar5/gwenhywfar/text.h
+include/gwenhywfar5/gwenhywfar/tlv.h
+include/gwenhywfar5/gwenhywfar/tree.h
+include/gwenhywfar5/gwenhywfar/tree2.h
+include/gwenhywfar5/gwenhywfar/types.h
+include/gwenhywfar5/gwenhywfar/url.h
+include/gwenhywfar5/gwenhywfar/urlfns.h
+include/gwenhywfar5/gwenhywfar/version.h
+include/gwenhywfar5/gwenhywfar/widget_be.h
+include/gwenhywfar5/gwenhywfar/xml.h
+include/gwenhywfar5/gwenhywfar/xml2db.h
+include/gwenhywfar5/gwenhywfar/xmlctx.h
+include/gwenhywfar5/gwenhywfar/xsdnode.h
+lib/cmake/gwengui-cpp-5.3/
+lib/cmake/gwengui-cpp-5.3/gwengui-cpp-config-version.cmake
+lib/cmake/gwengui-cpp-5.3/gwengui-cpp-config.cmake
+lib/cmake/gwengui-qt5-5.3/
+lib/cmake/gwengui-qt5-5.3/gwengui-qt5-config-version.cmake
+lib/cmake/gwengui-qt5-5.3/gwengui-qt5-config.cmake
+lib/cmake/gwenhywfar-5.3/
+lib/cmake/gwenhywfar-5.3/gwenhywfar-config-version.cmake
+lib/cmake/gwenhywfar-5.3/gwenhywfar-config.cmake
lib/gwenhywfar/
lib/gwenhywfar/plugins/
-lib/gwenhywfar/plugins/60/
-lib/gwenhywfar/plugins/60/configmgr/
-lib/gwenhywfar/plugins/60/configmgr/dir.la
-lib/gwenhywfar/plugins/60/configmgr/dir.so
-lib/gwenhywfar/plugins/60/configmgr/dir.xml
-lib/gwenhywfar/plugins/60/ct/
-lib/gwenhywfar/plugins/60/ct/ohbci.la
-lib/gwenhywfar/plugins/60/ct/ohbci.so
-lib/gwenhywfar/plugins/60/ct/ohbci.xml
-lib/gwenhywfar/plugins/60/dbio/
-lib/gwenhywfar/plugins/60/dbio/csv.la
-lib/gwenhywfar/plugins/60/dbio/csv.so
-lib/gwenhywfar/plugins/60/dbio/csv.xml
-lib/gwenhywfar/plugins/60/dbio/olddb.la
-lib/gwenhywfar/plugins/60/dbio/olddb.so
-lib/gwenhywfar/plugins/60/dbio/olddb.xml
-lib/gwenhywfar/plugins/60/dbio/xmldb.la
-lib/gwenhywfar/plugins/60/dbio/xmldb.so
-lib/gwenhywfar/plugins/60/dbio/xmldb.xml
+lib/gwenhywfar/plugins/79/
+lib/gwenhywfar/plugins/79/configmgr/
+lib/gwenhywfar/plugins/79/configmgr/dir.a
+lib/gwenhywfar/plugins/79/configmgr/dir.la
+@so lib/gwenhywfar/plugins/79/configmgr/dir.so
+lib/gwenhywfar/plugins/79/configmgr/dir.xml
+lib/gwenhywfar/plugins/79/ct/
+lib/gwenhywfar/plugins/79/ct/ohbci.a
+lib/gwenhywfar/plugins/79/ct/ohbci.la
+@so lib/gwenhywfar/plugins/79/ct/ohbci.so
+lib/gwenhywfar/plugins/79/ct/ohbci.xml
+lib/gwenhywfar/plugins/79/dbio/
+lib/gwenhywfar/plugins/79/dbio/csv.a
+lib/gwenhywfar/plugins/79/dbio/csv.la
+lib/gwenhywfar/plugins/79/dbio/csv.so.0.1
+lib/gwenhywfar/plugins/79/dbio/csv.xml
+lib/gwenhywfar/plugins/79/dbio/olddb.a
+lib/gwenhywfar/plugins/79/dbio/olddb.la
+lib/gwenhywfar/plugins/79/dbio/olddb.so.0.1
+lib/gwenhywfar/plugins/79/dbio/olddb.xml
+lib/gwenhywfar/plugins/79/dbio/xmldb.a
+lib/gwenhywfar/plugins/79/dbio/xmldb.la
+lib/gwenhywfar/plugins/79/dbio/xmldb.so.0.1
+lib/gwenhywfar/plugins/79/dbio/xmldb.xml
+@static-lib lib/libgwengui-cpp.a
lib/libgwengui-cpp.la
@lib lib/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}
-lib/libgwengui-gtk2.la
-@lib lib/libgwengui-gtk2.so.${LIBgwengui-gtk2_VERSION}
-lib/libgwengui-qt4.la
-@lib lib/libgwengui-qt4.so.${LIBgwengui-qt4_VERSION}
+@static-lib lib/libgwengui-gtk3.a
+lib/libgwengui-gtk3.la
+@lib lib/libgwengui-gtk3.so.${LIBgwengui-gtk3_VERSION}
+@static-lib lib/libgwengui-qt5.a
+lib/libgwengui-qt5.la
+@lib lib/libgwengui-qt5.so.${LIBgwengui-qt5_VERSION}
+@static-lib lib/libgwenhywfar.a
lib/libgwenhywfar.la
@lib lib/libgwenhywfar.so.${LIBgwenhywfar_VERSION}
-lib/pkgconfig/gwengui-gtk2.pc
-lib/pkgconfig/gwengui-qt4.pc
+lib/pkgconfig/gwengui-gtk3.pc
+lib/pkgconfig/gwengui-qt5.pc
lib/pkgconfig/gwenhywfar.pc
share/aclocal/gwenhywfar.m4
share/gwenhywfar/
-share/gwenhywfar/ca-bundle.crt
share/gwenhywfar/dialogs/
share/gwenhywfar/dialogs/dlg_input.dlg
share/gwenhywfar/dialogs/dlg_message.dlg
@@ -189,6 +206,7 @@ share/gwenhywfar/typemaker2/c/double_arr
share/gwenhywfar/typemaker2/c/gwen_bindata.tm2
share/gwenhywfar/typemaker2/c/gwen_buffer.tm2
share/gwenhywfar/typemaker2/c/gwen_date.tm2
+share/gwenhywfar/typemaker2/c/gwen_db_node.tm2
share/gwenhywfar/typemaker2/c/gwen_idlist64.tm2
share/gwenhywfar/typemaker2/c/gwen_multicache.tm2
share/gwenhywfar/typemaker2/c/gwen_multicache_type.tm2
@@ -198,12 +216,17 @@ share/gwenhywfar/typemaker2/c/gwen_param
share/gwenhywfar/typemaker2/c/gwen_param_tree.tm2
share/gwenhywfar/typemaker2/c/gwen_stringlist2.tm2
share/gwenhywfar/typemaker2/c/gwen_time.tm2
+share/gwenhywfar/typemaker2/c/gwen_xmlnode.tm2
+share/gwenhywfar/typemaker2/c/gwen_xmlnode_list.tm2
+share/gwenhywfar/typemaker2/c/gwen_xmlnode_list2.tm2
share/gwenhywfar/typemaker2/c/idmap_base.tm2
share/gwenhywfar/typemaker2/c/int.tm2
+share/gwenhywfar/typemaker2/c/int_array.tm2
share/gwenhywfar/typemaker2/c/int_base.tm2
share/gwenhywfar/typemaker2/c/list1_base.tm2
share/gwenhywfar/typemaker2/c/list2_base.tm2
share/gwenhywfar/typemaker2/c/struct_base.tm2
+share/gwenhywfar/typemaker2/c/tree2_base.tm2
share/gwenhywfar/typemaker2/c/tree_base.tm2
share/gwenhywfar/typemaker2/c/uint32_t.tm2
share/gwenhywfar/typemaker2/c/uint32_t_array.tm2
