From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fa82a2156ae837b91304a190e10e10d8314d2ece
Date: Fri, 29 Jan 2021 14:43:35 +0000 [thread overview]
Message-ID: <4DS0T35h05z2xdg@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5135 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via fa82a2156ae837b91304a190e10e10d8314d2ece (commit)
via 52bf6075d080ae7e1aea21b805378d4bc4efd5fa (commit)
from 9a0e00209806949435105610ad8cb63e9e9ff3db (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fa82a2156ae837b91304a190e10e10d8314d2ece
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 29 14:43:20 2021 +0000
Revert "core154: Ship freetype"
This reverts commit 45063142bed6287d29d21170873d3f67eff2aa50.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 52bf6075d080ae7e1aea21b805378d4bc4efd5fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 29 14:43:05 2021 +0000
Revert "freetype: update to 2.10.4"
This reverts commit 5653a45f813f57368bf2a32f9468ba6bd496274a.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/freetype | 10 ++++++----
config/rootfiles/core/154/filelists/freetype | 1 -
lfs/freetype | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
delete mode 120000 config/rootfiles/core/154/filelists/freetype
Difference in files:
diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype
index 194253601..4d72ec357 100644
--- a/config/rootfiles/common/freetype
+++ b/config/rootfiles/common/freetype
@@ -7,16 +7,15 @@
#usr/include/freetype2/freetype/config/ftmodule.h
#usr/include/freetype2/freetype/config/ftoption.h
#usr/include/freetype2/freetype/config/ftstdlib.h
-#usr/include/freetype2/freetype/config/integer-types.h
-#usr/include/freetype2/freetype/config/mac-support.h
-#usr/include/freetype2/freetype/config/public-macros.h
#usr/include/freetype2/freetype/freetype.h
#usr/include/freetype2/freetype/ftadvanc.h
+#usr/include/freetype2/freetype/ftautoh.h
#usr/include/freetype2/freetype/ftbbox.h
#usr/include/freetype2/freetype/ftbdf.h
#usr/include/freetype2/freetype/ftbitmap.h
#usr/include/freetype2/freetype/ftbzip2.h
#usr/include/freetype2/freetype/ftcache.h
+#usr/include/freetype2/freetype/ftcffdrv.h
#usr/include/freetype2/freetype/ftchapters.h
#usr/include/freetype2/freetype/ftcid.h
#usr/include/freetype2/freetype/ftcolor.h
@@ -48,17 +47,20 @@
#usr/include/freetype2/freetype/ftsynth.h
#usr/include/freetype2/freetype/ftsystem.h
#usr/include/freetype2/freetype/fttrigon.h
+#usr/include/freetype2/freetype/ftttdrv.h
#usr/include/freetype2/freetype/fttypes.h
#usr/include/freetype2/freetype/ftwinfnt.h
#usr/include/freetype2/freetype/t1tables.h
#usr/include/freetype2/freetype/ttnameid.h
#usr/include/freetype2/freetype/tttables.h
#usr/include/freetype2/freetype/tttags.h
+#usr/include/freetype2/freetype/ttunpat.h
#usr/include/freetype2/ft2build.h
+#usr/lib/libfreetype.a
#usr/lib/libfreetype.la
#usr/lib/libfreetype.so
usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.17.4
+usr/lib/libfreetype.so.6.17.2
#usr/lib/pkgconfig/freetype2.pc
#usr/share/aclocal/freetype2.m4
#usr/share/man/man1/freetype-config.1
diff --git a/config/rootfiles/core/154/filelists/freetype b/config/rootfiles/core/154/filelists/freetype
deleted file mode 120000
index 79ec5c42e..000000000
--- a/config/rootfiles/core/154/filelists/freetype
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/freetype
\ No newline at end of file
diff --git a/lfs/freetype b/lfs/freetype
index b9a385d88..4106d22ee 100644
--- a/lfs/freetype
+++ b/lfs/freetype
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.10.4
+VER = 2.10.2
THISAPP = freetype-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0e6c0e9b218be3ba3e26e1d23b1c80dd
+$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2021-01-29 14:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DS0T35h05z2xdg@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox