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
41680ccd
Kaydet (Commit)
41680ccd
authored
Agu 30, 2015
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
libwps: drop dep. on boost
Change-Id: Id8ac510ad96d2a845b5c14024973274fb797c000
üst
f0921814
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
4 deletions
+28
-4
0001-add-missing-include.patch
external/libwps/0001-add-missing-include.patch
+24
-0
ExternalProject_libwps.mk
external/libwps/ExternalProject_libwps.mk
+2
-2
Library_wps.mk
external/libwps/Library_wps.mk
+1
-2
UnpackedTarball_libwps.mk
external/libwps/UnpackedTarball_libwps.mk
+1
-0
No files found.
external/libwps/0001-add-missing-include.patch
0 → 100644
Dosyayı görüntüle @
41680ccd
From bc6f0f3a006123a89d1321038edeb75f2fd67c6f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 30 Aug 2015 11:21:29 +0200
Subject: [PATCH] add missing include
---
src/lib/WPS8.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/WPS8.cpp b/src/lib/WPS8.cpp
index 04c1e57..8d39fa8 100644
--- a/src/lib/WPS8.cpp
+++ b/src/lib/WPS8.cpp
@@ -19,6 +19,7 @@
* applicable instead of those above.
*/
+#include <algorithm>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
--
2.4.3
external/libwps/ExternalProject_libwps.mk
Dosyayı görüntüle @
41680ccd
...
...
@@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libwps,\
))
$(eval $(call gb_ExternalProject_use_externals,libwps,\
boost_headers \
revenge \
))
...
...
@@ -30,12 +29,13 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
, \
--enable-shared --disable-static \
) \
--with-sharedptr=c++11 \
--without-docs \
--disable-tools \
--disable-debug \
--disable-werror \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(
if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
CXXFLAGS="$(
CXXFLAGS_CXX11
) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \
...
...
external/libwps/Library_wps.mk
Dosyayı görüntüle @
41680ccd
...
...
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,wps))
$(eval $(call gb_Library_use_unpacked,wps,libwps))
$(eval $(call gb_Library_use_externals,wps,\
boost_headers \
revenge \
))
...
...
@@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,wps,\
))
$(eval $(call gb_Library_add_defs,wps,\
-DBOOST_ALL_NO_LIB \
-DBUILD_WPS\
-DDLL_EXPORT \
-DNDEBUG \
-DSHAREDPTR_STD \
))
$(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
...
...
external/libwps/UnpackedTarball_libwps.mk
Dosyayı görüntüle @
41680ccd
...
...
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
external/libwps/0001-add-missing-include.patch \
$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
))
...
...
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