Commit History - (may be incomplete: for full details, see links to repositories near top of page) |
Commit | Credits | Log message |
0.6.70_44 16 Mar 2019 21:55:51 |
tcberner |
Qt4 deprecation: Remove Qt4 and its consumes.
2019-03-15 accessibility/qt4-accessible: Qt4 has been EOL since december 2015
2019-03-15 astro/qlandkartegt: Qt4 has been EOL since december 2015
2019-03-15 astro/stellarium-qt4: Qt4 has been EOL since december 2015
2019-03-15 astro/xglobe: Qt4 has been EOL since december 2015
2019-03-15 audio/acoustid-fingerprinter: Qt4 has been EOL since december 2015
2019-03-15 audio/cueplayer: Qt4 has been EOL since december 2015
2019-03-15 audio/esperanza: Qt4 has been EOL since december 2015
2019-03-15 audio/lastfm-desktop: Qt4 has been EOL since december 2015
2019-03-15 audio/minitunes: Qt4 has been EOL since december 2015
2019-03-15 audio/mixxx20: Qt4 has been EOL since december 2015
2019-03-15 audio/mumble: Qt4 has been EOL since december 2015
2019-03-15 audio/murmur: Qt4 has been EOL since december 2015
2019-03-15 audio/puddletag: Qt4 has been EOL since december 2015 (Only the first 15 lines of the commit message are shown above ) |
0.6.70_44 16 Mar 2019 20:48:16 |
tcberner |
x11-toolkits/qwt6: remove flavors (Qt4 deprecation)
Approved by: portmgr (implicit) |
0.6.70_43 16 Mar 2019 20:16:24 |
tcberner |
devel/qca: remove flavors (Qt4 deprecation) |
0.6.70_42 16 Mar 2019 20:00:07 |
tcberner |
devel/qjson: remove flavors (Qt4 deprecation) |
0.6.70_41 18 Jan 2019 21:14:42 |
jbeich |
textproc/hunspell: update to 1.7.0
- Drop const optimization as v2 API moved to nuspell
Changes: https://github.com/hunspell/hunspell/releases/tag/v1.7.0 |
0.6.70_40 16 Jan 2019 11:13:45 |
tijl |
Fix Qt5 symbol version scripts to put the catch-all clause first. When
a symbol matches multiple clauses the last one takes precedence. If the
catch-all is last it captures everything. In the case of Qt5 libraries
this caused all symbols to have a Qt_5 label while some should have
Qt_5_PRIVATE_API. This only affects lld because GNU ld always gives the
catch-all lowest priority.
Older versions of Qt5Webengine exported some memory allocation symbols from
the bundled Chromium. Version 5.9 stopped exporting these [1] but the
symbols were kept as weak wrappers for the standard allocation functions to
maintain binary compatibility. [2][3] The problem is that the call to the
standard function in these weak wrappers is only resolved to the standard
function if there's a call to this standard function in other parts of
Qt5Webengine, because only then is there a non-weak symbol that takes
precedence over the weak one. If there's no such non-weak symbol the call (Only the first 15 lines of the commit message are shown above ) |
0.6.70_39 10 Jan 2019 15:45:35 |
tobik |
x11/leechcraft: Do not set OTLOZHU_CMAKE_OFF twice
This is mostly for completeness sake and only fixes an obvious typo.
The option remains broken. |
0.6.70_39 03 Jan 2019 14:14:50 |
riggs |
Chase update of multimedia/vlc to 3.x and retirement of multimedia/vlc3 |
0.6.70_38 25 Dec 2018 20:25:40 |
tcberner |
Change cmake default behaviour to outsource.
Ports that build out of source now simply can use "USES=cmake"
instead of "USES=cmake:outsource". Ports that fail to build
out of source now need to specify "USES=cmake:insource".
I tried to only set insource where explictely needed.
PR: 232038
Exp-run by: antoine |
0.6.70_38 16 Dec 2018 15:10:42 |
tcberner |
Update poppler to 0.72
This update brings many changes
- the build system has switched to cmake
- some ports needed to be switched to use their bundled
version of poppler:
- print/tex-luatex (r487226)
- print/tex-xetex (r487226)
- editors/opeonffice-devel
- Qt4 support has been dropped
- print/frescobaldi has been removed for this reason.
- most of the added patches can be removed with the next
upgrade of the concerning port.
PR: 233452
Exp-run by: antoine
Approved by: gnome (kwm)
Differential Revision: https://reviews.freebsd.org/D17456 |
0.6.70_37 12 Dec 2018 00:15:50 |
jbeich |
devel/boost-*: update to 1.69.0
Changes: http://www.boost.org/users/history/version_1_69_0.html
PR: 232525
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D17645 |
0.6.70_36 02 Dec 2018 21:43:38 |
antoine |
Fix LIB_DEPENDS |
0.6.70_36 02 Dec 2018 15:41:48 |
rene |
Mark QT4 ports/functionality for removal on 2019-03-15
While here, chase some KDE4 ports and functionality, these are scheduled for
removal on 2018-12-31. Change the default option/flavor to QT5 where applicable
or use alternative toolkits like GTK.
Submitted by: tcberner
Reviewed by: adridg, jhale, rene, tcberner
Approved by: portmgr (implicit, flavor hook)
Differential Revision: https://reviews.freebsd.org/D17741 |
0.6.70_36 06 Nov 2018 01:50:27 |
jbeich |
multimedia/ffmpeg: update to 4.1
Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.1:/Changelog
ABI: https://abi-laboratory.pro/tracker/timeline/ffmpeg/ |
0.6.70_35 06 Oct 2018 20:13:20 |
yuri |
net-p2p/libtorrent-rasterbar and net-p2p/libtorrent-rasterbar-python: Update
1.1.9 -> 1.1.10
Port changes for net-p2p/libtorrent-rasterbar:
* Change to cmake
* Add LICENSE_FILE
* Add USES=compiler:c++14-lang
* Remove the TEST option, add the cmake-based do-test target, but it is broken
upstream
Port changes for net-p2p/libtorrent-rasterbar-python:
* Complete redesign, made it an individual port instead of a slave
Bump 5 dependencies.
Reported by: TJ <tj@mrsk.me> |
0.6.70_34 09 Aug 2018 06:58:31 |
jbeich |
devel/boost-*: update to 1.68.0
- Switch to C++14 for libboost_system to support C++14 consumers
Changes: http://www.boost.org/users/history/version_1_68_0.html
PR: 229569
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D16165 |
0.6.70_33 28 Jun 2018 17:39:55 |
tcberner |
Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk
From now on, ports that depend on Qt4 will have to set
USES= qt:4
USE_QT= foo bar
ports depending on Qt5 will use
USES= qt:5
USE_QT= foo bar
PR: 229225
Exp-run by: antoine
Reviewed by: mat
Approved by: portmgr (antoine)
Differential Revision: -https://reviews.freebsd.org/D15540 |
0.6.70_33 02 May 2018 15:07:27 |
jbeich |
multimedia/ffmpeg: update to 4.0
- FFSERVER support was removed upstream
- libressl now uses libtls backend instead of patching openssl one
- Clang i386 no longer uses 16-byte aligned stack
Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.0:/Changelog
ABI: https://abi-laboratory.pro/tracker/timeline/ffmpeg/
PR: 227726
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D15175 |
0.6.70_32 29 Apr 2018 16:19:44 |
tcberner |
Update the QScintilla2 ports to 2.10.4 |
0.6.70_31 25 Apr 2018 17:11:22 |
tcberner |
x11-toolkits/qwt6 -- flavorize, with qt4 and qt5 variants
Submitted by: lbartoletti@tuxfamily.org (maintainer)
Approved by: portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D14462 |
0.6.70_30 18 Apr 2018 13:57:43 |
jbeich |
devel/boost-*: update to 1.67.0
Changes: http://www.boost.org/users/history/version_1_67_0.html
PR: 227427
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D15030 |
0.6.70_29 14 Apr 2018 13:16:32 |
tcberner |
devel/qjson, devel-qjson-qt5 create flavors
* additionally, give the maintainership to kde@.
Approved by: portmgr (mat), avilla (timeout)
Differential Revision: https://reviews.freebsd.org/D14650 |
0.6.70_28 12 Mar 2018 18:06:52 |
tcberner |
Update py-sip to 4.19.8 and qscintilla2 to 2.10.3
PR: 226487
Exp-run by: antoine |
0.6.70_27 23 Feb 2018 21:09:47 |
rene |
Reset vg@'s ports after he resigned.
With hat: portmgr-secretary |
0.6.70_27 18 Feb 2018 09:55:10 |
rakuco |
Update QScintilla 2.10.2.
Upstream has renamed its libraries and we no longer need to patch
devel/qscintilla-qt5 to create a library whose name does not conflict with
devel/qscintilla's. However, the library names are different so we need to bump
PORTREVISION in several ports (the SOVERSION has changed too).
Thanks to antoine for the exp-run.
PR: 225928 |
0.6.70_26 18 Jan 2018 04:11:03 |
jbeich |
devel/boost-*: update to 1.66.0
Changes: http://www.boost.org/users/history/version_1_66_0.html
PR: 223922
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D13279 |
0.6.70_25 21 Oct 2017 06:50:50 |
jbeich |
multimedia/ffmpeg: update to 3.4
Notable changes:
- i386/amd64 now depend on NASM per
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/4f9297ac3b39
- NETCDF is now MYSOFA but the dependency doesn't exist in ports yet
- SCHROEDINGER is gone per
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9
- DRM, LIBRSVG2, LIBXML2 are new options
- ABI isn't completely compatible: some structs have changed
Minor cleanup:
- Don't pass --disable-{in,out}dev when it's already blocked by disabled
dependency
- Drop redundant "Enable" from option descriptions
- Switch CDIO_DESC to use Mk/bsd.options.desc.mk
Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n3.4:/Changelog
ABI: https://abi-laboratory.pro/tracker/timeline/ffmpeg/
PR: 223057
Exp-run by: antoine |
0.6.70_24 25 Sep 2017 00:08:17 |
jbeich |
devel/boost-*: update to 1.65.1
Changes: http://www.boost.org/users/history/version_1_65_1.html
PR: 218835
Approved by: maintainer timeout (1.65.1: 2 weeks; 1.65.0: 1 month)
Tested by: jhibbits (on powerpc64, earlier version)
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D11582 |
0.6.70_23 25 Sep 2017 00:05:06 |
jbeich |
devel/boost-*: enable C++11 features
PR: 218835
Obtained from: https://github.com/DragonFlyBSD/DeltaPorts/pull/690
Approved by: maintainer timeout (2 months)
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D11582 |
0.6.70_22 24 Aug 2017 15:49:34 |
swills |
Add missed PORTREVISION bumps after recent poppler update |
0.6.70_21 02 May 2017 06:48:11 |
jbeich |
devel/boost-*: update to 1.64.0
Changes: http://www.boost.org/users/history/version_1_64_0.html
PR: 218835
Approved by: office (bapt)
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D10472 |
0.6.70_20 25 Apr 2017 08:20:31 |
riggs |
Chase ffmpeg 3.3 update (ABI changes)
PR: 218658
Submitted by: riggs |
0.6.70_19 11 Jan 2017 10:08:38 |
amdmi3 |
- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
Approved by: portmgr blanket |
0.6.70_19 07 Jan 2017 14:43:11 |
jbeich |
textproc/hunspell: update to 1.6.0
- Restore DIST_SUBDIR from r305651
- Adjust license for "or later" clause
- Restore GPLv2+/LGPL21+ license files removed upstream as
GPLv3+/LGPL3+ only affects Hunspell 2.0 (not currently built)
- Unbreak |make makepatch|
Changes: https://github.com/hunspell/hunspell/releases/tag/v1.6.0
PR: 215714
Submitted by: sunpoet (based on)
Exp-run by: antoine
MFH: 2017Q1
Differential Revision: https://reviews.freebsd.org/D8887 |
0.6.70_18 07 Jan 2017 10:42:51 |
olivierd |
Chase update of graphics/poppler (and slaves ports) in revision r430777 |
0.6.70_17 06 Jan 2017 14:24:00 |
jhale |
Update audio/chromaprint to 1.4.2
- Chromaprint itself is now licensed MIT, but it still includes LGPL21 code
- Add DOXYGEN option to build and install API docs
- Add TEST option to build regression tests
- API has changed, so some dependent ports needed to be patched (mostly
taken from their respective upstream repositories)
Changes: https://github.com/acoustid/chromaprint/blob/v1.4.2/NEWS.txt |
0.6.70_16 06 Jan 2017 08:45:04 |
jbeich |
devel/boost-*: update to 1.63.0
Changes: http://www.boost.org/users/history/version_1_63_0.html
PR: 215598
Exp-run by: antoine
Approved by: office (bapt)
MFH: 2017Q1 |
0.6.70_15 11 Dec 2016 15:22:47 |
jbeich |
multimedia/ffmpeg: update to 3.2.2
Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n3.2.2:/Changelog
PR: 207547
Submitted by: riggs, ebirth@b0ss.net (libressl fix)
Exp-run by: antoine (3 tries) |
0.6.70_14 03 Dec 2016 22:24:36 |
jbeich |
textproc/hunspell: update to 1.5.4
Changes: https://github.com/hunspell/hunspell/blob/v1.5.4/ChangeLog
PR: 214837
Exp-run by: antoine (for 1.5.3)
Approved by: office (bapt) |
0.6.70_13 26 Nov 2016 12:30:04 |
jbeich |
x11/leechcraft: unbreak with hunspell 1.5
-- Could NOT find HUNSPELL (missing: HUNSPELL_LIBRARIES)
[...]
CMake Error: The following variables are used in this project, but they are set
to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake
files:
HUNSPELL_LIBRARIES (ADVANCED)
linked by target "leechcraft_rosenthal" in directory src/plugins/rosenthal
PR: 214837
Approved by: portmgr blanket |
0.6.70_13 25 Nov 2016 08:45:54 |
jbeich |
x11/leechcraft: unbreak with ffmpeg 3.x
src/plugins/musiczombie/chroma.cpp:41:10: fatal error:
'libavutil/audioconvert.h' file not found
#include <libavutil/audioconvert.h>
^
src/plugins/musiczombie/chroma.cpp:125:35: error:
use of undeclared identifier 'avcodec_alloc_frame'
std::shared_ptr<AVFrame> frame (avcodec_alloc_frame (),
^
src/plugins/musiczombie/chroma.cpp:126:27: error:
use of undeclared identifier 'avcodec_free_frame'; did you mean
'avcodec_get_name'?
[] (AVFrame *frame) { avcodec_free_frame
(&frame); });
^~~~~~~~~~~~~~~~~~
avcodec_get_name
/usr/local/include/libavcodec/avcodec.h:6187:13: note: 'avcodec_get_name'
declared here (Only the first 15 lines of the commit message are shown above ) |
0.6.70_12 23 Nov 2016 12:45:47 |
jbeich |
devel/boost-*: update to 1.62.0
- Enable `long double` C99 math usage
- Switch 9.x back to building with GCC
Changes: http://www.boost.org/users/history/
PR: 199601
Submitted by: Chen Xu, bapt, amdmi3, truckman (based on)
Reviewed by: rakuco (kde) (earlier version)
Exp-run by: antoine (3 tries), truckman (consumers only, earlier versions)
Approved by: bapt (office) |
0.6.70_11 20 Nov 2016 09:38:09 |
gerald |
Bump PORTREVISIONS for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.8.5 to GCC 4.9.4 (at least under some
circumstances such as versions of FreeBSD or platforms).
In particular that is ports with USE_GCC=yes, USE_GCC=any, or one of
gcc-c++11-lib, openmp, nestedfct, c++11-lib as well as c++14-lang,
c++11-lang, c++0x, c11 requested via USES=compiler. |
0.6.70_10 28 Oct 2016 13:09:28 |
tcberner |
Remove wrongly used QT-related plist-subs from plist
%%QT_BINDIR%% and %%QT_LIBDIR%% represent the relative location of the
Qt binaries and libraries respectively -- they are only 'bin' and 'lib'
by chance, and should not be used that way.
Approved by: portmgr (blanket), rakuco (mentor) |
0.6.70_10 05 Sep 2016 20:02:03 |
olivierd |
Chase update of Poppler after revision r421386 |
0.6.70_9 15 Apr 2016 19:06:48 |
jhale |
- Update audio/chromaprint to 1.3.1
- Chase shlib bump
PR: 208819
Submitted by: Ben Woods <woodsb02@gmail.com> |
0.6.70_8 01 Apr 2016 14:33:58 |
mat |
Remove ${PORTSDIR}/ from dependencies, categories v, w, x, y, and z.
With hat: portmgr
Sponsored by: Absolight |
0.6.70_8 23 Mar 2016 23:26:19 |
rakuco |
Drop MAKE_JOBS_UNSAFE.
The port built fine with -j56 on Poudriere, and it also ran fine. I'm tempted
to believe whatever problems there were when the port was initially added to
the tree have since been solved, and the port should be make jobs safe now.
PR: 207191
Approved by: maintainer timeout (vg, 39 days) |
0.6.70_8 25 Feb 2016 14:15:40 |
amdmi3 |
- Explicitly specify version for libotr.so to differentiate security/libotr and
security/libotr3
Approved by: portmgr blanket |
0.6.70_8 27 Jan 2016 19:52:04 |
dim |
In x11/leechcraft, change the syntax of C++11 braced initializers with
multiple elements to correspond to C++ WG paper N3922. E.g, instead of:
auto foo { 1, 2, 3, 4 };
one should write:
auto foo = { 1, 2, 3, 4 };
This makes the port compile with clang 3.8.0 and higher, or gcc 5.0 and
higher.
Approved by: vg (maintainer)
PR: 206650
MFH: 2016Q1 |
0.6.70_8 21 Jan 2016 19:40:10 |
kwm |
Update poppler to 0.40.0. [1]
Add patches to py-poppler [2] and rubygem-poppler [3] to fix the build
of these ports with poppler 0.39+.
PR: 206293 [1]
Submitted by: olivierd@ [1]
Obtained from: ubuntu [2], rubygem-poppler upstream [3] |
0.6.70_7 03 Jan 2016 16:47:21 |
jhale |
Add patch to fix taglib version detection
Reported by: pkg-fallout |
0.6.70_7 13 Dec 2015 12:45:25 |
rakuco |
Update PyQt4 to 4.11.4, SIP to 4.17 and QScintilla2 to 2.9.1.
Bring in some long overdue updates, some of which are required for us to
later land the PyQt5 ports.
One big change with this update is that the PyQt4 ports now install their
.sip files into share/py-sip/PyQt4 instead of share/py-sip. This way we do
not end up with directories like share/py-sip/QtCore, which are especially
confusing once PyQt5 lands and starts installing files with the same names.
Other noteworthy items:
- PORTREVISION has been bumped on ports depending on devel/qscintilla2
because libqscintilla2.so's SOVERSION has changed.
- graphics/seexpr has been converted to USE_PYQT, as the file it used to
define a build-time dependency on x11-toolkits/py-qt4-gui has moved.
Once again, big thanks to Tobias Berner <tcberner@gmail.com> and Guido Falsi
(madpilot@) for their initial work on these ports as part of the effort to
land PyQt5 into the tree (see D2910 in Phabricator for an earlier version of
the PyQt5 patch set).
PR: 205143 |
0.6.70_6 27 Jul 2015 18:59:32 |
vg |
- Add LICENSE/LICENSE_FILE.
- Fix build with BITTORRENT and new libtorrent-rasterbar (obtained from
Github repo).
- Use linguisttools instead of lisguist;
- Remove Qt build tools from runtime dependencies;
- Add declarative/webkit dependencies - they're required by default;
- Remove qtdbus from core dependencies (disabled by default; can be used
by some plugins);
- Remove gettext dependency (not used).
- Explicitly depend on devel/pcre and devel/pkgconf.
- Add unaccounted devel/qjson dependency for some plugins.
- The same for gstreamer-plugins (LMP option).
- Regenerate patches.
PR: ports/201774
Submitted by: Andriy Voskoboinyk <s3erios@gmail.com> |
0.6.70_5 09 Jun 2015 16:43:10 |
amdmi3 |
- Don't include empty directories in the package
Approved by: vg |
0.6.70_4 08 Jun 2015 01:19:21 |
amdmi3 |
- Drop @dirrm* from plist
Approved by: portmgr blanket |
0.6.70_4 11 May 2015 18:34:58 |
mat |
Cleanup DIST* variables.
When appropriate:
- Try to use DISTVERSION{SUF,PRE}FIX
- Replace PORTNAME-PORTVERSION by DISTNAME
- Convert MASTER_SITES to use macros
- Other light cleanup
With hat: portmgr
Sponsored by: Absolight |
0.6.70_4 02 Dec 2014 22:44:25 |
cs |
- Update to 4.1.0
- Use striping
- Please portlint
- Bump PORTREVISION |
0.6.70_3 25 Nov 2014 12:55:54 |
makc |
Bump PORTREVISION after graphics/poppler update to 0.26.3 |
0.6.70_2 05 Oct 2014 21:30:26 |
tijl |
graphics/djvulibre:
- Add USES=libtool and bump dependent ports
- Remove threading related patches |
0.6.70_1 20 Sep 2014 17:06:47 |
gerald |
Replace USE_GCC=4.8+ by the equivalent, but preferred USE_GCC=yes. |
0.6.70_1 10 Sep 2014 20:50:37 |
gerald |
Update the default version of GCC in the Ports Collection from GCC 4.7.4
to GCC 4.8.3.
Part II, Bump PORTREVISIONs.
PR: 192025
Tested by: antoine (-exp runs)
Approved by: portmgr (implicit) |
0.6.70 04 Aug 2014 07:30:27 |
vg |
- Removed patch which included in sources |
0.6.70 04 Aug 2014 07:28:06 |
vg |
- Upgrade to 0.6.70 |
0.6.65_1 23 Jul 2014 19:53:11 |
rakuco |
Update PyQt to 4.11.1, QScintilla to 2.8.3 and SIP to 4.16.2.
... And bump PORTREVISION on ports that depend on devel/qscintilla2 due to
the shlib version change.
This is brought to you by the KDE on FreeBSD team. Besides updating to newer
upstream releases, this commit also contains a lot of under-the-hood changes
to the PyQt/QScintilla/SIP ports. Their Makefiles had accumulated a lot of
cruft over time, so it was time for some summer cleaning:
- General, belated changes:
* Use OPTIONS helpers wherever possible, stop including
<bsd.port.options.mk> when not necessary, stop checking for
${PORT_OPTIONS:MDOCS} and ${PORT_OPTIONS:MEXAMPLES} when not necessary,
add options such as DOCS and/or DEBUG where they were only checked for. (Only the first 15 lines of the commit message are shown above ) |
0.6.65 20 Jul 2014 16:13:50 |
vg |
New port: x11/leechcraft
LeechCraft is a free open source cross-platform modular live environment.
It has modules for everything:
* Full-featured web-browser with support for all major web-standards.
* Advanced multiprotocol modular IM client currently supporting XMPP (Jabber),
IRC, WLM/MSN, MRIM and quite a few other protocols and with a bunch of
features from metacontacts and Off-The-Record support to audio calls.
* Collection-oriented media player with a lot of features from gapless
playback and transcoding for removable devices to social features like
recommended artists and nearby events.
* Efficient and fast BitTorrent client with full support for the BitTorrent
protocol and all its widespread extensions and magnet links.
* Modular document viewer supporting PDF, DjVu, PostScript, MOBI and other (Only the first 15 lines of the commit message are shown above ) |