Hello community, here is the log from the commit of package gwenhywfar for openSUSE:Factory checked in at 2014-02-18 14:44:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenhywfar (Old) and /work/SRC/openSUSE:Factory/.gwenhywfar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenhywfar" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenhywfar/gwenhywfar.changes 2014-01-14 21:46:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwenhywfar.new/gwenhywfar.changes 2014-02-18 14:44:33.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Feb 9 19:55:20 UTC 2014 - [email protected] + +- Update to version 4.10.0beta + + Add functions for individual plugin paths for other libraries +- Create Fox16 GUI +- Move documentation to separate package to enable multi-version + coexistence of the library + +------------------------------------------------------------------- Old: ---- gwenhywfar-4.9.0beta.tar.gz New: ---- gwenhywfar-4.10.0beta.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenhywfar.spec ++++++ --- /var/tmp/diff_new_pack.WLi1aP/_old 2014-02-18 14:44:34.000000000 +0100 +++ /var/tmp/diff_new_pack.WLi1aP/_new 2014-02-18 14:44:34.000000000 +0100 @@ -16,26 +16,32 @@ # +%define libversion 60 Name: gwenhywfar -Version: 4.9.0beta +Version: 4.10.0beta Release: 0 -Summary: Multiplatform Helper Library for Other Libraries +Summary: Multiplatform helper library for other libraries License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries Url: http://www.aqbanking.de/ Source: %{name}-%{version}.tar.gz -#Source: http://www.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-4.9.0beta.tar.gz BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: gnutls-devel -BuildRequires: gtk2-devel -BuildRequires: libgcrypt-devel +BuildRequires: gnutls-devel >= 3.0 +BuildRequires: gtk2-devel >= 1.4 +BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libopenssl-devel BuildRequires: libqt4-devel +%if 0%{?fedora} == 15 +BuildRequires: fox-devel >= 1.6 +%else +BuildRequires: fox16-devel +%endif # For doc graphs BuildRequires: graphviz BuildRequires: graphviz-gd BuildRequires: xorg-x11-fonts +Recommends: lib%{name}%{libversion} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,35 +64,41 @@ configuration files, reading and writing of XML files, and interprocess communication). -%package -n libgwenhywfar60-plugins +%package -n lib%{name}%{libversion}-plugins Summary: Multiplatform Helper Library for Other Libraries - Plugins License: LGPL-2.1+ Group: System/Libraries Requires: %{name} = %{version} -%description -n libgwenhywfar60-plugins +%description -n lib%{name}%{libversion}-plugins Gwenhywfar is a base library used to provide OS abstraction functions for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). -%package -n libgwenhywfar60 +%package -n lib%{name}%{libversion} Summary: Multiplatform Helper Library for Other Libraries License: LGPL-2.1+ Group: System/Libraries Recommends: %{name}-lang -# Needed to make lang package installable -Provides: %{name} = %{version} -Recommends: libgwenhywfar60-plugins = %{version} +Recommends: lib%{name}%{libversion}-plugins = %{version} -%description -n libgwenhywfar60 +%description -n lib%{name}%{libversion} Gwenhywfar is a base library used to provide OS abstraction functions for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some often needed functions (for example, for handling and parsing of configuration files, reading and writing of XML files, and interprocess communication). +%package -n libgwengui-cpp0 +Summary: C++ interface for Gwenhywfar +License: GPL-2.0+ and LGPL-2.1+ +Group: System/Libraries + +%description -n libgwengui-cpp0 +This package contains the C++ GUI interface for Gwenhywfar. + %package -n libgwengui-gtk2-0 Summary: Multiplatform Helper Library for Other Libraries -- GTK+ UI Backend License: LGPL-2.1+ @@ -115,14 +127,24 @@ This package provides the Qt implementation of the generic UI toolkit. +%package -n libgwengui-fox16-0 +Summary: FOX interface for Gwenhywfar +License: GPL-2.0+ and LGPL-2.1+ +Group: System/Libraries + +%description -n libgwengui-fox16-0 +This package contains the interface to the FOX toolkit +for Gwenhywfar. + %package devel Summary: Multi-Platform Helper Library for Other Libraries License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: glibc-devel +Requires: lib%{name}%{libversion} = %{version} +Requires: libgwengui-fox16-0 = %{version} Requires: libgwengui-gtk2-0 = %{version} Requires: libgwengui-qt4-0 = %{version} -Requires: libgwenhywfar60 = %{version} %description devel Gwenhywfar is a base library used to provide OS abstraction functions @@ -139,10 +161,11 @@ %configure\ --enable-release\ --enable-full-doc\ - --with-docpath=%{_datadir}/%{name}/apidoc\ - --with-openssl-libs=%{_libdir} \ - --with-qt4-libs=%{_libdir} \ + --with-docpath=%{_docdir}/%{name}/api \ --disable-static \ + --with-qt4-libs=%{_libdir} \ + --with-guis="fox16 qt4 gtk2" \ + --with-plugins-cfgmgr=all \ --with-pic %__make %{?smp_mflags} %__make srcdoc %{?smp_mflags} @@ -150,7 +173,7 @@ %install %makeinstall %makeinstall install-srcdoc -pushd %{buildroot}%{_datadir}/%{name}/apidoc +pushd %{buildroot}%{_docdir}/%{name}/api # we don't want another 'gwenhywfar' dir below docpath %__mv %{name}/* ./ rm -rf %{name} @@ -164,9 +187,13 @@ %clean rm -rf %{buildroot} -%post -n libgwenhywfar60 -p /sbin/ldconfig +%post -n lib%{name}%{libversion} -p /sbin/ldconfig + +%postun -n lib%{name}%{libversion} -p /sbin/ldconfig + +%post -n libgwengui-cpp0 -p /sbin/ldconfig -%postun -n libgwenhywfar60 -p /sbin/ldconfig +%postun -n libgwengui-cpp0 -p /sbin/ldconfig %post -n libgwengui-gtk2-0 -p /sbin/ldconfig @@ -176,6 +203,21 @@ %postun -n libgwengui-qt4-0 -p /sbin/ldconfig +%post -n libgwengui-fox16-0 -p /sbin/ldconfig + +%postun -n libgwengui-fox16-0 -p /sbin/ldconfig + +%files +%defattr (-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README TODO +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/ca-bundle.crt +%{_datadir}/%{name}/dialogs/ +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%dir %{_libdir}/%{name}/plugins/%{libversion} +%exclude %{_docdir}/%{name}/api + %files tools %defattr (-, root, root) %{_bindir}/gct-tool @@ -184,23 +226,19 @@ %{_bindir}/typemaker %{_bindir}/typemaker2 %{_bindir}/xmlmerge -%{_datadir}/gwenhywfar/typemaker2/ +%{_datadir}/%{name}/typemaker2/ -%files -n libgwenhywfar60-plugins +%files -n lib%{name}%{libversion}-plugins %defattr (-, root, root) -%{_libdir}/gwenhywfar/plugins/60/* +%{_libdir}/%{name}/plugins/%{libversion}/* -%files -n libgwenhywfar60 -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO -%{_libdir}/libgwenhywfar.so.* +%files -n lib%{name}%{libversion} +%defattr (-,root,root) +%{_libdir}/lib%{name}.so.* + +%files -n libgwengui-cpp0 +%defattr (-,root,root) %{_libdir}/libgwengui-cpp.so.* -%dir %{_datadir}/gwenhywfar/ -%{_datadir}/gwenhywfar/ca-bundle.crt -%{_datadir}/gwenhywfar/dialogs/ -%dir %{_libdir}/gwenhywfar -%dir %{_libdir}/gwenhywfar/plugins -%dir %{_libdir}/gwenhywfar/plugins/60 %files -n libgwengui-gtk2-0 %defattr (-, root, root) @@ -210,17 +248,22 @@ %defattr (-, root, root) %{_libdir}/libgwengui-qt4.so.* +%files -n libgwengui-fox16-0 +%defattr (-,root,root) +%{_libdir}/libgwengui-fox16.so.* + %files devel %defattr (-, root, root) -%{_bindir}/gwenhywfar-config +%{_bindir}/%{name}-config %dir %{_datadir}/aclocal -%{_datadir}/aclocal/gwenhywfar.m4 -%doc %{_datadir}/gwenhywfar/apidoc/ -%{_includedir}/gwenhywfar4/ +%{_datadir}/aclocal/%{name}.m4 +%doc %{_docdir}/%{name}/api/ +%{_includedir}/%{name}4/ %{_libdir}/*.so -%{_libdir}/pkgconfig/gwenhywfar.pc +%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/gwengui-gtk2.pc %{_libdir}/pkgconfig/gwengui-qt4.pc +%{_libdir}/pkgconfig/gwengui-fox16.pc %files lang -f %{name}.lang ++++++ gwenhywfar-4.9.0beta.tar.gz -> gwenhywfar-4.10.0beta.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/ChangeLog new/gwenhywfar-4.10.0beta/ChangeLog --- old/gwenhywfar-4.9.0beta/ChangeLog 2013-12-29 22:46:58.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/ChangeLog 2014-01-26 15:59:20.000000000 +0100 @@ -1,6 +1,52 @@ ------------------------------------------------------------------ -2013-12-29 22:46:51 +0100 Martin Preuss +2014-01-26 14:29:07 +0000 martin +Prepared release 4.10.0beta. +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2288 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2014-01-26 14:29:03 +0000 martin +Added functions GWEN_PathManager_InsertRelPath() and GWEN_PluginManager_InsertRelPath() +These functions insert relative paths for plugins. We need this for the +latest change in AqBanking to allow for separation of plugins per library. + +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2287 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2014-01-26 14:28:56 +0000 martin +Added a clarifying remark. +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2286 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2014-01-24 19:17:20 +0000 mlenk +Reverting previous revision 2284 +... preparing another approach. + + +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2285 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2014-01-19 20:19:47 +0000 mlenk +Add function GWEN_Register_App_Plugin_Dir() +This function allows the calling application to register an explicit +directory that is scanned for plugins before all other (default) +locations when GWEN_Init() is called. + +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2284 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2014-01-12 21:41:29 +0000 christian +Minor decrease of verbosity: Display the 'plugin has no i18n domain' text as notice, not as warning, to avoid distractions here +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2283 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2014-01-07 21:38:12 +0000 martin +SSL: Disabled new cipher selection code for now, needs further testing. +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2282 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2013-12-29 21:48:28 +0000 martin Prepared 4.9.0beta. +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2281 70169cfe-8b10-0410-8925-dcb4b91034d8 ------------------------------------------------------------------ 2013-11-30 20:07:53 +0000 martin @@ -606,42 +652,3 @@ 2013-01-19 18:51:44 +0000 martin Decreased verbosity. git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2189 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2013-01-19 18:51:39 +0000 martin -Introduced adjustable threshold for progress log messages. -The default setting will no longer show debug messages in progress logs. -You can widen the range of log messages to be show via -GWEN_Gui_SetMinProgressLogLevel(). - -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2188 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2013-01-19 18:51:34 +0000 martin -Prepared release 4.4.2beta. -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2187 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2013-01-19 15:35:52 +0000 martin -Fixed a bug which made the CSV plugin loose the last line if not terminated by LF -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2186 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2012-12-31 00:12:31 +0000 martin -Prepared release 4.4.1beta -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2185 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2012-12-31 00:12:28 +0000 martin -Fixed a typo. -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2184 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2012-12-30 23:57:33 +0000 martin -Fixed a bug. -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2183 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2012-12-30 22:18:30 +0000 martin -Prepared release 4.4.0beta -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2182 70169cfe-8b10-0410-8925-dcb4b91034d8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/configure new/gwenhywfar-4.10.0beta/configure --- old/gwenhywfar-4.9.0beta/configure 2013-12-29 22:45:35.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/configure 2014-01-26 15:58:09.000000000 +0100 @@ -2765,7 +2765,7 @@ # versions # GWENHYWFAR_VERSION_MAJOR=4 -GWENHYWFAR_VERSION_MINOR=9 +GWENHYWFAR_VERSION_MINOR=10 GWENHYWFAR_VERSION_PATCHLEVEL=0 GWENHYWFAR_VERSION_BUILD=0 GWENHYWFAR_VERSION_TAG="beta" @@ -2776,8 +2776,8 @@ # # SO version for Gwenhywfar # -GWENHYWFAR_SO_CURRENT="69" -GWENHYWFAR_SO_AGE="9" +GWENHYWFAR_SO_CURRENT="70" +GWENHYWFAR_SO_AGE="10" GWENHYWFAR_SO_REVISION="0" GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/configure.ac new/gwenhywfar-4.10.0beta/configure.ac --- old/gwenhywfar-4.9.0beta/configure.ac 2013-12-29 22:45:19.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/configure.ac 2014-01-26 15:28:18.000000000 +0100 @@ -28,7 +28,7 @@ # versions # GWENHYWFAR_VERSION_MAJOR=4 -GWENHYWFAR_VERSION_MINOR=9 +GWENHYWFAR_VERSION_MINOR=10 GWENHYWFAR_VERSION_PATCHLEVEL=0 GWENHYWFAR_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "cvs" @@ -40,8 +40,8 @@ # # SO version for Gwenhywfar # -GWENHYWFAR_SO_CURRENT="69" -GWENHYWFAR_SO_AGE="9" +GWENHYWFAR_SO_CURRENT="70" +GWENHYWFAR_SO_AGE="10" GWENHYWFAR_SO_REVISION="0" GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/gwenhywfar.spec new/gwenhywfar-4.10.0beta/gwenhywfar.spec --- old/gwenhywfar-4.9.0beta/gwenhywfar.spec 2013-12-29 22:45:41.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/gwenhywfar.spec 2014-01-26 15:58:14.000000000 +0100 @@ -3,7 +3,7 @@ %define name gwenhywfar -%define version 4.9.0beta +%define version 4.10.0beta %define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\" %define rpm_cflags \"-O2 -march=i486 -mcpu=i586\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/base/idlist64.c new/gwenhywfar-4.10.0beta/src/base/idlist64.c --- old/gwenhywfar-4.9.0beta/src/base/idlist64.c 2011-06-13 17:23:59.000000000 +0200 +++ new/gwenhywfar-4.10.0beta/src/base/idlist64.c 2014-01-12 16:59:17.000000000 +0100 @@ -273,7 +273,7 @@ sizeof(GWEN_IDTABLE64*)*(newCount-idl->idTableCount)); idl->pIdTablePointers=newPtr; idl->pIdTablePointers[idl->idTableCount]=idt; - idl->lastTableIdx=idl->idTableCount; + idl->lastTableIdx=idl->idTableCount; /* this is the idx of the new table, and it is the last one */ idl->idTableCount=newCount; } else { @@ -678,6 +678,7 @@ idl->idTableCount=GWEN_IDLIST64_STEP; } + assert(idl->lastTableIdx<idl->idTableCount); idt=idl->pIdTablePointers[idl->lastTableIdx]; if (idt==NULL || GWEN_IdTable64_IsFull(idt)) { idt=GWEN_IdTable64_new(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/base/pathmanager.c new/gwenhywfar-4.10.0beta/src/base/pathmanager.c --- old/gwenhywfar-4.9.0beta/src/base/pathmanager.c 2011-06-13 17:27:26.000000000 +0200 +++ new/gwenhywfar-4.10.0beta/src/base/pathmanager.c 2014-01-26 15:28:18.000000000 +0100 @@ -282,6 +282,95 @@ +int GWEN_PathManager_InsertRelPath(const char *callingLib, + const char *destLib, + const char *pathName, + const char *pathValue, + GWEN_PATHMANAGER_RELMODE rm) { + char cwd[256]; + + switch(rm) { + case GWEN_PathManager_RelModeCwd: { + const char *pcwd; + + pcwd=getcwd(cwd, sizeof(cwd)-1); + if (pcwd) { + GWEN_BUFFER *buf; + int rv; + + buf=GWEN_Buffer_new(0, 256, 0, 1); + GWEN_Buffer_AppendString(buf, cwd); + if (*pathValue!=GWEN_DIR_SEPARATOR) + GWEN_Buffer_AppendString(buf, GWEN_DIR_SEPARATOR_S); + GWEN_Buffer_AppendString(buf, pathValue); + rv=GWEN_PathManager_InsertPath(callingLib, destLib, pathName, + GWEN_Buffer_GetStart(buf)); + GWEN_Buffer_free(buf); + return rv; + } + else { + DBG_ERROR(GWEN_LOGDOMAIN, "getcwd(): %s", strerror(errno)); + return GWEN_ERROR_IO; + } + break; + } + + case GWEN_PathManager_RelModeExe: { + int rv; + + rv=GWEN_Directory_GetPrefixDirectory(cwd, sizeof(cwd)-1); + if (rv) { + DBG_INFO(GWEN_LOGDOMAIN, "here (%d)", rv); + return rv; + } + else { + GWEN_BUFFER *buf; + + buf=GWEN_Buffer_new(0, 256, 0, 1); + GWEN_Buffer_AppendString(buf, cwd); + if (*pathValue!=GWEN_DIR_SEPARATOR) + GWEN_Buffer_AppendString(buf, GWEN_DIR_SEPARATOR_S); + GWEN_Buffer_AppendString(buf, pathValue); + DBG_INFO(GWEN_LOGDOMAIN, + "Adding path [%s]", + GWEN_Buffer_GetStart(buf)); + rv=GWEN_PathManager_InsertPath(callingLib, destLib, pathName, + GWEN_Buffer_GetStart(buf)); + GWEN_Buffer_free(buf); + return rv; + } + } + + case GWEN_PathManager_RelModeHome: { + GWEN_BUFFER *buf; + int rv; + + rv=GWEN_Directory_GetHomeDirectory(cwd, sizeof(cwd)-1); + if (rv) { + DBG_ERROR(GWEN_LOGDOMAIN, + "Could not determine HOME directory (%d)", + rv); + return rv; + } + buf=GWEN_Buffer_new(0, 256, 0, 1); + GWEN_Buffer_AppendString(buf, cwd); + if (*pathValue!=GWEN_DIR_SEPARATOR) + GWEN_Buffer_AppendString(buf, GWEN_DIR_SEPARATOR_S); + GWEN_Buffer_AppendString(buf, pathValue); + rv=GWEN_PathManager_InsertPath(callingLib, destLib, pathName, + GWEN_Buffer_GetStart(buf)); + GWEN_Buffer_free(buf); + return rv; + } + + default: + DBG_INFO(GWEN_LOGDOMAIN, "Unknown relative mode %d", rm); + return GWEN_ERROR_INVALID; + } +} + + + int GWEN_PathManager_RemovePath(const char *callingLib, const char *destLib, const char *pathName, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/base/pathmanager.h new/gwenhywfar-4.10.0beta/src/base/pathmanager.h --- old/gwenhywfar-4.9.0beta/src/base/pathmanager.h 2010-07-26 12:18:53.000000000 +0200 +++ new/gwenhywfar-4.10.0beta/src/base/pathmanager.h 2014-01-26 15:28:18.000000000 +0100 @@ -242,6 +242,53 @@ const char *pathValue); /** + * Same as @ref GWEN_PathManager_InsertPath but the path to insert is given + * relative to some directory. The "relmode" argument chooses the base + * directory to which the given sub-directory path is appended and the + * result is added to this PathManager: + * + * - RelModeCwd appends the path to the current working directory at + * the time of calling. So future changes to the CWD do not affect + * this setting. + * + * - RelModeExe appends the path to the prefix of the installation + * location of the calling executable. This function looks up the + * current working directory, removes the last component (i.e. the + * "/bin/") to get the prefix, then adds the given relative path to + * it. + * + * - RelModeHome appends the path to the return value of + * GWEN_Directory_GetHomeDirectory(). + * + * All three variantes will then add the resulting path + * to the PathManager. + * + * @param callingLib The name of the library that adds this path entry. + * + * @param destLib The name of the library that this path is supposed to + * belong to. + * + * @param pathName A string identifier for this registered path. + * + * @param pathValue The actual directory path relative to the prefix + * of the current working directory that should be added to this + * registered path. + * + * @param rm The Flag to choose the starting directory to which the + * path is appended. + * + * @return Zero on success, or GWEN_ERROR_NOT_FOUND if the @c + * pathName was not found. + */ +GWENHYWFAR_API +int GWEN_PathManager_InsertRelPath(const char *callingLib, + const char *destLib, + const char *pathName, + const char *pathValue, + GWEN_PATHMANAGER_RELMODE rm); + + +/** * Removes a directory path entry from a registered path entry in * the global GWEN_PathManager. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/base/plugin.c new/gwenhywfar-4.10.0beta/src/base/plugin.c --- old/gwenhywfar-4.9.0beta/src/base/plugin.c 2011-06-13 17:27:56.000000000 +0200 +++ new/gwenhywfar-4.10.0beta/src/base/plugin.c 2014-01-26 15:28:18.000000000 +0100 @@ -245,6 +245,20 @@ +int GWEN_PluginManager_InsertRelPath(GWEN_PLUGIN_MANAGER *pm, + const char *callingLib, + const char *relpath, + GWEN_PATHMANAGER_RELMODE rm) { + assert(pm); + return GWEN_PathManager_InsertRelPath(callingLib, + pm->destLib, + pm->name, + relpath, + rm); +} + + + int GWEN_PluginManager_RemovePath(GWEN_PLUGIN_MANAGER *pm, const char *callingLib, const char *s) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/base/plugin.h new/gwenhywfar-4.10.0beta/src/base/plugin.h --- old/gwenhywfar-4.9.0beta/src/base/plugin.h 2008-07-31 19:56:06.000000000 +0200 +++ new/gwenhywfar-4.10.0beta/src/base/plugin.h 2014-01-26 15:28:18.000000000 +0100 @@ -130,6 +130,18 @@ const char *callingLib, const char *path); +/** Insert a directory path to lookup plugins from. + * The plugin manager must already be registered with Gwen (using + * @ref GWEN_PluginManager_Register) otherwise the path can not be + * added. This function uses relative paths. + */ +GWENHYWFAR_API +int GWEN_PluginManager_InsertRelPath(GWEN_PLUGIN_MANAGER *pm, + const char *callingLib, + const char *relpath, + GWEN_PATHMANAGER_RELMODE rm); + + GWENHYWFAR_API int GWEN_PluginManager_RemovePath(GWEN_PLUGIN_MANAGER *pm, const char *callingLib, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/base/plugindescr.c new/gwenhywfar-4.10.0beta/src/base/plugindescr.c --- old/gwenhywfar-4.9.0beta/src/base/plugindescr.c 2011-11-18 21:52:31.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/src/base/plugindescr.c 2014-01-26 15:28:18.000000000 +0100 @@ -73,7 +73,7 @@ p=GWEN_XMLNode_GetProperty(node, "i18n", NULL); if (!p) { - DBG_WARN(GWEN_LOGDOMAIN, "Plugin has no I18N domain, using GWEN"); + DBG_NOTICE(GWEN_LOGDOMAIN, "Plugin has no I18N domain, using GWEN"); p="gwenhywfar"; } pd->langDomain=strdup(p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/ressource.rc new/gwenhywfar-4.10.0beta/src/ressource.rc --- old/gwenhywfar-4.9.0beta/src/ressource.rc 2013-12-29 22:45:41.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/src/ressource.rc 2014-01-26 15:58:14.000000000 +0100 @@ -43,8 +43,8 @@ // Version VS_VERSION_INFO VERSIONINFO - FILEVERSION 4, 9, 0, 0 - PRODUCTVERSION 4, 9, 0, 0 + FILEVERSION 4, 10, 0, 0 + PRODUCTVERSION 4, 10, 0, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L // Windows NT @@ -58,14 +58,14 @@ //VALUE "Comments", "\0" VALUE "CompanyName", " Aquamaniac\0" VALUE "FileDescription", "Multi purpose library\0" - VALUE "FileVersion", "v4.9.0beta\0" + VALUE "FileVersion", "v4.10.0beta\0" VALUE "InternalName", "Gwenhywfar\0" VALUE "LegalCopyright", "Copyright � 2003 by Martin Preuss\0" VALUE "LegalTrademarks", "Aquamaniac\0" VALUE "OriginalFilename", "GWENHYWFAR32.DLL\0" //VALUE "PrivateBuild", "\0" VALUE "ProductName", "Gwenhywfar\0" - VALUE "ProductVersion", "v4.9.0beta-0\0" + VALUE "ProductVersion", "v4.10.0beta-0\0" VALUE "Author", "Martin Preuss\0" VALUE "Email", "[email protected]\0" VALUE "Homepage", "http://gwenhywfar.sf.net/\0"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/sio/syncio_tls.c new/gwenhywfar-4.10.0beta/src/sio/syncio_tls.c --- old/gwenhywfar-4.9.0beta/src/sio/syncio_tls.c 2013-11-30 21:02:06.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/src/sio/syncio_tls.c 2014-01-07 22:37:25.000000000 +0100 @@ -350,7 +350,8 @@ } /* set default priority */ -#if 0 /* old code */ +#if 1 /* old code */ + GWEN_Gui_ProgressLog(0, GWEN_LoggerLevel_Error, I18N("Using old SSL preparation code.")); rv=gnutls_set_default_priority(xio->session); if (rv) { DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_set_default_priority: %d (%s)", rv, gnutls_strerror(rv)); @@ -371,11 +372,12 @@ } } #else /* new code */ - { + { /* TODO: The following does not work with all servers, disabled for now */ const char *errPos=NULL; const char *ciphers_default; GWEN_BUFFER *ciphers = NULL; + GWEN_Gui_ProgressLog(0, GWEN_LoggerLevel_Error, I18N("Using new SSL preparation code.")); ciphers=GWEN_Buffer_new(0, 256, 0, 1); assert(ciphers!=NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.9.0beta/src/version.h new/gwenhywfar-4.10.0beta/src/version.h --- old/gwenhywfar-4.9.0beta/src/version.h 2013-12-29 22:45:41.000000000 +0100 +++ new/gwenhywfar-4.10.0beta/src/version.h 2014-01-26 15:58:14.000000000 +0100 @@ -31,12 +31,12 @@ #define GWEN_VERSION_MAJOR 4 #define GWENHYWFAR_VERSION_MAJOR 4 -#define GWENHYWFAR_VERSION_MINOR 9 +#define GWENHYWFAR_VERSION_MINOR 10 #define GWENHYWFAR_VERSION_PATCHLEVEL 0 #define GWENHYWFAR_VERSION_BUILD 0 #define GWENHYWFAR_VERSION_TAG "beta" -#define GWENHYWFAR_VERSION_FULL_STRING "4.9.0beta-0" -#define GWENHYWFAR_VERSION_STRING "4.9.0" +#define GWENHYWFAR_VERSION_FULL_STRING "4.10.0beta-0" +#define GWENHYWFAR_VERSION_STRING "4.10.0" #define GWENHYWFAR_SO_EFFECTIVE 60 #define GWENHYWFAR_SO_EFFECTIVE_STR "60" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
