r22714 - gnucash/trunk/packaging/win32 - Win32 build: rename patch files to consistently end in .patch
Geert Janssens
gjanssens at code.gnucash.org
Sat Jan 19 13:27:51 EST 2013
Author: gjanssens
Date: 2013-01-19 13:27:51 -0500 (Sat, 19 Jan 2013)
New Revision: 22714
Trac: http://svn.gnucash.org/trac/changeset/22714
Added:
gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132.patch
gnucash/trunk/packaging/win32/opensp-1.5.2.patch
Removed:
gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132-patch.diff
gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff
Modified:
gnucash/trunk/packaging/win32/Makefile.am
gnucash/trunk/packaging/win32/defaults.sh
Log:
Win32 build: rename patch files to consistently end in .patch
This way they will be checked in/out in proper line ending style on all
supported platforms.
Modified: gnucash/trunk/packaging/win32/Makefile.am
===================================================================
--- gnucash/trunk/packaging/win32/Makefile.am 2013-01-19 18:27:40 UTC (rev 22713)
+++ gnucash/trunk/packaging/win32/Makefile.am 2013-01-19 18:27:51 UTC (rev 22714)
@@ -1,6 +1,6 @@
EXTRA_DIST = \
README \
- aqbanking-4.2.4-r2132-patch.diff \
+ aqbanking-4.2.4-r2132.patch \
defaults.sh \
dist.sh \
exetype.pl \
@@ -10,7 +10,7 @@
install.sh \
install-fq-mods.cmd \
libmysql.def \
- opensp-1.5.2-patch.diff \
+ opensp-1.5.2.patch \
pi.sh \
ChineseSimp-12-5.1.11.isl \
ChineseTrad-2-5.1.11.isl \
Deleted: gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132-patch.diff 2013-01-19 18:27:40 UTC (rev 22713)
+++ gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132-patch.diff 2013-01-19 18:27:51 UTC (rev 22714)
@@ -1,56 +0,0 @@
---- trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/11 19:59:25 2131
-+++ trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/13 21:47:48 2132
-@@ -531,7 +531,7 @@
- return -1;
- }
- AB_Value_AddValue(sumDEM, val);
-- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
-+ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
- AB_Value_free(val);
- if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -587,7 +587,7 @@
- return -1;
- }
- AB_Value_AddValue(sumEUR, val);
-- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
-+ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
- AB_Value_free(val);
- if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -768,7 +768,7 @@
- }
-
- /* field 5: sum of DEM values */
-- snprintf(buffer, sizeof(buffer), "%013.0lf",
-+ snprintf(buffer, sizeof(buffer), "%013.0f",
- AB_Value_GetValueAsDouble(sumDEM)*100.0);
- if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -776,7 +776,7 @@
- }
-
- /* field 6: sum of peer account ids */
-- snprintf(buffer, sizeof(buffer), "%017.0lf",
-+ snprintf(buffer, sizeof(buffer), "%017.0f",
- AB_Value_GetValueAsDouble(sumAccountIds));
- if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -784,7 +784,7 @@
- }
-
- /* field 7: sum of peer bank codes */
-- snprintf(buffer, sizeof(buffer), "%017.0lf",
-+ snprintf(buffer, sizeof(buffer), "%017.0f",
- AB_Value_GetValueAsDouble(sumBankCodes));
- if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -792,7 +792,7 @@
- }
-
- /* field 8: sum of EUR values */
-- snprintf(buffer, sizeof(buffer), "%013.0lf",
-+ snprintf(buffer, sizeof(buffer), "%013.0f",
- AB_Value_GetValueAsDouble(sumEUR)*100.0);
- if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
Copied: gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132.patch (from rev 22713, gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132-patch.diff)
===================================================================
--- gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132.patch (rev 0)
+++ gnucash/trunk/packaging/win32/aqbanking-4.2.4-r2132.patch 2013-01-19 18:27:51 UTC (rev 22714)
@@ -0,0 +1,56 @@
+--- trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/11 19:59:25 2131
++++ trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/13 21:47:48 2132
+@@ -531,7 +531,7 @@
+ return -1;
+ }
+ AB_Value_AddValue(sumDEM, val);
+- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
++ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
+ AB_Value_free(val);
+ if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -587,7 +587,7 @@
+ return -1;
+ }
+ AB_Value_AddValue(sumEUR, val);
+- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
++ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
+ AB_Value_free(val);
+ if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -768,7 +768,7 @@
+ }
+
+ /* field 5: sum of DEM values */
+- snprintf(buffer, sizeof(buffer), "%013.0lf",
++ snprintf(buffer, sizeof(buffer), "%013.0f",
+ AB_Value_GetValueAsDouble(sumDEM)*100.0);
+ if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -776,7 +776,7 @@
+ }
+
+ /* field 6: sum of peer account ids */
+- snprintf(buffer, sizeof(buffer), "%017.0lf",
++ snprintf(buffer, sizeof(buffer), "%017.0f",
+ AB_Value_GetValueAsDouble(sumAccountIds));
+ if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -784,7 +784,7 @@
+ }
+
+ /* field 7: sum of peer bank codes */
+- snprintf(buffer, sizeof(buffer), "%017.0lf",
++ snprintf(buffer, sizeof(buffer), "%017.0f",
+ AB_Value_GetValueAsDouble(sumBankCodes));
+ if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -792,7 +792,7 @@
+ }
+
+ /* field 8: sum of EUR values */
+- snprintf(buffer, sizeof(buffer), "%013.0lf",
++ snprintf(buffer, sizeof(buffer), "%013.0f",
+ AB_Value_GetValueAsDouble(sumEUR)*100.0);
+ if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2013-01-19 18:27:40 UTC (rev 22713)
+++ gnucash/trunk/packaging/win32/defaults.sh 2013-01-19 18:27:51 UTC (rev 22714)
@@ -294,7 +294,7 @@
GOFFICE_VERSION="0.8.13"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x-patch.diff
+#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x.patch
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
@@ -343,12 +343,12 @@
# OFX import in gnucash and ofx directconnect support for aqbanking
set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
-set_default OPENSP_PATCH `pwd`/opensp-1.5.2-patch.diff
+set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
LIBOFX_VERSION="0.9.4"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
-#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x-patch.diff
+#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
set_default AQBANKING5 yes
@@ -362,7 +362,7 @@
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x-patch.diff
+ #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x.patch
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -377,7 +377,7 @@
else
AQBANKING_VERSION="4.2.4"
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132-patch.diff
+ set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132.patch
set_default AQBANKING_WITH_QT yes
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
Deleted: gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff 2013-01-19 18:27:40 UTC (rev 22713)
+++ gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff 2013-01-19 18:27:51 UTC (rev 22714)
@@ -1,13 +0,0 @@
---- lib/Makefile.am~ Thu Dec 15 13:13:16 2005
-+++ lib/Makefile.am Tue Feb 6 10:57:58 2007
-@@ -76,7 +76,9 @@
- splibpch.h token.h app_inst.cxx arc_inst.cxx entmgr_inst.cxx \
- parser_inst.cxx xentmgr_inst.cxx SubstTable.cxx \
- UTF16CodingSystem.cxx Fixed4CodingSystem.cxx \
-- memcmp.c memmove.c strerror.c
-+ memcmp.c memmove.c strerror.c WinInetStorage.cxx \
-+ WinInetStorageMessages.h WinInetStorageMessages.msg \
-+ WinInetStorageMessages.rc WinApp.cxx Win32CodingSystem.cxx
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/generic
-
Copied: gnucash/trunk/packaging/win32/opensp-1.5.2.patch (from rev 22713, gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff)
===================================================================
--- gnucash/trunk/packaging/win32/opensp-1.5.2.patch (rev 0)
+++ gnucash/trunk/packaging/win32/opensp-1.5.2.patch 2013-01-19 18:27:51 UTC (rev 22714)
@@ -0,0 +1,13 @@
+--- lib/Makefile.am~ Thu Dec 15 13:13:16 2005
++++ lib/Makefile.am Tue Feb 6 10:57:58 2007
+@@ -76,7 +76,9 @@
+ splibpch.h token.h app_inst.cxx arc_inst.cxx entmgr_inst.cxx \
+ parser_inst.cxx xentmgr_inst.cxx SubstTable.cxx \
+ UTF16CodingSystem.cxx Fixed4CodingSystem.cxx \
+- memcmp.c memmove.c strerror.c
++ memcmp.c memmove.c strerror.c WinInetStorage.cxx \
++ WinInetStorageMessages.h WinInetStorageMessages.msg \
++ WinInetStorageMessages.rc WinApp.cxx Win32CodingSystem.cxx
+
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/generic
+
More information about the gnucash-changes
mailing list