Skip to content

Commit

Permalink
www/iridium: use libevent from ports and make sure it never mixes wit…
Browse files Browse the repository at this point in the history
…h the bundled one

(cherry picked from commit 3ec5ed2)
  • Loading branch information
rnagy authored and rene0 committed May 30, 2022
1 parent b6b7a83 commit 26d788b
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 603 deletions.
6 changes: 4 additions & 2 deletions www/iridium/Makefile
@@ -1,6 +1,6 @@
PORTNAME= iridium
PORTVERSION= 2022.04.100.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
Expand Down Expand Up @@ -36,6 +36,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libspeex.so:audio/speex \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libevent.so:devel/libevent \
libicuuc.so:devel/icu \
libjsoncpp.so:devel/jsoncpp \
libpci.so:devel/libpci \
Expand Down Expand Up @@ -232,7 +233,8 @@ pre-configure:
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
./build/linux/unbundle/replace_gn_files.py --system-libraries \
flac fontconfig freetype harfbuzz-ng libusb libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE}
flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
# Iridium uses an unreleased version of FFmpeg, so configure it
.for brand in Chrome Chromium
${CP} -R \
Expand Down
24 changes: 0 additions & 24 deletions www/iridium/files/patch-base_third__party_libevent_BUILD.gn

This file was deleted.

11 changes: 0 additions & 11 deletions www/iridium/files/patch-base_third__party_libevent_event-config.h

This file was deleted.

14 changes: 14 additions & 0 deletions www/iridium/files/patch-base_third__party_libevent_event.h
@@ -0,0 +1,14 @@
--- base/third_party/libevent/event.h.orig 2022-05-28 07:21:18 UTC
+++ base/third_party/libevent/event.h
@@ -1,3 +1,6 @@
+#if defined(USE_SYSTEM_LIBEVENT)
+#include <event.h>
+#else
/*
* Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -1210,3 +1213,4 @@ int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev
#endif
#endif /* _EVENT_H_ */
+#endif
279 changes: 0 additions & 279 deletions www/iridium/files/patch-base_third__party_libevent_openbsd_config.h

This file was deleted.

0 comments on commit 26d788b

Please sign in to comment.