Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2017-08-02 11:54:21 +03:00
24 changed files with 527 additions and 97 deletions
@@ -132,6 +132,13 @@
</Package> </Package>
<History> <History>
<Update release="10">
<Date>2017-07-30</Date>
<Version>5.35.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9"> <Update release="9">
<Date>2017-06-20</Date> <Date>2017-06-20</Date>
<Version>5.35.0</Version> <Version>5.35.0</Version>
@@ -52,6 +52,13 @@
</Package> </Package>
<History> <History>
<Update release="10">
<Date>2017-07-30</Date>
<Version>5.35.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9"> <Update release="9">
<Date>2017-06-20</Date> <Date>2017-06-20</Date>
<Version>5.35.0</Version> <Version>5.35.0</Version>
@@ -53,6 +53,13 @@
</Package> </Package>
<History> <History>
<Update release="10">
<Date>2017-07-30</Date>
<Version>5.35.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9"> <Update release="9">
<Date>2017-06-20</Date> <Date>2017-06-20</Date>
<Version>5.35.0</Version> <Version>5.35.0</Version>
+7
View File
@@ -78,6 +78,13 @@
</Package> </Package>
<History> <History>
<Update release="11">
<Date>2017-07-30</Date>
<Version>5.10.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10"> <Update release="10">
<Date>2017-06-21</Date> <Date>2017-06-21</Date>
<Version>5.10.2</Version> <Version>5.10.2</Version>
@@ -274,6 +274,13 @@
</Package> </Package>
<History> <History>
<Update release="12">
<Date>2017-07-30</Date>
<Version>5.10.2</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11"> <Update release="11">
<Date>2017-06-21</Date> <Date>2017-06-21</Date>
<Version>5.10.2</Version> <Version>5.10.2</Version>
+7
View File
@@ -84,6 +84,13 @@
</Package> </Package>
<History> <History>
<Update release="11">
<Date>2017-07-30</Date>
<Version>5.10.2</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10"> <Update release="10">
<Date>2017-06-21</Date> <Date>2017-06-21</Date>
<Version>5.10.2</Version> <Version>5.10.2</Version>
+7
View File
@@ -190,6 +190,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2017-07-30</Date>
<Version>2.12.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2017-07-07</Date> <Date>2017-07-07</Date>
<Version>2.12.0</Version> <Version>2.12.0</Version>
@@ -63,6 +63,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2017-07-30</Date>
<Version>5.16.4</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2017-05-22</Date> <Date>2017-05-22</Date>
<Version>5.16.4</Version> <Version>5.16.4</Version>
+3 -3
View File
@@ -28,7 +28,7 @@ def setup():
--disable-more-warnings \ --disable-more-warnings \
--enable-modify-system \ --enable-modify-system \
--enable-ppp=yes \ --enable-ppp=yes \
--enable-bluez5=yes \ --enable-bluez5-dun \
--enable-concheck \ --enable-concheck \
--without-netconfig \ --without-netconfig \
--with-modem-manager-1 \ --with-modem-manager-1 \
@@ -37,7 +37,7 @@ def setup():
--with-suspend-resume=upower \ --with-suspend-resume=upower \
--with-system-ca-path=/etc/ssl/certs \ --with-system-ca-path=/etc/ssl/certs \
--with-crypto=nss \ --with-crypto=nss \
--with-dhcpcd=/sbin/dhcpcd \ --with-dhcpcd=/usr/bin/dhcpcd \
--with-pppd=/usr/sbin/pppd \ --with-pppd=/usr/sbin/pppd \
--with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
--with-dbus-sys-dir=/etc/dbus-1/system.d \ --with-dbus-sys-dir=/etc/dbus-1/system.d \
@@ -45,7 +45,7 @@ def setup():
--with-kernel-firmware-dir=/lib/firmware \ --with-kernel-firmware-dir=/lib/firmware \
--with-udev-dir=/lib/udev \ --with-udev-dir=/lib/udev \
--with-resolvconf=/etc/resolv.default.conf \ --with-resolvconf=/etc/resolv.default.conf \
--with-iptables=/usr/sbin/iptables \ --with-iptables=/sbin/iptables \
--with-dnsmasq=/usr/sbin/dnsmasq \ --with-dnsmasq=/usr/sbin/dnsmasq \
--with-systemdsystemunitdir=no \ --with-systemdsystemunitdir=no \
--with-nmtui \ --with-nmtui \
+17 -2
View File
@@ -12,14 +12,19 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Network connection manager powered by D-Bus and UDEV</Summary> <Summary>Network connection manager powered by D-Bus and UDEV</Summary>
<Description>NetworkManager attempts to keep an active network connection available at all times.</Description> <Description>NetworkManager attempts to keep an active network connection available at all times.</Description>
<Archive sha1sum="ef387c30c8fc0a1aea7c11dc6ef20afbb8c9616c" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.8/NetworkManager-1.8.0.tar.xz</Archive> <Archive sha1sum="6a927025250c3c1b2c34e419ce5ce6bcf2e0fbfe" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.8/NetworkManager-1.8.2.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile target="po/tr.po">tr.po</AdditionalFile> <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<Dependency>curl-devel</Dependency> <Dependency>curl-devel</Dependency>
<Dependency>intltool</Dependency> <Dependency>intltool</Dependency>
<!--Dependency>dhclient</Dependency--> <Dependency>dhclient</Dependency>
<Dependency>dhcpcd</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>autoconf</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>ppp-devel</Dependency> <Dependency>ppp-devel</Dependency>
<Dependency>nss-devel</Dependency> <Dependency>nss-devel</Dependency>
<Dependency>newt-devel</Dependency> <Dependency>newt-devel</Dependency>
@@ -127,6 +132,16 @@
</Package> </Package>
<History> <History>
<Update release="7">
<Date>2017-07-30</Date>
<Version>1.8.2</Version>
<Comment>Version Bump</Comment>
<Requires>
<Action package="NetworkManager">systemRestart</Action>
</Requires>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6"> <Update release="6">
<Date>2017-05-28</Date> <Date>2017-05-28</Date>
<Version>1.8.0</Version> <Version>1.8.0</Version>
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>Network connection manager GUI interface</Summary> <Summary>Network connection manager GUI interface</Summary>
<Description>network-manager-applet is a powerful graphical frontend to NetworkManager.</Description> <Description>network-manager-applet is a powerful graphical frontend to NetworkManager.</Description>
<Archive sha1sum="db5c0dc80978a71abc171226ac006c4d5f2687cc" type="tarxz">http://ftp.gnome.org/mirror/gnome.org/sources/network-manager-applet/1.8/network-manager-applet-1.8.0.tar.xz</Archive> <Archive sha1sum="84ab7fbc64f237252fd283fd27df26875d764ca9" type="tarxz">http://ftp.gnome.org/mirror/gnome.org/sources/network-manager-applet/1.8/network-manager-applet-1.8.2.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gtk-doc</Dependency> <Dependency>gtk-doc</Dependency>
<Dependency>gtk2-devel</Dependency> <Dependency>gtk2-devel</Dependency>
@@ -88,6 +88,20 @@
</Package> </Package>
<History> <History>
<Update release="8">
<Date>2017-07-30</Date>
<Version>1.8.2</Version>
<Comment>Version Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2017-07-30</Date>
<Version>1.8.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6"> <Update release="6">
<Date>2017-05-28</Date> <Date>2017-05-28</Date>
<Version>1.8.0</Version> <Version>1.8.0</Version>
+7
View File
@@ -58,6 +58,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2017-07-30</Date>
<Version>0.12.99</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2017-02-28</Date> <Date>2017-02-28</Date>
<Version>0.12.99</Version> <Version>0.12.99</Version>
+7
View File
@@ -95,6 +95,13 @@
</Package> </Package>
<History> <History>
<Update release="3">
<Date>2017-07-30</Date>
<Version>0.4.10</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2"> <Update release="2">
<Date>2017-03-08</Date> <Date>2017-03-08</Date>
<Version>0.4.10</Version> <Version>0.4.10</Version>
+3 -2
View File
@@ -17,6 +17,8 @@ ARCH = "x64"
def setup(): def setup():
shelltools.export("LC_ALL", "C") shelltools.export("LC_ALL", "C")
shelltools.system("mkdir -p third_party/node/linux/node-linux-x64/bin")
shelltools.system("ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/")
for LIB in ["flac", "harfbuzz-ng" "libwebp" ,"libxslt", "yasm"]: for LIB in ["flac", "harfbuzz-ng" "libwebp" ,"libxslt", "yasm"]:
shelltools.system('find -type f -path "*third_party/$LIB/*" \! -path "*third_party/$LIB/chromium/*" \! -path "*third_party/$LIB/google/*" \! -regex ".*\.\(gn\|gni\|isolate\|py\)" -delete') shelltools.system('find -type f -path "*third_party/$LIB/*" \! -path "*third_party/$LIB/chromium/*" \! -path "*third_party/$LIB/google/*" \! -regex ".*\.\(gn\|gni\|isolate\|py\)" -delete')
@@ -48,8 +50,7 @@ def setup():
proprietary_codecs=true \ proprietary_codecs=true \
link_pulseaudio=true \ link_pulseaudio=true \
use_pulseaudio=true \ use_pulseaudio=true \
use_vulcanize=false \ use_gtk3=true'
use_gtk3=false'
shelltools.system("tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt) shelltools.system("tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt)
shelltools.system("out/Release/gn gen out/Release --args='%s'"% opt) shelltools.system("out/Release/gn gen out/Release --args='%s'"% opt)
@@ -0,0 +1,170 @@
From 6cdb5f2ad7684302a8a66217462d2aef4c5f4632 Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@behemoth.cnc.corp.google.com>
Date: Thu, 15 Jun 2017 10:43:17 -0400
Subject: [PATCH] Clip FreeType glyph bitmap to mask.
Skia has for some time assumed that when using FT_Render_Glyph with one
of the LCD render modes that one extra pixel would be applied to each
side of the resulting bitmap. FreieType has changed to make this more
conservative when possible, so the pre-allocated SkMask and the generated
FT_Bitmap may no longer agree on the size and origin.
This change ensures the SkMask and FT_Bitmap are the same size and their
origins align. This is not an ideal long term fix, but is both simple and
localized for easy and quick back-porting, should that become necessary.
BUG=skia:6663
Change-Id: I49ec8f45376be8d867e8aef54eab79537731c310
Reviewed-on: https://skia-review.googlesource.com/20327
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
---
src/ports/SkFontHost_FreeType_common.cpp | 100 +++++++++++++++++++++++++------
1 file changed, 83 insertions(+), 17 deletions(-)
diff --git a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
index 9df7268bb4..a216fdb29c 100644
--- a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
+++ b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
@@ -395,8 +395,6 @@ void SkScalerContext_FreeType_Base::generateGlyphImage(
switch ( face->glyph->format ) {
case FT_GLYPH_FORMAT_OUTLINE: {
FT_Outline* outline = &face->glyph->outline;
- FT_BBox bbox;
- FT_Bitmap target;
int dx = 0, dy = 0;
if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
@@ -405,36 +403,97 @@ void SkScalerContext_FreeType_Base::generateGlyphImage(
// negate dy since freetype-y-goes-up and skia-y-goes-down
dy = -dy;
}
- FT_Outline_Get_CBox(outline, &bbox);
- /*
- what we really want to do for subpixel is
- offset(dx, dy)
- compute_bounds
- offset(bbox & !63)
- but that is two calls to offset, so we do the following, which
- achieves the same thing with only one offset call.
- */
- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63),
- dy - ((bbox.yMin + dy) & ~63));
+
+ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
if (SkMask::kLCD16_Format == glyph.fMaskFormat) {
+ FT_Outline_Translate(outline, dx, dy);
FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V :
FT_RENDER_MODE_LCD);
if (err) {
SK_TRACEFTR(err, "Could not render glyph.");
- sk_bzero(glyph.fImage, glyph.computeImageSize());
return;
}
+
SkMask mask;
glyph.toMask(&mask);
+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE
+ memset(mask.fImage, 0x80, mask.fBounds.height() * mask.fRowBytes);
+#endif
+ FT_GlyphSlotRec& ftGlyph = *face->glyph;
+
+ if (!SkIRect::Intersects(mask.fBounds,
+ SkIRect::MakeXYWH( ftGlyph.bitmap_left,
+ -ftGlyph.bitmap_top,
+ ftGlyph.bitmap.width,
+ ftGlyph.bitmap.rows)))
+ {
+ return;
+ }
+
+ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask.
+ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded).
+ unsigned char* origBuffer = ftGlyph.bitmap.buffer;
+ // First align the top left (origin).
+ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) {
+ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top);
+ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff;
+ ftGlyph.bitmap.rows -= topDiff;
+ ftGlyph.bitmap_top = -mask.fBounds.fTop;
+ }
+ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) {
+ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left;
+ ftGlyph.bitmap.buffer += leftDiff;
+ ftGlyph.bitmap.width -= leftDiff;
+ ftGlyph.bitmap_left = mask.fBounds.fLeft;
+ }
+ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) {
+ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop);
+ mask.fBounds.fTop = -ftGlyph.bitmap_top;
+ }
+ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) {
+ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft);
+ mask.fBounds.fLeft = ftGlyph.bitmap_left;
+ }
+ // Origins aligned, clean up the width and height.
+ int ftVertScale = (doVert ? 3 : 1);
+ int ftHoriScale = (doVert ? 1 : 3);
+ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) {
+ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale;
+ }
+ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) {
+ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale;
+ }
+ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) {
+ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale;
+ }
+ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) {
+ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale;
+ }
if (fPreBlend.isApplicable()) {
- copyFT2LCD16<true>(face->glyph->bitmap, mask, doBGR,
+ copyFT2LCD16<true>(ftGlyph.bitmap, mask, doBGR,
fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
} else {
- copyFT2LCD16<false>(face->glyph->bitmap, mask, doBGR,
+ copyFT2LCD16<false>(ftGlyph.bitmap, mask, doBGR,
fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
}
+ // Restore the buffer pointer so FreeType can properly free it.
+ ftGlyph.bitmap.buffer = origBuffer;
} else {
+ FT_BBox bbox;
+ FT_Bitmap target;
+ FT_Outline_Get_CBox(outline, &bbox);
+ /*
+ what we really want to do for subpixel is
+ offset(dx, dy)
+ compute_bounds
+ offset(bbox & !63)
+ but that is two calls to offset, so we do the following, which
+ achieves the same thing with only one offset call.
+ */
+ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63),
+ dy - ((bbox.yMin + dy) & ~63));
+
target.width = glyph.fWidth;
target.rows = glyph.fHeight;
target.pitch = glyph.rowBytes();
@@ -442,8 +501,15 @@ void SkScalerContext_FreeType_Base::generateGlyphImage(
target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat);
target.num_grays = 256;
- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
FT_Outline_Get_Bitmap(face->glyph->library, outline, &target);
+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE
+ for (int y = 0; y < glyph.fHeight; ++y) {
+ for (int x = 0; x < glyph.fWidth; ++x) {
+ uint8_t& a = ((uint8_t*)glyph.fImage)[(glyph.rowBytes() * y) + x];
+ a = SkTMax<uint8_t>(a, 0x20);
+ }
+ }
+#endif
}
} break;
--
2.13.2
@@ -0,0 +1,13 @@
Index: tools/gn/bootstrap/bootstrap.py
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/sys_info.cc',
'base/task_runner.cc',
'base/task_scheduler/delayed_task_manager.cc',
+ 'base/task_scheduler/environment_config.cc',
'base/task_scheduler/post_task.cc',
'base/task_scheduler/priority_queue.cc',
'base/task_scheduler/scheduler_lock_impl.cc',
@@ -0,0 +1,73 @@
diff -upr chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h chromium-59.0.3071.86/v8/src/objects/hash-table.h
--- chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h 2017-06-05 22:04:29.000000000 +0300
+++ chromium-59.0.3071.86/v8/src/objects/hash-table.h 2017-06-06 14:35:41.558245559 +0300
@@ -135,22 +135,10 @@ class HashTable : public HashTableBase {
public:
typedef Shape ShapeT;
- // Wrapper methods
- inline uint32_t Hash(Key key) {
- if (Shape::UsesSeed) {
- return Shape::SeededHash(key, GetHeap()->HashSeed());
- } else {
- return Shape::Hash(key);
- }
- }
-
- inline uint32_t HashForObject(Key key, Object* object) {
- if (Shape::UsesSeed) {
- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
- } else {
- return Shape::HashForObject(key, object);
- }
- }
+ // Wrapper methods. Defined in src/objects-inl.h
+ // to break a cycle with src/heap/heap.h.
+ inline uint32_t Hash(Key key);
+ inline uint32_t HashForObject(Key key, Object* object);
// Returns a new HashTable object.
MUST_USE_RESULT static Handle<Derived> New(
diff -upr chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h chromium-59.0.3071.86/v8/src/objects-body-descriptors.h
--- chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h 2017-06-05 22:04:29.000000000 +0300
+++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h 2017-06-06 14:35:41.554912132 +0300
@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
template <typename StaticVisitor>
static inline void IterateBody(HeapObject* obj, int object_size) {
- IterateBody(obj);
+ IterateBody<StaticVisitor>(obj);
}
};
diff -upr chromium-59.0.3071.86.orig/v8/src/objects-inl.h chromium-59.0.3071.86/v8/src/objects-inl.h
--- chromium-59.0.3071.86.orig/v8/src/objects-inl.h 2017-06-05 22:04:29.000000000 +0300
+++ chromium-59.0.3071.86/v8/src/objects-inl.h 2017-06-06 14:35:41.558245559 +0300
@@ -46,6 +46,27 @@
namespace v8 {
namespace internal {
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
+ if (Shape::UsesSeed) {
+ return Shape::SeededHash(key, GetHeap()->HashSeed());
+ } else {
+ return Shape::Hash(key);
+ }
+}
+
+
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
+ Object* object) {
+ if (Shape::UsesSeed) {
+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+ } else {
+ return Shape::HashForObject(key, object);
+ }
+}
+
+
PropertyDetails::PropertyDetails(Smi* smi) {
value_ = smi->value();
}
+16 -8
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>A WebKit powered web browser</Summary> <Summary>A WebKit powered web browser</Summary>
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description> <Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
<Archive sha1sum="76a3c7ef3a90c0eebe22be3ba5af69366af60f48" type="tarxz">https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.81.tar.xz</Archive> <Archive sha1sum="10e6a8036ee90193480b27d2c08a0513abb613a4" type="tarxz">https://commondatastorage.googleapis.com/chromium-browser-official/chromium-60.0.3112.78.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>alsa-lib-devel</Dependency> <Dependency>alsa-lib-devel</Dependency>
<Dependency>at-spi2-atk-devel</Dependency> <Dependency>at-spi2-atk-devel</Dependency>
@@ -35,6 +35,7 @@
<Dependency>gdk-pixbuf-devel</Dependency> <Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>gsm-devel</Dependency> <Dependency>gsm-devel</Dependency>
<Dependency>gtk2-devel</Dependency> <Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency> <Dependency>harfbuzz-devel</Dependency>
<Dependency>hunspell-devel</Dependency> <Dependency>hunspell-devel</Dependency>
<Dependency>icu4c-devel</Dependency> <Dependency>icu4c-devel</Dependency>
@@ -87,17 +88,16 @@
<Dependency>nodejs</Dependency> <Dependency>nodejs</Dependency>
<Dependency>glibc-devel</Dependency> <Dependency>glibc-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>glib2-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--Patch level="1">chromium-52.0.2743.116-unset-madv_free.patch</Patch--> <Patch level="1">0001-Clip-FreeType-glyph-bitmap-to-mask.patch</Patch>
<Patch level="1">chromium-widevine.patch</Patch> <Patch level="1">chromium-widevine.patch</Patch>
<!--Patch level="1">chromium-icu58.patch</Patch--> <Patch level="1">chromium-v8-gcc7.patch</Patch>
<Patch level="1">pisilinux/gfx_jpeg_codec.patch</Patch> <Patch level="1">pisilinux/gfx_jpeg_codec.patch</Patch>
<Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch> <!--Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch-->
<Patch level="1">pisilinux/last_commit_position.patch</Patch> <Patch level="1">pisilinux/last_commit_position.patch</Patch>
<Patch level="1">chromium-58.0.3029.81-system_ffmpeg-1.patch</Patch> <Patch level="1">chromium-gn-bootstrap-r8.patch</Patch>
<Patch level="1">chromium-gn-bootstrap-r2.patch</Patch>
<Patch level="1">skia-avx2.patch</Patch>
</Patches> </Patches>
</Source> </Source>
<Package> <Package>
@@ -112,6 +112,7 @@
<Dependency>fontconfig</Dependency> <Dependency>fontconfig</Dependency>
<Dependency>gdk-pixbuf</Dependency> <Dependency>gdk-pixbuf</Dependency>
<Dependency>gtk2</Dependency> <Dependency>gtk2</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>libevent</Dependency> <Dependency>libevent</Dependency>
<Dependency>libjpeg-turbo</Dependency> <Dependency>libjpeg-turbo</Dependency>
<Dependency>libopus</Dependency> <Dependency>libopus</Dependency>
@@ -166,6 +167,13 @@
</Package> </Package>
<History> <History>
<Update release="11">
<Date>2017-07-31</Date>
<Version>60.0.3112.78</Version>
<Comment>Version Bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10"> <Update release="10">
<Date>2017-05-11</Date> <Date>2017-05-11</Date>
<Version>58.0.3029.81</Version> <Version>58.0.3029.81</Version>
@@ -237,4 +245,4 @@
<Email>admin@pisilinux.org</Email> <Email>admin@pisilinux.org</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
+1 -2
View File
@@ -56,7 +56,6 @@ def setup():
--with-system-curl \ --with-system-curl \
--with-system-expat \ --with-system-expat \
--with-system-graphite \ --with-system-graphite \
--with-system-glew \
--with-system-glm \ --with-system-glm \
--with-system-harfbuzz \ --with-system-harfbuzz \
--with-system-hunspell \ --with-system-hunspell \
@@ -104,7 +103,7 @@ def setup():
--with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \ --with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \
--with-parallelism=%s' % (get.makeJOBS().replace("-j",""))) --with-parallelism=%s' % (get.makeJOBS().replace("-j","")))
#--with-system-glew \
def build(): def build():
autotools.make("build-nocheck") autotools.make("build-nocheck")
@@ -1,7 +1,24 @@
diff -Nuar libreoffice-5.3.0.3/configure.ac libreoffice/configure.ac From d5a09cb1c8f61e2cfc60d8a1dfe57c1ed0a45cdc Mon Sep 17 00:00:00 2001
--- libreoffice-5.3.0.3/configure.ac 2017-01-27 01:22:46.000000000 +0300 From: David Tardon <dtardon@redhat.com>
+++ libreoffice/configure.ac 2017-03-03 11:25:53.765271189 +0300 Date: Thu, 21 Aug 2014 16:10:51 +0200
@@ -7875,9 +7875,6 @@ Subject: [PATCH] disable libe-book support
Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
---
configure.ac | 6 ------
external/Module_external.mk | 1 -
filter/Configuration_filter.mk | 8 --------
writerperfect/Library_wpftwriter.mk | 2 --
writerperfect/qa/unit/WpftImportTestBase.hxx | 3 ---
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 -----
writerperfect/source/writer/wpftwriter.component | 5 -----
7 files changed, 30 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5ec9ae6..7aed2ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7796,9 +7796,6 @@ AS_IF([test "$COM" = "MSC"],
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
@@ -11,21 +28,23 @@ diff -Nuar libreoffice-5.3.0.3/configure.ac libreoffice/configure.ac
libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
diff -Nuar libreoffice-5.3.0.3/external/Module_external.mk libreoffice/external/Module_external.mk diff --git a/external/Module_external.mk b/external/Module_external.mk
--- libreoffice-5.3.0.3/external/Module_external.mk 2017-01-27 01:22:46.000000000 +0300 index 55fce1f..2f53503 100644
+++ libreoffice/external/Module_external.mk 2017-03-03 11:26:43.746274226 +0300 --- a/external/Module_external.mk
@@ -36,7 +36,6 @@ +++ b/external/Module_external.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,CPPUNIT,cppunit) \ $(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CT2N,ct2n) \
$(call gb_Helper_optional,CURL,curl) \ $(call gb_Helper_optional,CURL,curl) \
- $(call gb_Helper_optional,EBOOK,libebook) \ - $(call gb_Helper_optional,EBOOK,libebook) \
$(call gb_Helper_optional,EPM,epm) \ $(call gb_Helper_optional,EPM,epm) \
$(call gb_Helper_optional,EPOXY,epoxy) \
$(call gb_Helper_optional,ETONYEK,libetonyek) \ $(call gb_Helper_optional,ETONYEK,libetonyek) \
$(call gb_Helper_optional,EXPAT,expat) \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter/Configuration_filter.mk index 5dd20f7..d3dc749 100644
--- libreoffice-5.3.0.3/filter/Configuration_filter.mk 2017-01-27 01:22:46.000000000 +0300 --- a/filter/Configuration_filter.mk
+++ libreoffice/filter/Configuration_filter.mk 2017-03-03 11:28:16.996279891 +0300 +++ b/filter/Configuration_filter.mk
@@ -345,10 +345,6 @@ @@ -345,10 +345,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_OOXML \ writer_OOXML \
writer_OOXML_Template \ writer_OOXML_Template \
writer_layout_dump_xml \ writer_layout_dump_xml \
@@ -36,7 +55,7 @@ diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter
writer_ApplePages \ writer_ApplePages \
MWAW_Text_Document \ MWAW_Text_Document \
Palm_Text_Document \ Palm_Text_Document \
@@ -391,10 +387,6 @@ @@ -390,10 +386,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
OOXML_Text \ OOXML_Text \
OOXML_Text_Template \ OOXML_Text_Template \
writer_layout_dump \ writer_layout_dump \
@@ -47,10 +66,11 @@ diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter
ApplePages \ ApplePages \
MWAW_Text_Document \ MWAW_Text_Document \
Palm_Text_Document \ Palm_Text_Document \
diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/writerperfect/Library_wpftwriter.mk diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
--- libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk 2017-01-27 01:22:46.000000000 +0300 index 9ec43c4..48cbd52 100644
+++ libreoffice/writerperfect/Library_wpftwriter.mk 2017-03-03 11:30:32.317288112 +0300 --- a/writerperfect/Library_wpftwriter.mk
@@ -49,7 +49,6 @@ +++ b/writerperfect/Library_wpftwriter.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
$(eval $(call gb_Library_use_externals,wpftwriter,\ $(eval $(call gb_Library_use_externals,wpftwriter,\
abw \ abw \
boost_headers \ boost_headers \
@@ -58,7 +78,7 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/w
etonyek \ etonyek \
icu_headers \ icu_headers \
icui18n \ icui18n \
@@ -67,7 +66,6 @@ @@ -65,7 +64,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/AbiWordImportFilter \ writerperfect/source/writer/AbiWordImportFilter \
@@ -66,9 +86,10 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/w
writerperfect/source/writer/MSWorksImportFilter \ writerperfect/source/writer/MSWorksImportFilter \
writerperfect/source/writer/MWAWImportFilter \ writerperfect/source/writer/MWAWImportFilter \
writerperfect/source/writer/PagesImportFilter \ writerperfect/source/writer/PagesImportFilter \
diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx libreoffice/writerperfect/qa/unit/WpftImportTestBase.hxx diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
--- libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx 2017-01-27 01:22:46.000000000 +0300 index ce70172..d73d435 100644
+++ libreoffice/writerperfect/qa/unit/WpftImportTestBase.hxx 2017-03-03 11:31:44.484292497 +0300 --- a/writerperfect/qa/unit/WpftFilterFixture.hxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
@@ -29,9 +29,6 @@ @@ -29,9 +29,6 @@
((minor) > (req_minor) \ ((minor) > (req_minor) \
|| ((minor) == (req_minor) && ((micro) >= (req_micro))))) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
@@ -79,10 +100,11 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx libr
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro)
diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx libreoffice/writerperfect/qa/unit/WpftWriterFilterTest.cxx diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
--- libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx 2017-01-27 01:22:46.000000000 +0300 index 99a6ab1..7de2c18 100644
+++ libreoffice/writerperfect/qa/unit/WpftWriterFilterTest.cxx 2017-03-03 11:33:22.738298466 +0300 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -31,10 +31,6 @@ +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
void WpftWriterFilterTest::test() void WpftWriterFilterTest::test()
{ {
@@ -93,7 +115,7 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx li
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
{ {
{"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
@@ -58,7 +54,6 @@ @@ -52,7 +48,6 @@ void WpftWriterFilterTest::test()
}; };
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
@@ -101,9 +123,10 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx li
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
diff -Nuar libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component libreoffice/writerperfect/source/writer/wpftwriter.component diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
--- libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component 2017-01-27 01:22:46.000000000 +0300 index 4c5f37f..d815802 100644
+++ libreoffice/writerperfect/source/writer/wpftwriter.component 2017-03-03 11:34:21.210302018 +0300 --- a/writerperfect/source/writer/wpftwriter.component
+++ b/writerperfect/source/writer/wpftwriter.component
@@ -38,11 +38,6 @@ @@ -38,11 +38,6 @@
<service name="com.sun.star.document.ExtendedTypeDetection"/> <service name="com.sun.star.document.ExtendedTypeDetection"/>
<service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ImportFilter"/>
@@ -116,3 +139,5 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component
<implementation name="org.libreoffice.comp.Writer.PagesImportFilter" <implementation name="org.libreoffice.comp.Writer.PagesImportFilter"
constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation"> constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
<service name="com.sun.star.document.ExtendedTypeDetection"/> <service name="com.sun.star.document.ExtendedTypeDetection"/>
--
2.9.3
+71 -47
View File
@@ -13,57 +13,69 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>LibreOffice office suite</Summary> <Summary>LibreOffice office suite</Summary>
<Description>LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office.</Description> <Description>LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office.</Description>
<Archive sha1sum="1e9dbf009ebd6cd23a6949f4f481ab0846e77bf9" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-5.3.2.2.tar.xz</Archive> <Archive sha1sum="46ed5a449c39b31927d2d12ccce02f311486e7ff" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-5.4.0.3.tar.xz</Archive>
<Archive sha1sum="9522db774f4f746c4ec52999037baca03588c70d" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-dictionaries-5.3.2.2.tar.xz</Archive> <Archive sha1sum="862e764e25953d3efd79757f018b007aa7eb63ad" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-dictionaries-5.4.0.3.tar.xz</Archive>
<Archive sha1sum="347e385a89b3e6b4a687a9d9f5d2c7f54e53f725" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-help-5.3.2.2.tar.xz</Archive> <Archive sha1sum="c972b0b43aef81e8e39dbf897efb5c8479dc2aac" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-help-5.4.0.3.tar.xz</Archive>
<Archive sha1sum="66431dacac6b9585ef0b67be0ffda9e01e0a8392" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-translations-5.3.2.2.tar.xz</Archive> <Archive sha1sum="7811e8139ee6c40b2778d41992f692e6d5a6e52e" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-translations-5.4.0.3.tar.xz</Archive>
<!--External build dependencies--> <!--External build dependencies-->
<Archive sha1sum="a0cc67aa534167bb59bcca0dc6a7db2573814542" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz</Archive> <Archive sha1sum="a0cc67aa534167bb59bcca0dc6a7db2573814542" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz</Archive>
<Archive sha1sum="1acea86fd399ed7817879d36370d3d1f8b109050" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip</Archive> <Archive sha1sum="1acea86fd399ed7817879d36370d3d1f8b109050" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip</Archive>
<Archive sha1sum="8a90669029e107b61953b90ba11545fef586c2ca" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip</Archive> <Archive sha1sum="8a90669029e107b61953b90ba11545fef586c2ca" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip</Archive>
<Archive sha1sum="2d49e11b0b711970f494294dc3698f05eb294853" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip</Archive> <Archive sha1sum="2d49e11b0b711970f494294dc3698f05eb294853" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip</Archive>
<Archive sha1sum="0a134d01e9aeb09b33f4c7450fb41abb7bed9db6" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz</Archive> <Archive sha1sum="0a134d01e9aeb09b33f4c7450fb41abb7bed9db6" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz</Archive>
<Archive sha1sum="43a7ff11dd15370d456b20a093e1ee81279163a0" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip</Archive> <Archive sha1sum="43a7ff11dd15370d456b20a093e1ee81279163a0" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip</Archive>
<Archive sha1sum="b92930010622906778f713fb8f0153fa0683d018" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip</Archive> <Archive sha1sum="b92930010622906778f713fb8f0153fa0683d018" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip</Archive>
<Archive sha1sum="3232dd31859be4f7eb443c33e8e3287f394789a0" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip</Archive> <Archive sha1sum="3232dd31859be4f7eb443c33e8e3287f394789a0" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip</Archive>
<Archive sha1sum="47b58e0ef2d856df26372a7061ae43fae6e08051" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip</Archive> <Archive sha1sum="47b58e0ef2d856df26372a7061ae43fae6e08051" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip</Archive>
<Archive sha1sum="5ecb895ffc1eff2c381fa78d2197d0c57422b3df" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip</Archive> <Archive sha1sum="5ecb895ffc1eff2c381fa78d2197d0c57422b3df" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip</Archive>
<Archive sha1sum="a637c0c3ad3be32d6814972e1c45e547c5f6359d" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip</Archive> <Archive sha1sum="a637c0c3ad3be32d6814972e1c45e547c5f6359d" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip</Archive>
<Archive sha1sum="e393beea80d36ff27b732882c706826988a64f5c" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip</Archive> <Archive sha1sum="e393beea80d36ff27b732882c706826988a64f5c" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip</Archive>
<Archive sha1sum="b19ad429273abb116432eae3af955ecaf1ab5b17" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip</Archive> <Archive sha1sum="b19ad429273abb116432eae3af955ecaf1ab5b17" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip</Archive>
<Archive sha1sum="65dfba9970bb862d09c1f9e636b86b22f05d3936" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip</Archive> <Archive sha1sum="65dfba9970bb862d09c1f9e636b86b22f05d3936" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip</Archive>
<Archive sha1sum="452eba922e4f41603539c9dc39947d2271e47093" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz</Archive> <Archive sha1sum="452eba922e4f41603539c9dc39947d2271e47093" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz</Archive>
<Archive sha1sum="dd11138668c87862b494819621ec313aaa675d36" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/language-subtag-registry-2015-08-04.tar.bz2</Archive> <Archive sha1sum="dd11138668c87862b494819621ec313aaa675d36" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/language-subtag-registry-2015-08-04.tar.bz2</Archive>
<Archive sha1sum="1169780b4a0c515b23b96c913fd9bc52ceb7fb39" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2</Archive> <Archive sha1sum="1169780b4a0c515b23b96c913fd9bc52ceb7fb39" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2</Archive>
<Archive sha1sum="c4f5760a1d21213dc52e2cf3ad9c0b9112585f36" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2</Archive> <Archive sha1sum="c4f5760a1d21213dc52e2cf3ad9c0b9112585f36" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2</Archive>
<Archive sha1sum="7168b0f40aa5c72267899601c116d2348d2f56ec" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip</Archive> <Archive sha1sum="7168b0f40aa5c72267899601c116d2348d2f56ec" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip</Archive>
<Archive sha1sum="49860235c52b0be395b216d3f33955f935036f8e" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2</Archive> <Archive sha1sum="49860235c52b0be395b216d3f33955f935036f8e" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2</Archive>
<Archive sha1sum="3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip</Archive> <Archive sha1sum="3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip</Archive>
<Archive sha1sum="1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip</Archive> <Archive sha1sum="1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip</Archive>
<Archive sha1sum="713ffc76f065390ce82016ba205415d5bffe724f" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2</Archive> <Archive sha1sum="713ffc76f065390ce82016ba205415d5bffe724f" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2</Archive>
<Archive sha1sum="0c6c11c04481cb4bfd169b4b3f58434580a96f6a" type="binary" target="libreoffice-5.3.2.2/external/tarballs">http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz</Archive> <Archive sha1sum="0c6c11c04481cb4bfd169b4b3f58434580a96f6a" type="binary" target="libreoffice-5.4.0.3/external/tarballs">http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz</Archive>
<Archive sha1sum="76497846de1f3d2ef438d79e31328107658d10be" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip</Archive> <Archive sha1sum="76497846de1f3d2ef438d79e31328107658d10be" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip</Archive>
<Archive sha1sum="0556c392beb59433e577e3517575801212201df6" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz</Archive> <Archive sha1sum="0556c392beb59433e577e3517575801212201df6" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz</Archive>
<Archive sha1sum="d4bc4d7d67ccc815a4f9c6fa54077f5fdb82a57f" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2</Archive> <Archive sha1sum="d4bc4d7d67ccc815a4f9c6fa54077f5fdb82a57f" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2</Archive>
<Archive sha1sum="94c00715ae8a31bc8e5a6a699e36c22d0020649e" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz</Archive> <Archive sha1sum="94c00715ae8a31bc8e5a6a699e36c22d0020649e" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz</Archive>
<Archive sha1sum="1e30dcdb066dfc5814029ab34dca80f38935dc2d" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2</Archive> <Archive sha1sum="1e30dcdb066dfc5814029ab34dca80f38935dc2d" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2</Archive>
<Archive sha1sum="9ba2db0c34dfb9b20f42121628b787c130502890" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2</Archive> <Archive sha1sum="9ba2db0c34dfb9b20f42121628b787c130502890" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2</Archive>
<Archive sha1sum="fb7ec416807e49cb8cb12b1e46003499fad9df5f" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2</Archive> <Archive sha1sum="fb7ec416807e49cb8cb12b1e46003499fad9df5f" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2</Archive>
<Archive sha1sum="88d8ff7220d8ec71ab3125bd69fc6d0afe225bec" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2</Archive> <Archive sha1sum="88d8ff7220d8ec71ab3125bd69fc6d0afe225bec" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2</Archive>
<Archive sha1sum="815216ecc4c8cac1cc5905ca3fb5d6168c1deac4" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz</Archive> <Archive sha1sum="815216ecc4c8cac1cc5905ca3fb5d6168c1deac4" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz</Archive>
<Archive sha1sum="c038831d84882cdf639e038e44decb1e40527591" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz</Archive> <Archive sha1sum="c038831d84882cdf639e038e44decb1e40527591" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz</Archive>
<Archive sha1sum="a0459f60e9b68c561aac05bbd3556b7e31690e44" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar</Archive> <!--Needs for LO 5.4.0 -->
<Archive sha1sum="f4772556920231cf164348e51285b0c18dfc7f5b" type="binary" target="libreoffice-5.3.2.2/external/tarballs/">http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar</Archive> <Archive sha1sum="9a926e7ee6309e539313443555535d49a2a5c9f1" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2</Archive>
<Archive sha1sum="b64a443641de3338d7d1ba17f25653a314d65d93" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz</Archive>
<Archive sha1sum="9c091c9d3db083ed4ad6b2a6a06a00be0a5ab859" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz</Archive>
<Archive sha1sum="70135df62d10db3471054bd29fb9bf48d8bc5b7c" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2</Archive>
<Archive sha1sum="e0dddc8b35cfd0acd47d1e026daa499bf887ba92" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz</Archive>
<Archive sha1sum="719ab0d7b711650c787fe9bfb51109321d21e07b" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz</Archive>
<Archive sha1sum="efa043064dbf675fd713228c6fcfcc4116feb221" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2</Archive>
<Archive sha1sum="878599a610403d4d8732e7e61e382dfca8076ab6" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2</Archive>
<Archive sha1sum="27391cf4a820b5350ea789c30661830c9a271518" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2</Archive>
<Archive sha1sum="a0459f60e9b68c561aac05bbd3556b7e31690e44" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar</Archive>
<Archive sha1sum="f4772556920231cf164348e51285b0c18dfc7f5b" type="binary" target="libreoffice-5.4.0.3/external/tarballs/">http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar</Archive>
<Patches> <Patches>
<Patch>You_make_ME_sandwich.patch</Patch> <!-- <Patch>You_make_ME_sandwich.patch</Patch> -->
<!--Fedora Patches--> <!--Fedora Patches-->
<Patch>0001-right-click-to-insert-image.patch</Patch> <!-- <Patch>0001-right-click-to-insert-image.patch</Patch> -->
<Patch>0001-installation-fix.patch</Patch> <Patch>0001-installation-fix.patch</Patch>
<Patch>0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch</Patch> <!-- <Patch>0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch</Patch> -->
<Patch>0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch</Patch> <Patch>0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch</Patch>
<Patch>0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch</Patch> <!-- <Patch>0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch</Patch> -->
<Patch>disable_libe-book.patch</Patch> <Patch>disable_libe-book.patch</Patch>
</Patches> </Patches>
<BuildDependencies> <BuildDependencies>
@@ -132,6 +144,7 @@
<Dependency>raptor2-devel</Dependency> <Dependency>raptor2-devel</Dependency>
<Dependency>rasqal-devel</Dependency> <Dependency>rasqal-devel</Dependency>
<Dependency>redland-devel</Dependency> <Dependency>redland-devel</Dependency>
<Dependency>dejavu-fonts</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -148,6 +161,7 @@
<Dependency versionFrom="13.0.4">mesa</Dependency> <Dependency versionFrom="13.0.4">mesa</Dependency>
<Dependency>nspr</Dependency> <Dependency>nspr</Dependency>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>bzip2</Dependency>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>expat</Dependency> <Dependency>expat</Dependency>
<Dependency>glib2</Dependency> <Dependency>glib2</Dependency>
@@ -155,12 +169,14 @@
<Dependency>lcms2</Dependency> <Dependency>lcms2</Dependency>
<Dependency>boost</Dependency> <Dependency>boost</Dependency>
<Dependency>libSM</Dependency> <Dependency>libSM</Dependency>
<Dependency>libXt</Dependency>
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
<Dependency>libICE</Dependency> <Dependency>libICE</Dependency>
<Dependency versionFrom="3.6.0">python3</Dependency> <Dependency versionFrom="3.6.0">python3</Dependency>
<Dependency>libXext</Dependency> <Dependency>libXext</Dependency>
<Dependency>libxml2</Dependency> <Dependency>libxml2</Dependency>
<Dependency>libxslt</Dependency> <Dependency>libxslt</Dependency>
<Dependency>openssl</Dependency>
<Dependency>poppler</Dependency> <Dependency>poppler</Dependency>
<Dependency>freetype</Dependency> <Dependency>freetype</Dependency>
<Dependency>harfbuzz</Dependency> <Dependency>harfbuzz</Dependency>
@@ -195,8 +211,9 @@
<Dependency>libcdr</Dependency> <Dependency>libcdr</Dependency>
<Dependency>libmspub</Dependency> <Dependency>libmspub</Dependency>
<Dependency>libpagemaker</Dependency> <Dependency>libpagemaker</Dependency>
<Dependency>raptor2</Dependency> <Dependency>rasqal</Dependency>
<Dependency>redland</Dependency> <Dependency>redland</Dependency>
<Dependency>dejavu-fonts</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="config">/etc</Path> <Path fileType="config">/etc</Path>
@@ -3202,10 +3219,17 @@
</Package> </Package>
<History> <History>
<Update release="7">
<Date>2017-08-01</Date>
<Version>5.4.0.3</Version>
<Comment>Version Bump.</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="6"> <Update release="6">
<Date>2017-06-20</Date> <Date>2017-04-10</Date>
<Version>5.3.2.2</Version> <Version>5.3.2.2</Version>
<Comment>Release Bump.</Comment> <Comment>Release Bump</Comment>
<Name>Ayhan Yalçınsoy</Name> <Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email> <Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update> </Update>
@@ -20,6 +20,10 @@ def build():
autotools.make() autotools.make()
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.rename("/usr/lib/pkgconfig/pygobject-3.0.pc", "py3gobject-3.0.pc")
pisitools.rename("/usr/include/pygobject-3.0/pygobject.h", "py3gobject.h")
pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README") pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README")
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
@@ -56,6 +56,13 @@
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2017-08-01</Date>
<Version>3.22.0</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2017-02-06</Date> <Date>2017-02-06</Date>
<Version>3.22.0</Version> <Version>3.22.0</Version>
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>C++ port of the famous JUnit framework for unit testing</Summary> <Summary>C++ port of the famous JUnit framework for unit testing</Summary>
<Description>cppunit is a C++ unit testing framework. It started its life as a port of JUnit to C++ by Michael Feathers.</Description> <Description>cppunit is a C++ unit testing framework. It started its life as a port of JUnit to C++ by Michael Feathers.</Description>
<Archive sha1sum="0eaf8bb1dcf4d16b12bec30d0732370390d35e6f" type="targz">http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz</Archive> <Archive sha1sum="3eba38567bad4e300f76c764f91a7301bacc716d" type="targz">http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>grep</Dependency> <Dependency>grep</Dependency>
<Dependency>libtool</Dependency> <Dependency>libtool</Dependency>
@@ -44,6 +44,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2017-08-01</Date>
<Version>1.14.0</Version>
<Comment>Version Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2017-04-11</Date> <Date>2017-04-11</Date>
<Version>1.13.2</Version> <Version>1.13.2</Version>