[Libreoffice-commits] .: Branch 'feature/gnumake4' - 6 commits - cppunit/makefile.mk external/prj external/wine libvisio/libvisio-0.0.2.patch libvisio/libvisio-0.0.3.patch libvisio/makefile.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:39:54 PDT 2011
cppunit/makefile.mk | 6 -
external/prj/d.lst | 2
external/wine/lib/msi.def | 234 ++++++++++++++++++++++++++++++++++++++++++
external/wine/lib/urlmon.def | 56 ++++++++++
external/wine/makefile.mk | 3
libvisio/libvisio-0.0.2.patch | 20 ---
libvisio/libvisio-0.0.3.patch | 20 +++
libvisio/makefile.mk | 6 -
8 files changed, 317 insertions(+), 30 deletions(-)
New commits:
commit 46b7e00f5b4e1281a2b3be35db70f90255374531
Merge: c9bbd4a... 09d0e63...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:23:00 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 09d0e63e2e737179ca1955bc7e35514e39c6f3d2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Jul 22 14:56:50 2011 +0200
Uploading new libvisio alpha version
diff --git a/libvisio/libvisio-0.0.2.patch b/libvisio/libvisio-0.0.2.patch
deleted file mode 100644
index 8dfba6c..0000000
--- a/libvisio/libvisio-0.0.2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libvisio-0.0.2/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.2/src/lib/libvisio_utils.h
-@@ -31,17 +31,8 @@
-
- #else
-
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
-
- #endif
-
diff --git a/libvisio/libvisio-0.0.3.patch b/libvisio/libvisio-0.0.3.patch
new file mode 100644
index 0000000..7da3ff3
--- /dev/null
+++ b/libvisio/libvisio-0.0.3.patch
@@ -0,0 +1,20 @@
+--- misc/libvisio-0.0.3/src/lib/libvisio_utils.h
++++ misc/build/libvisio-0.0.3/src/lib/libvisio_utils.h
+@@ -31,17 +31,8 @@
+
+ #else
+
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#endif
+
+ #endif
+
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 33b2a5e..1dd96de 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,11 +54,11 @@ INCPRE+=$(LIBWPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF
-TARFILE_NAME=libvisio-0.0.2
-TARFILE_MD5=979a3f3da4dc176e80fe8c6b759cb7f4
+TARFILE_NAME=libvisio-0.0.3
+TARFILE_MD5=90882496f9ff4cd6d75d61dac2f62f66
PATCH_FILES=\
- libvisio-0.0.2.patch
+ libvisio-0.0.3.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
commit 55cd6428f8d74146515774b797fca927eb74810d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 22 11:27:34 2011 +0100
ENABLE_DEBUG_STL isn't working out for us, too easy to mix with and without
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index ef669b7..7fba665 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -117,10 +117,6 @@ OUT2LIB = ooo-install/lib/libcppunit.dll.a
MY_LIBS = -lm
.END
-.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
-EXTRA_CFLAGS += -D_GLIBCXX_DEBUG
-.ENDIF
-
CONFIGURE_ACTION = ./configure
.IF "$(debug)"!=""
commit 90013f2b6f77a4be53958586f87dcbcdf4a124b2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 23:30:12 2011 +0300
MsiGetPatchInfoA and W were missing
diff --git a/external/wine/lib/msi.def b/external/wine/lib/msi.def
index c2c8838..8dcfd36 100644
--- a/external/wine/lib/msi.def
+++ b/external/wine/lib/msi.def
@@ -160,6 +160,8 @@ EXPORTS
MsiApplyPatchW at 16 @175
MsiAdvertiseScriptA at 16 @176
MsiAdvertiseScriptW at 16 @177
+ MsiGetPatchInfoA at 16 @178
+ MsiGetPatchInfoW at 16 @179
MsiEnumPatchesA at 20 @180
MsiEnumPatchesW at 20 @181
DllGetVersion at 4 @182 PRIVATE
commit 916d04bc3a17045393020cc480c4152ea9b6e26d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 23:20:58 2011 +0300
Make import libs for msi and urlmon dlls based on Wine's .def files
diff --git a/external/prj/d.lst b/external/prj/d.lst
index b090877..3891210 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -55,6 +55,8 @@ mkdir: %_DEST%\inc\external\wine
..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.*
..\%__SRC%\lib\libgdiplus.dll.a %_DEST%\lib\libgdiplus.dll.a
+..\%__SRC%\lib\libmsi.dll.a %_DEST%\lib\libmsi.dll.a
+..\%__SRC%\lib\liburlmon.dll.a %_DEST%\lib\liburlmon.dll.a
..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
diff --git a/external/wine/lib/msi.def b/external/wine/lib/msi.def
new file mode 100644
index 0000000..c2c8838
--- /dev/null
+++ b/external/wine/lib/msi.def
@@ -0,0 +1,232 @@
+; File generated automatically from ./msi.spec; do not edit!
+
+LIBRARY msi.dll
+
+EXPORTS
+ MsiAdvertiseProductA at 16 @5
+ MsiAdvertiseProductW at 16 @6
+ MsiCloseAllHandles at 0 @7
+ MsiCloseHandle at 4 @8
+ MsiCollectUserInfoA at 4 @9
+ MsiCollectUserInfoW at 4 @10
+ MsiConfigureFeatureA at 12 @11
+ MsiConfigureFeatureW at 12 @14
+ MsiConfigureProductA at 12 @15
+ MsiConfigureProductW at 12 @16
+ MsiCreateRecord at 4 @17
+ MsiDatabaseApplyTransformA at 12 @18
+ MsiDatabaseApplyTransformW at 12 @19
+ MsiDatabaseCommit at 4 @20
+ MsiDatabaseExportA at 16 @21
+ MsiDatabaseExportW at 16 @22
+ MsiDatabaseGenerateTransformA at 20 @23
+ MsiDatabaseGenerateTransformW at 20 @24
+ MsiDatabaseGetPrimaryKeysA at 12 @25
+ MsiDatabaseGetPrimaryKeysW at 12 @26
+ MsiDatabaseImportA at 12 @27
+ MsiDatabaseImportW at 12 @28
+ MsiDatabaseMergeA at 12 @29
+ MsiDatabaseMergeW at 12 @30
+ MsiDatabaseOpenViewA at 12 @31
+ MsiDatabaseOpenViewW at 12 @32
+ MsiDoActionA at 8 @33
+ MsiDoActionW at 8 @34
+ MsiEnableUIPreview at 8 @35
+ MsiEnumClientsA at 12 @36
+ MsiEnumClientsW at 12 @37
+ MsiEnumComponentQualifiersA at 24 @38
+ MsiEnumComponentQualifiersW at 24 @39
+ MsiEnumComponentsA at 8 @40
+ MsiEnumComponentsW at 8 @41
+ MsiEnumFeaturesA at 16 @42
+ MsiEnumFeaturesW at 16 @43
+ MsiEnumProductsA at 8 @44
+ MsiEnumProductsW at 8 @45
+ MsiEvaluateConditionA at 8 @46
+ MsiEvaluateConditionW at 8 @47
+ MsiGetLastErrorRecord at 0 @48
+ MsiGetActiveDatabase at 4 @49
+ MsiGetComponentStateA at 16 @50
+ MsiGetComponentStateW at 16 @51
+ MsiGetDatabaseState at 4 @52
+ MsiGetFeatureCostA at 20 @53
+ MsiGetFeatureCostW at 20 @54
+ MsiGetFeatureStateA at 16 @57
+ MsiGetFeatureStateW at 16 @58
+ MsiGetFeatureUsageA at 16 @59
+ MsiGetFeatureUsageW at 16 @60
+ MsiGetFeatureValidStatesA at 12 @61
+ MsiGetFeatureValidStatesW at 12 @62
+ MsiGetLanguage at 4 @63
+ MsiGetMode at 8 @64
+ MsiGetProductCodeA at 8 @65
+ MsiGetProductCodeW at 8 @66
+ MsiGetProductInfoA at 16 @67
+ MsiGetProductInfoW at 16 @70
+ MsiGetProductPropertyA at 16 @71
+ MsiGetProductPropertyW at 16 @72
+ MsiGetPropertyA at 16 @73
+ MsiGetPropertyW at 16 @74
+ MsiGetSourcePathA at 16 @75
+ MsiGetSourcePathW at 16 @76
+ MsiGetSummaryInformationA at 16 @77
+ MsiGetSummaryInformationW at 16 @78
+ MsiGetTargetPathA at 16 @79
+ MsiGetTargetPathW at 16 @80
+ MsiGetUserInfoA at 28 @81
+ MsiGetUserInfoW at 28 @82
+ MsiInstallMissingComponentW at 12 @84
+ MsiInstallProductA at 8 @87
+ MsiInstallProductW at 8 @88
+ MsiLocateComponentA at 12 @89
+ MsiLocateComponentW at 12 @90
+ MsiOpenDatabaseA at 12 @91
+ MsiOpenDatabaseW at 12 @92
+ MsiOpenPackageA at 8 @93
+ MsiOpenPackageW at 8 @94
+ MsiOpenProductA at 8 @95
+ MsiOpenProductW at 8 @96
+ MsiPreviewBillboardA at 12 @97
+ MsiPreviewBillboardW at 12 @98
+ MsiPreviewDialogA at 8 @99
+ MsiPreviewDialogW at 8 @100
+ MsiProcessMessage at 12 @103
+ MsiProvideComponentFromDescriptorA at 16 @105
+ MsiProvideComponentFromDescriptorW at 16 @106
+ MsiProvideQualifiedComponentA at 20 @108
+ MsiProvideQualifiedComponentW at 20 @109
+ MsiQueryFeatureStateA at 8 @110
+ MsiQueryFeatureStateW at 8 @111
+ MsiQueryProductStateA at 4 @112
+ MsiQueryProductStateW at 4 @113
+ MsiRecordDataSize at 8 @114
+ MsiRecordGetFieldCount at 4 @115
+ MsiRecordGetInteger at 8 @116
+ MsiRecordGetStringA at 16 @117
+ MsiRecordGetStringW at 16 @118
+ MsiRecordIsNull at 8 @119
+ MsiRecordReadStream at 16 @120
+ MsiRecordSetInteger at 12 @121
+ MsiRecordSetStreamA at 12 @122
+ MsiRecordSetStreamW at 12 @123
+ MsiRecordSetStringA at 12 @124
+ MsiRecordSetStringW at 12 @125
+ MsiReinstallFeatureA at 12 @126
+ MsiReinstallFeatureW at 12 @129
+ MsiReinstallProductA at 8 @130
+ MsiReinstallProductW at 8 @131
+ MsiSequenceA at 12 @132
+ MsiSequenceW at 12 @133
+ MsiSetComponentStateA at 12 @134
+ MsiSetComponentStateW at 12 @135
+ MsiSetExternalUIA at 12 @136
+ MsiSetExternalUIW at 12 @137
+ MsiSetFeatureStateA at 12 @138
+ MsiSetFeatureStateW at 12 @139
+ MsiSetInstallLevel at 8 @140
+ MsiSetInternalUI at 8 @141
+ MsiSetMode at 12 @143
+ MsiSetPropertyA at 12 @144
+ MsiSetPropertyW at 12 @145
+ MsiSetTargetPathA at 12 @146
+ MsiSetTargetPathW at 12 @147
+ MsiSummaryInfoGetPropertyA at 28 @148
+ MsiSummaryInfoGetPropertyCount at 8 @149
+ MsiSummaryInfoGetPropertyW at 28 @150
+ MsiSummaryInfoPersist at 4 @151
+ MsiSummaryInfoSetPropertyA at 24 @152
+ MsiSummaryInfoSetPropertyW at 24 @153
+ MsiUseFeatureA at 8 @154
+ MsiUseFeatureW at 8 @155
+ MsiVerifyPackageA at 4 @156
+ MsiVerifyPackageW at 4 @157
+ MsiViewClose at 4 @158
+ MsiViewExecute at 8 @159
+ MsiViewFetch at 8 @160
+ MsiViewGetErrorA at 12 @161
+ MsiViewGetErrorW at 12 @162
+ MsiViewModify at 12 @163
+ MsiDatabaseIsTablePersistentA at 8 @164
+ MsiDatabaseIsTablePersistentW at 8 @165
+ MsiViewGetColumnInfo at 12 @166
+ MsiRecordClearData at 4 @167
+ MsiEnableLogA at 12 @168
+ MsiEnableLogW at 12 @169
+ MsiFormatRecordA at 16 @170
+ MsiFormatRecordW at 16 @171
+ MsiGetComponentPathA at 16 @172
+ MsiGetComponentPathW at 16 @173
+ MsiApplyPatchA at 16 @174
+ MsiApplyPatchW at 16 @175
+ MsiAdvertiseScriptA at 16 @176
+ MsiAdvertiseScriptW at 16 @177
+ MsiEnumPatchesA at 20 @180
+ MsiEnumPatchesW at 20 @181
+ DllGetVersion at 4 @182 PRIVATE
+ MsiConfigureProductExA at 16 @189
+ MsiConfigureProductExW at 16 @190
+ MsiUseFeatureExA at 16 @192
+ MsiUseFeatureExW at 16 @193
+ MsiGetFileVersionA at 20 @194
+ MsiGetFileVersionW at 20 @195
+ MsiLoadStringA at 20 @196
+ MsiLoadStringW at 20 @197
+ MsiMessageBoxA at 24 @198
+ MsiMessageBoxW at 24 @199
+ MsiDecomposeDescriptorA at 20 @200
+ MsiDecomposeDescriptorW at 20 @201
+ MsiProvideQualifiedComponentExA at 32 @202
+ MsiProvideQualifiedComponentExW at 32 @203
+ MsiEnumRelatedProductsA at 16 @204
+ MsiEnumRelatedProductsW at 16 @205
+ MsiSourceListClearAllA at 12 @208
+ MsiSourceListClearAllW at 12 @209
+ MsiSourceListAddSourceA at 16 @210
+ MsiSourceListAddSourceW at 16 @211
+ MsiIsProductElevatedA at 8 @214
+ MsiIsProductElevatedW at 8 @215
+ MsiGetShortcutTargetA at 16 @216
+ MsiGetShortcutTargetW at 16 @217
+ MsiGetFileHashA at 12 @218
+ MsiGetFileHashW at 12 @219
+ MsiEnumComponentCostsW at 32 @221
+ MsiCreateAndVerifyInstallerDirectory at 4 @222
+ MsiGetFileSignatureInformationA at 20 @223
+ MsiGetFileSignatureInformationW at 20 @224
+ MsiProvideAssemblyA at 24 @225
+ MsiProvideAssemblyW at 24 @226
+ MsiAdvertiseProductExA at 24 @227
+ MsiAdvertiseProductExW at 24 @228
+ MsiOpenPackageExA at 12 @231
+ MsiOpenPackageExW at 12 @232
+ MsiGetPatchInfoExA at 28 @243
+ MsiGetPatchInfoExW at 28 @244
+ MsiEnumProductsExA at 32 @245
+ MsiEnumProductsExW at 32 @246
+ MsiGetProductInfoExA at 24 @247
+ MsiGetProductInfoExW at 24 @248
+ MsiQueryComponentStateA at 20 @249
+ MsiQueryComponentStateW at 20 @250
+ MsiSourceListAddSourceExA at 24 @255
+ MsiSourceListAddSourceExW at 24 @256
+ MsiSourceListClearSourceA at 20 @257
+ MsiSourceListClearSourceW at 20 @258
+ MsiSourceListEnumSourcesA at 28 @263
+ MsiSourceListEnumSourcesW at 28 @264
+ MsiSourceListGetInfoA at 28 @265
+ MsiSourceListGetInfoW at 28 @266
+ MsiSourceListSetInfoA at 24 @267
+ MsiSourceListSetInfoW at 24 @268
+ MsiEnumPatchesExA at 40 @269
+ MsiEnumPatchesExW at 40 @270
+ MsiSourceListEnumMediaDisksA at 40 @271
+ MsiSourceListEnumMediaDisksW at 40 @272
+ MsiSourceListAddMediaDiskA at 28 @273
+ MsiSourceListAddMediaDiskW at 28 @274
+ MsiDetermineApplicablePatchesA at 12 @277
+ MsiDetermineApplicablePatchesW at 12 @278
+ MsiSetExternalUIRecord at 16 @281
+ DllCanUnloadNow at 0 @282 PRIVATE
+ DllGetClassObject at 12 @283 PRIVATE
+ DllRegisterServer at 0 @284 PRIVATE
+ DllUnregisterServer at 0 @285 PRIVATE
diff --git a/external/wine/lib/urlmon.def b/external/wine/lib/urlmon.def
new file mode 100644
index 0000000..0349859
--- /dev/null
+++ b/external/wine/lib/urlmon.def
@@ -0,0 +1,56 @@
+; File generated automatically from ./urlmon.spec; do not edit!
+
+LIBRARY urlmon.dll
+
+EXPORTS
+ BindAsyncMoniker at 20 @5
+ CoGetClassObjectFromURL at 40 @6
+ CoInternetCombineUrl at 28 @8
+ CoInternetCompareUrl at 12 @9
+ CoInternetCreateSecurityManager at 12 @10
+ CoInternetCreateZoneManager at 12 @11
+ CoInternetGetSession at 12 @14
+ CoInternetParseUrl at 28 @15
+ CoInternetQueryInfo at 28 @16
+ CoInternetSetFeatureEnabled at 12 @17
+ CopyStgMedium at 8 @20
+ CreateAsyncBindCtx at 16 @21
+ CreateAsyncBindCtxEx at 24 @22
+ CreateFormatEnumerator at 12 @23
+ CreateURLMoniker at 12 @24
+ CreateURLMonikerEx at 16 @25
+ DllCanUnloadNow at 0 @26 PRIVATE
+ DllGetClassObject at 12 @27 PRIVATE
+ DllInstall at 8 @28 PRIVATE
+ DllRegisterServer at 0 @29 PRIVATE
+ DllRegisterServerEx at 0 @30 PRIVATE
+ DllUnregisterServer at 0 @31 PRIVATE
+ Extract at 8 @32
+ FaultInIEFeature at 16 @33
+ FindMimeFromData at 32 @36
+ GetClassFileOrMime at 28 @37
+ GetSoftwareUpdateInfo at 8 @41
+ HlinkNavigateString at 8 @45
+ HlinkSimpleNavigateToMoniker at 32 @46
+ HlinkSimpleNavigateToString at 32 @47
+ IsAsyncMoniker at 4 @48
+ IsLoggingEnabledA at 4 @49
+ IsLoggingEnabledW at 4 @50
+ IsValidURL at 12 @51
+ MkParseDisplayNameEx at 16 @52
+ ObtainUserAgentString at 12 @53
+ RegisterBindStatusCallback at 16 @55
+ RegisterFormatEnumerator at 12 @56
+ ReleaseBindInfo at 4 @59
+ RevokeBindStatusCallback at 8 @60
+ RevokeFormatEnumerator at 8 @61
+ URLDownloadToCacheFileA at 24 @64
+ URLDownloadToCacheFileW at 24 @65
+ URLDownloadToFileA at 20 @66
+ URLDownloadToFileW at 20 @67
+ URLOpenBlockingStreamA at 20 @69
+ URLOpenBlockingStreamW at 20 @70
+ URLOpenStreamA at 16 @73
+ URLOpenStreamW at 16 @74
+ UrlMkGetSessionOption at 20 @76
+ UrlMkSetSessionOption at 16 @77
diff --git a/external/wine/makefile.mk b/external/wine/makefile.mk
index 7a463f0..21399e5 100644
--- a/external/wine/makefile.mk
+++ b/external/wine/makefile.mk
@@ -34,8 +34,7 @@ TARGET=gdiplus
ALL:
-$(MKDIRHIER) $(OUT)/inc/wine
cp include/* $(OUT)/inc/wine
- $(DLLTOOL) --input-def lib/gdiplus.def --dllname=gdiplus.dll --output-lib=$(OUT)/lib/libgdiplus.dll.a
-
+ for L in gdiplus msi urlmon; do $(DLLTOOL) --input-def lib/$$L.def --dllname=$$L.dll --output-lib=$(OUT)/lib/lib$$L.dll.a; done
.ENDIF
.INCLUDE : target.mk
commit 17edfa4daeb6be935c02a9387db6694be726c8c9
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jul 21 22:13:50 2011 +0300
Pass also our EXTRA_CDEFS to the cppunit configury
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index f71ac55..ef669b7 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -131,7 +131,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
--disable-dependency-tracking --disable-static --disable-doxygen \
--disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS) $(DEBUGFLAG)' \
+ CXXFLAGS='$(EXTRA_CFLAGS) $(DEBUGFLAG) $(EXTRA_CDEFS)' \
LDFLAGS='$(LDFLAGS)' \
LIBS='$(MY_LIBS)'
More information about the Libreoffice-commits
mailing list