Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4c1a82ac
Kaydet (Commit)
4c1a82ac
authored
Agu 22, 2011
tarafından
Jan Holesovsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix cross-build of libwps.
üst
a80493c9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
88 deletions
+13
-88
libwps-0.2.1-warnings.patch
libwps/libwps-0.2.1-warnings.patch
+0
-60
libwps-0.2.1.patch
libwps/libwps-0.2.1.patch
+0
-28
libwps-mingw.patch
libwps/libwps-mingw.patch
+11
-0
makefile.mk
libwps/makefile.mk
+2
-0
No files found.
libwps/libwps-0.2.1-warnings.patch
deleted
100644 → 0
Dosyayı görüntüle @
a80493c9
--- misc/libwps-0.2.1/src/lib/WPS8.cpp 2011-04-05 11:25:15.000000000 +0200
+++ misc/build/libwps-0.2.1/src/lib/WPS8.cpp 2011-05-03 15:02:21.107349347 +0200
@@ -136,7 +136,7 @@
input->seek(pos->second.offset, WPX_SEEK_SET);
n_streams = readU32(input);
- if (n_streams > 100) WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams));
+ if (n_streams > 100) { WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); }
/* skip mysterious header*/
input->seek(8, WPX_SEEK_CUR);
@@ -155,7 +155,7 @@
last_pos += offset;
}
offset = readU32(input);
- if (offset) WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n"));
+ if (offset) { WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); }
for (unsigned i=0; i < n_streams; i++) {
uint16_t len;
@@ -325,7 +325,7 @@
*
*/
-void WPS8Parser::readText(WPXInputStream * input, WPS8ContentListener *listener)
+void WPS8Parser::readText(WPXInputStream * /* input */, WPS8ContentListener * /* listener */)
{
#if (0)
WPS_DEBUG_MSG(("WPS8Parser::readText()\n"));
@@ -1356,7 +1356,7 @@
id += 4;
t_rem -= 4;
- if (t_count < 0 && t_count > 20) break; /* obviously wrong */
+ if (t_count > 20) break; /* obviously wrong */
} else break; /* wrong format */
}
--- misc/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-04-04 21:56:29.000000000 +0200
+++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-05-03 15:02:21.837414573 +0200
@@ -621,7 +621,7 @@
_closeParagraph();
}
-const uint16_t WPSContentListener::getSpec() const
+uint16_t WPSContentListener::getSpec() const
{
return m_ps->m_spec;
}
--- misc/libwps-0.2.1/src/lib/WPSContentListener.h 2011-04-04 21:30:56.000000000 +0200
+++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.h 2011-05-03 15:02:23.334548336 +0200
@@ -154,7 +154,7 @@
void insertEOL();
- const uint16_t getSpec() const;
+ uint16_t getSpec() const;
protected:
WPSContentListener(std::list<WPSPageSpan> &pageList, WPXDocumentInterface *documentInterface);
virtual ~WPSContentListener();
libwps/libwps-0.2.1.patch
deleted
100644 → 0
Dosyayı görüntüle @
a80493c9
--- misc/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-04-04 21:53:42.000000000 +0200
+++ misc/build/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-05-03 14:50:56.146147538 +0200
@@ -79,18 +79,15 @@
{0x419,"ru-RU"}
};
-static int _ltcomp(const void *k1, const void *k2)
-{
- int r = (int)((ssize_t)k1) - ((_lange*)k2)->id;
- return r;
-}
-
std::string getLangFromLCID(uint32_t lcid)
{
- _lange *c = (_lange*) bsearch((const void*)lcid,s_lang_table,
- sizeof(s_lang_table)/sizeof(_lange),
- sizeof(_lange),_ltcomp);
- if (c) return c->name;
+ unsigned i = 0;
+
+ for (i=0; i < sizeof(s_lang_table)/sizeof(s_lang_table[0]); i++)
+ {
+ if (s_lang_table[i].id == lcid)
+ return s_lang_table[i].name;
+ }
return "-none-";
}
libwps/libwps-mingw.patch
0 → 100644
Dosyayı görüntüle @
4c1a82ac
--- misc/build/libwps-0.2.2/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
+++ misc/build/libwps-0.2.2/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200
@@ -9,7 +9,7 @@ LIBTARGET=NO
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)$(COM)"=="WNTMSC"
CFLAGS+=-GR
.ENDIF
.IF "$(COM)"=="GCC"
libwps/makefile.mk
Dosyayı görüntüle @
4c1a82ac
...
...
@@ -51,6 +51,8 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
TARFILE_NAME
=
libwps-0.2.2
TARFILE_MD5
=
29721a16f25967d59969d5f0ae485b4a
PATCH_FILES
=
libwps-mingw.patch
BUILD_ACTION
=
dmake
$(MFLAGS)
$(CALLMACROS)
BUILD_DIR
=
src/lib
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment