diff options
113 files changed, 59 insertions, 7711 deletions
diff --git a/exlibs/wafsamba.exlib b/exlibs/wafsamba.exlib deleted file mode 100644 index 802d6ac..0000000 --- a/exlibs/wafsamba.exlib +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2011 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -myexparam wafdir='./'buildtools/bin - -require waf [ waf_executable="python2 $(exparam wafdir)/waf" ] -require python [ blacklist='3' multibuild=false ] - -export_exlib_phases src_prepare src_configure - -DEPENDENCIES=" - build: - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt -" - -EWAF_ENVIRONMENT=( - PATH="$(exparam wafdir)${PATH+:}${PATH}" - LD_LIBRARY_PATH="bin/default${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" -) - -# You should add items to -# WAF_SRC_CONFIGURE_PARAMS using += -WAF_SRC_CONFIGURE_PARAMS=( - --bundled-libraries=NONE - --mandir=/usr/share/man - --infodir=/usr/share/info - --docdir=/usr/share/doc/${PNVR} - --localstatedir=/var - --sysconfdir=/etc - --disable-dependency-tracking - --disable-rpath - --disable-rpath-install -) - -wafsamba_src_prepare() { - default - - if test -f buildtools/wafadmin/Tools/config_c.py; then - # use prefixed pkg-config - edo sed -i \ - -e "s:pkg-config:$(exhost --tool-prefix)&:" \ - buildtools/wafadmin/Tools/config_c.py - fi -} - -wafsamba_src_configure() { - PYTHONARCHDIR="$(python_get_sitedir)" \ - waf_src_configure -} diff --git a/metadata/categories.conf b/metadata/categories.conf index 89a9db8..b4971d0 100644 --- a/metadata/categories.conf +++ b/metadata/categories.conf @@ -1,29 +1,10 @@ -net-libs -net-im -net-p2p -x11-themes -sys-devel +app-backup +app-misc dev-util -dev-libs -x11-dri -kde-frameworks media-gfx -gnome-desktop -mail-client -voip -media-sound -media -net-vpn +net-im +net-libs net-misc net-print -app-backup -media-libs -sys-fs -x11-libs -x11-apps -app-misc -app-emulation -sys-libs -dev-db -net-fs -sys-apps +net-vpn +sys-devel diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf index c75ce67..7f41cf9 100644 --- a/metadata/repository_mask.conf +++ b/metadata/repository_mask.conf @@ -1,6 +1,5 @@ ( media-gfx/nomacs[~scm] - media-sound/pulseaudio[~scm] ) [[ *date = [ 28 Jun 2018 ] @@ -10,8 +9,6 @@ ( net-libs/stem[~scm] - sys-apps/sydbox[~scm] - app-emulation/wine[~scm] ) [[ *date = [ 9 Jul 2018 ] @@ -19,32 +16,3 @@ *description = [ Mask scm version ] ]] -( - x11-dri/mesa - sys-apps/sydbox - media-sound/pulseaudio - dev-libs/libclc - dev-libs/libunwind - gnome-desktop/evolution-data-server - kde-frameworks/kdnssd - mail-client/evolution - media/mpv - media-libs/libbluray - media-sound/mpd - media-sound/pulseaudio - net-fs/samba - net-misc/tor - net-misc/youtube-dl - sys-devel/qt-creator - x11-apps/redshift - x11-libs/qtbase - x11-themes/qtcurve - dev-db/ldb - dev-util/ccache - dev-util/codeblocks - net-p2p/syncthing -) -[[ - *date = [ 11 Jul 2018 ] - *description = [ Do not override existing packages with my edited variants automatically ] -]] diff --git a/packages/app-emulation/wine/wine-3.11.exheres-0 b/packages/app-emulation/wine/wine-3.11.exheres-0 deleted file mode 100644 index 94cb8d5..0000000 --- a/packages/app-emulation/wine/wine-3.11.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2009-2018 Wulf C. Krueger <philantrop@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require wine [ gecko_version=2.47 mono_version=4.7.1 compholio_version=${PV} ] - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/app-emulation/wine/wine-scm.exheres-0 b/packages/app-emulation/wine/wine-scm.exheres-0 deleted file mode 100644 index 67af6a4..0000000 --- a/packages/app-emulation/wine/wine-scm.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2009-2017 Wulf C. Krueger <philantrop@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require wine [ gecko_version=2.47 mono_version=4.6.3 compholio_version= ] - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/app-emulation/wine/wine.exlib b/packages/app-emulation/wine/wine.exlib deleted file mode 100644 index 3829994..0000000 --- a/packages/app-emulation/wine/wine.exlib +++ /dev/null @@ -1,416 +0,0 @@ -# Copyright 2009-2018 Wulf C. Krueger <philantrop@exherbo.org> -# Copyright 2015 Kylie McClain <somasis@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -myexparam compholio_version= -myexparam gecko_version -myexparam mono_version - -exparam -v COMPHOLIO_PV compholio_version - -# NOTE: see dlls/appwiz.cpl/addons.c's GECKO_VERSION/MONO_VERSION macros -exparam -v GECKO_PV gecko_version -exparam -v MONO_PV mono_version - -declare -A GECKO_NAME -GECKO_NAME=( - [i686]=${PN}_gecko-${GECKO_PV}-x86.msi - [x86_64]=${PN}_gecko-${GECKO_PV}-x86_64.msi -) -t=$(exhost --target) -MY_GECKO_NAME=${GECKO_NAME[${t%%-*}]} -unset t -MONO_NAME=${PN}-mono-${MONO_PV}.msi -STAGING_NAME=${PN}-staging -#STAGING_UNAME=${PN}-compholio -STAGING_UNAME=${STAGING_NAME} - -DOWNLOADS=" - ${GECKO_NAME[@]/#/https://dl.winehq.org/wine/wine-gecko/${GECKO_PV}/} - ${GECKO_NAME[@]/#/mirror://sourceforge/${PN}/} - mono? ( - https://dl.winehq.org/wine/wine-mono/${MONO_PV}/${MONO_NAME} - mirror://sourceforge/wine/Wine%20Mono/${MONO_PV}/${MONO_NAME} - ) -" -if [[ -n ${COMPHOLIO_PV} ]] && ! ever is_scm; then - DOWNLOADS+=" - staging? ( https://github.com/${STAGING_UNAME}/${STAGING_NAME}/archive/v${COMPHOLIO_PV}.tar.gz -> ${STAGING_UNAME}-${COMPHOLIO_PV}.tar.gz ) - " -fi - -if ever is_scm ; then - SCM_REPOSITORY="git://source.winehq.org/git/${PN}.git" - SCM_staging_REPOSITORY="https://github.com/${STAGING_UNAME}/${STAGING_NAME}.git" - require scm-git -elif [[ $(ever range 2) -eq 0 ]]; then - DOWNLOADS+=" - https://dl.winehq.org/wine/source/$(ever range 1).0/${PNV}.tar.xz - " -elif [[ $(ever range 2) -gt 0 ]]; then - DOWNLOADS+=" - https://dl.winehq.org/wine/source/$(ever range 1).x/${PNV}.tar.xz - " -else - DOWNLOADS+=" - https://dl.winehq.org/wine/source/$(ever range 1-2)/${PNV}.tar.xz - " -fi - -require freedesktop-desktop freedesktop-mime -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ none ] ] - -export_exlib_phases pkg_pretend src_prepare src_configure src_compile src_install pkg_postinst pkg_postrm - -SUMMARY="compatibility layer capable of running Windows applications" -DESCRIPTION=" -Wine is an implementation of the Windows API on top of X and Unix. It does not -require Microsoft Windows, but can use native Windows DLLs if they are available. -It provides both a development toolkit for porting Windows source code to Unix -as well as a program loader, allowing many unmodified Windows programs to run on -x86-based Unixes. -" -HOMEPAGE="http://www.winehq.org" -BUGS_TO="philantrop@exherbo.org" -REMOTE_IDS="freecode:${PN} sourceforge:${PN}" -LICENCES=" - LGPL-2.1 [[ note = [ wine ] ]] - MPL-2.0 [[ note = [ wine-gecko ] ]] - mono? ( LGPL-2 [[ note = [ wine-mono ] ]] ) -" - -if [[ -n ${COMPHOLIO_PV} ]]; then - LICENCES+=" - staging? ( LGPL-2.1 [[ note = [ wine-staging ] ]] ) - " -fi - -SLOT="0" - -MYOPTIONS=" - alsa - camera [[ description = [ Support for using digital cameras in Wine using libgphoto2 ] ]] - cups - gsm [[ description = [ Support the GSM 06.10 codec for lossy speech compression ] ]] - gstreamer [[ description = [ Use GStreamer for codecs support ] ]] - isdn [[ description = [ Support for ISDN equipment in Wine using libcapi20 ] ]] - lcms - ldap - mp3 - mono [[ description = [ Use wine-mono, a replacement for Microsoft's .NET runtime based on mono ] ]] - openal - opengl - oss - pcap [[ description = [ Support for packet capturing ] ]] - pulseaudio - samba - scanner - tiff - vulkan - win64 - ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]] -" - -if [[ -n ${COMPHOLIO_PV} ]]; then - MYOPTIONS+=" - gtk3 [[ requires = [ staging ] description = [ Add an option to use GTK3 for theming ] ]] - staging [[ description = [ Add ALL wine-staging patches containing bug fixes and features not yet available in regular wine ] ]] - vaapi [[ requires = [ staging ] description = [ Enable hardware accelerated video decode/encode ] ]] - " -fi - -DEPENDENCIES=" - build: - sys-devel/bison - sys-devel/flex[>=2.6.4] [[ note = [ https://bugs.winehq.org/show_bug.cgi?id=42132 ] ]] - sys-devel/gettext - virtual/pkg-config - x11-proto/xorgproto - build+run: - dev-libs/glib:2 - dev-libs/gnutls - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2[>=2.0.0] - media-libs/libpng:= - sys-apps/dbus - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXxf86vm - alsa? ( sys-sound/alsa-lib ) - camera? ( media-libs/libgphoto2 ) - cups? ( net-print/cups ) - gsm? ( media-libs/gsm ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-plugins/gst-plugins-base:1.0 - ) - isdn? ( dev-libs/libcapi20 ) - lcms? ( media-libs/lcms2 ) - ldap? ( net-directory/openldap ) - mp3? ( media-sound/mpg123 ) - openal? ( media-libs/openal ) - opengl? ( - x11-dri/glu - x11-dri/mesa[>=9.0] - ) - oss? ( sys-sound/oss ) - pcap? ( dev-libs/libpcap ) - providers:ijg-jpeg? ( media-libs/jpeg:= ) - providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( net-fs/samba[>=3.0.25] ) - scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff ) - suggestion: - fonts/corefonts [[ description = [ Many Windows apps need the MS corefonts ] ]] -" - -if [[ -n ${COMPHOLIO_PV} ]]; then - DEPENDENCIES+=" - build: - staging? ( - dev-lang/perl:= - dev-perl/XML-Simple - ) - build+run: - gtk3? ( x11-libs/gtk+:3 ) - staging? ( sys-apps/attr ) - vaapi? ( x11-libs/libva[X] ) - " -fi - -# The tests need a running X and even then they're unreliable -RESTRICT="test" - -# Wine's configure checks for 64bit x86 platforms and tries to add -m32 to CC if --enable-win64 is -# not given. This check (yes, that means the amd64 stuff) is chosen to be equivalent to wine's check -# in configure.ac. -my_win64_enable() { - case "${1}" in - x86_64*|amd64*) - echo "--enable-win64" - ;; - *) - echo "--disable-win64" - ;; - esac -} - -ECONF_SOURCE=${WORK} -WORK_HOST=${WORK}-host - -DEFAULT_SRC_CONFIGURE_PARAMS=( - --hates=disable-dependency-tracking - --hates=disable-silent-rules - --hates=enable-fast-install - --disable-tests - --with-curses - --with-dbus - --with-fontconfig - --with-freetype - --with-gettext - --with-gnutls - --without-gssapi - --with-jpeg - --with-png - --with-pthread - --with-x - --with-xcomposite - --with-xcursor - --with-xfixes - --with-xinerama - --with-xinput - --with-xinput2 - --with-xml - --with-xrandr - --with-xrender - --with-xshape - --with-xshm - --with-xslt - --with-xxf86vm - --with-zlib - --without-coreaudio - --without-gettextpo - --without-hal - --without-krb5 - --without-opencl - --without-sdl - --without-v4l - $(my_win64_enable $(exhost --target)) - $(exhost --is-native -q || echo --with-wine-tools="${WORK_HOST}") -) - - -DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( - alsa - "camera gphoto" - cups - gsm - gstreamer - "isdn capi" - "lcms cms" - ldap - "mp3 mpg123" - openal - opengl - "opengl glu" - "opengl osmesa" - oss - pcap - "pulseaudio pulse" - "samba netapi" - "scanner sane" - tiff - vulkan -) - -#if ever at_least 3.11 ; then -# DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=( -# "vulkan vkd3d" -# ) -#fi - - - -if [[ -n ${COMPHOLIO_PV} ]]; then - DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=( - gtk3 - "staging xattr" - "vaapi va" - ) -fi - -DEFAULT_SRC_COMPILE_PARAMS=( - LDFLAGS=${CFLAGS} -) - -wine_pkg_pretend() { - if [[ -z ${COMPHOLIO_PV} ]] && has_version --root ${CATEGORY}/${PN}[staging]; then - ewarn "The staging patch for ${PNV} hasn't been released yet. If you rely on it, don't install ${PNV}." - fi -} - -wine_src_prepare() { - default - - if [[ -n ${COMPHOLIO_PV} ]] && option staging ; then - edo ../${STAGING_NAME}-${COMPHOLIO_PV}/patches/patchinstall.sh --all --backend=patch DESTDIR="${WORK}" - fi - - # Generate `nm` shim so winebuild will use the correct binary path - # export PATH="${WORK}/shims:${PATH}" - edo mkdir shims - edo ln -s /usr/host/bin/$(exhost --tool-prefix)nm ./shims/nm - edo ln -s /usr/host/bin/$(exhost --tool-prefix)as ./shims/as - edo ln -s /usr/host/bin/$(exhost --tool-prefix)ar ./shims/ar - edo ln -s /usr/host/bin/$(exhost --tool-prefix)ranlib ./shims/ranlib - - # Don't run update-desktop-database to avoid sandbox violations. - edo sed -i -e '/^UPDATE_DESKTOP_DATABASE/s:=.*:= true:' tools/Makefile.in - - # Remove the mimetype from Wine's desktop file to avoid conflicts with Mono - # and other stuff that sometimes uses .exe extensions. - edo sed -i -e '/^MimeType/d' loader/wine.desktop - - if ! exhost --is-native -q; then - # we need winetools built for the native arch and wine's build system doesn't do that - edo mkdir "${WORK_HOST}" - fi - - if [[ $(exhost --target) == x86_64* ]]; then - edo sed -i -e "s:wine:&64:g" tools/wineapploader.in - fi - if option win64; then - edo sed -i -e 's/"\/.wine"/"\/.wine64"/g' libs/wine/config.c - else - edo sed -i -e 's/"\/.wine"/"\/.wine32"/g' libs/wine/config.c - fi - - eautoconf -} - -wine_src_configure() { - if ! exhost --is-native -q; then - edo pushd "${WORK_HOST}" - - local old_cc=${CC} old_cxx=${CXX} - - # TODO: properly handle using the build host's tools - CC=$(exhost --build)-cc - CXX=$(exhost --build)-c++ - - # We don't need to enable all host stuff. The tools we're about to build don't depend on - # anything (except sfnt2fon, which requires freetype on the host). - econf \ - "${params[@]}" \ - --host=$(exhost --build) \ - --hates=disable-dependency-tracking \ - --hates=disable-silent-rules \ - --hates=enable-fast-install \ - --with-freetype \ - $(my_win64_enable $(exhost --build)) - - # we need to compile here so the actual target configure script doesn't reject - # our tool directory - emake tools tools/{sfnt2fon,widl,winebuild,winedump,winegcc,wmc,wrc} - - CC=${old_cc} - CXX=${old_cxx} - - edo popd - fi - - - - # NOTE(compnerd) the configure script is broken and checks with_lcms2 for the --with{,out}-cms - # option, so specify this in addition to the proper handling of the option - # NOTE --with-wine-tools while cross-compiling disables all build rules for the tools and - # makes a cross-compiled install different from a native one except if we enable those tools - # again - enable_tools=yes \ - with_lcms2=$(option_enable lcms) \ - default -} - -wine_src_compile() { - export PATH="${WORK}/shims:${PATH}" - - default -} - -wine_src_install() { - default - - # in almost all cases, arch-specific things should not go in /usr/share. - # however, this is where wine looks for gecko's msi in, and expects it - # to be at if it is installed. - insinto /usr/share/wine/gecko - doins "${FETCHEDDIR}"/${MY_GECKO_NAME} - - if option mono ; then - insinto /usr/share/wine/mono - doins "${FETCHEDDIR}"/${MONO_NAME} - fi -} - -wine_pkg_postinst() { - freedesktop-desktop_pkg_postinst - freedesktop-mime_pkg_postinst -} - -wine_pkg_postrm() { - freedesktop-desktop_pkg_postrm - freedesktop-mime_pkg_postrm -} - diff --git a/packages/dev-db/ldb/ldb-1.4.0.exheres-0 b/packages/dev-db/ldb/ldb-1.4.0.exheres-0 deleted file mode 100644 index c569360..0000000 --- a/packages/dev-db/ldb/ldb-1.4.0.exheres-0 +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2011-2012 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -require wafsamba - -SUMMARY="LDAP-like embedded database" -DESCRIPTION=" -ldb is a LDAP-like embedded database. It is not at all LDAP standards compliant, so if you want a -standards compliant database then please see the excellent OpenLDAP project. - -What ldb does is provide a fast database with an LDAP-like API designed to be used within an -application. In some ways it can be seen as a intermediate solution between key-value pair databases -and a real LDAP database. - -ldb is the database engine used in Samba4. -" -HOMEPAGE="https://${PN}.samba.org" -DOWNLOADS="mirror://samba/../${PN}/${PNV}.tar.gz" - -LICENCES="LGPL-3" -SLOT="0" -PLATFORMS="~amd64 ~armv7 ~x86" -MYOPTIONS="" - -DEPENDENCIES=" - build+run: - dev-db/tdb[>=1.3.15] - dev-libs/popt - dev-libs/talloc[>=2.1.11] - dev-libs/tevent[>=0.9.36] - build+test: - dev-util/cmocka[>=1.1.1] - recommendation: - net-directory/openldap [[ description = [ ldb can use OpenLDAP as a backend ] ]] -" - -WAF_SRC_CONFIGURE_PARAMS+=( --with-modulesdir=/usr/$(exhost --target)/lib ) -WAF_SRC_COMPILE_PARAMS+=( -j1 ) - -src_test() { - # https://bugzilla.samba.org/show_bug.cgi?id=9787 - edo ln -s libldb.so bin/default/libldb.so.$(ever major) - edo ln -s libpyldb-util.so bin/default/libpyldb-util.so.$(ever major) - - waf_src_test -} - diff --git a/packages/dev-libs/libcgroup/files/1bce3ab63968022e97599bbd73ec1a66aacf45bc.diff b/packages/dev-libs/libcgroup/files/1bce3ab63968022e97599bbd73ec1a66aacf45bc.diff deleted file mode 100644 index c52bf85..0000000 --- a/packages/dev-libs/libcgroup/files/1bce3ab63968022e97599bbd73ec1a66aacf45bc.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/api.c b/src/api.c -index d6c9d3a..ef796ac 100644 ---- a/src/api.c -+++ b/src/api.c -@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid, - /* Get the group data. */ - sp = &(rule->username[1]); - grp = getgrnam(sp); -- if (!grp) -+ if (!grp) { -+ rule = rule->next; - continue; -+ } - - /* Get the data for UID. */ - usr = getpwuid(uid); -- if (!usr) -+ if (!usr) { -+ rule = rule->next; - continue; -+ } - - /* If UID is a member of group, we matched. */ - for (i = 0; grp->gr_mem[i]; i++) { diff --git a/packages/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch b/packages/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch deleted file mode 100644 index 78a3d09..0000000 --- a/packages/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -libcgroup-internal.h: reorder the header stacking. - -`man 3 fts` not only specifies the headers to be included, but -also the order. <fts.h> must be included after <sys/types.h> -and <sys/stats.h>. On glibc and uClibc systems, an incorrect -order does not pose a problem, but on musl this leads to undefine -types such as dev_t and friends. - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> - -diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h ---- libcgroup-0.41.orig/src/libcgroup-internal.h 2015-07-13 21:08:26.740965713 -0400 -+++ libcgroup-0.41/src/libcgroup-internal.h 2015-07-13 21:09:40.774962164 -0400 -@@ -21,12 +21,12 @@ - #endif - - #include "config.h" --#include <fts.h> - #include <libcgroup.h> - #include <limits.h> - #include <pthread.h> --#include <sys/stat.h> - #include <sys/types.h> -+#include <sys/stat.h> -+#include <fts.h> - #include <setjmp.h> - - /* Maximum number of mount points/controllers */ diff --git a/packages/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch b/packages/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch deleted file mode 100644 index 7701093..0000000 --- a/packages/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch +++ /dev/null @@ -1,225 +0,0 @@ -Replace __BEGIN_DECLS and __END_DECLS with extern "C". - -The macros __BEGIN_DECLS and __END_DECLS are a GNU-ism found in -glibc and uClibc, but not musl. We replace them by the more general -extern "C" { ... } block exposed only if we have __cplusplus. - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> - -diff -Naur libcgroup-0.41.orig/include/libcgroup/config.h libcgroup-0.41/include/libcgroup/config.h ---- libcgroup-0.41.orig/include/libcgroup/config.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/config.h 2015-07-11 23:19:20.451977284 +0000 -@@ -9,7 +9,9 @@ - #include <features.h> - #endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** - * @defgroup group_config 5. Configuration -@@ -107,6 +109,8 @@ - * @} - * @} - */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /*_LIBCGROUP_CONFIG_H*/ -diff -Naur libcgroup-0.41.orig/include/libcgroup/error.h libcgroup-0.41/include/libcgroup/error.h ---- libcgroup-0.41.orig/include/libcgroup/error.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/error.h 2015-07-11 23:19:34.253977328 +0000 -@@ -9,7 +9,9 @@ - #include <features.h> - #endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** - * @defgroup group_errors 6. Error handling -@@ -99,6 +101,8 @@ - * @} - * @} - */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _LIBCGROUP_INIT_H */ -diff -Naur libcgroup-0.41.orig/include/libcgroup/groups.h libcgroup-0.41/include/libcgroup/groups.h ---- libcgroup-0.41.orig/include/libcgroup/groups.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/groups.h 2015-07-11 23:19:40.305977347 +0000 -@@ -11,7 +11,9 @@ - #include <stdbool.h> - #endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** - * Flags for cgroup_delete_cgroup_ext(). -@@ -577,6 +579,8 @@ - */ - - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _LIBCGROUP_GROUPS_H */ -diff -Naur libcgroup-0.41.orig/include/libcgroup/init.h libcgroup-0.41/include/libcgroup/init.h ---- libcgroup-0.41.orig/include/libcgroup/init.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/init.h 2015-07-11 23:19:46.369977366 +0000 -@@ -9,7 +9,9 @@ - #include <features.h> - #endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** - * @defgroup group_init 1. Initialization -@@ -58,6 +60,8 @@ - * @} - * @} - */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _LIBCGROUP_INIT_H */ -diff -Naur libcgroup-0.41.orig/include/libcgroup/iterators.h libcgroup-0.41/include/libcgroup/iterators.h ---- libcgroup-0.41.orig/include/libcgroup/iterators.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/iterators.h 2015-07-11 23:19:53.353977388 +0000 -@@ -11,7 +11,9 @@ - #include <features.h> - #endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** - * @defgroup group_iterators 3. Iterators -@@ -423,6 +425,8 @@ - * @} - */ - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _LIBCGROUP_ITERATORS_H */ -diff -Naur libcgroup-0.41.orig/include/libcgroup/log.h libcgroup-0.41/include/libcgroup/log.h ---- libcgroup-0.41.orig/include/libcgroup/log.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/log.h 2015-07-11 23:19:58.922977406 +0000 -@@ -11,7 +11,9 @@ - - #include <stdarg.h> - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** - * @defgroup group_log 7. Logging -@@ -142,6 +144,8 @@ - * @} - * @} - */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _LIBCGROUP_LOG_H */ -diff -Naur libcgroup-0.41.orig/include/libcgroup/tasks.h libcgroup-0.41/include/libcgroup/tasks.h ---- libcgroup-0.41.orig/include/libcgroup/tasks.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/include/libcgroup/tasks.h 2015-07-11 23:20:03.329977420 +0000 -@@ -12,7 +12,9 @@ - #include <stdbool.h> - #endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /** Flags for cgroup_change_cgroup_uid_gid(). */ - enum cgflags { -@@ -204,6 +206,8 @@ - * @} - * @} - */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _LIBCGROUP_TASKS_H */ -diff -Naur libcgroup-0.41.orig/src/daemon/cgrulesengd.h libcgroup-0.41/src/daemon/cgrulesengd.h ---- libcgroup-0.41.orig/src/daemon/cgrulesengd.h 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/src/daemon/cgrulesengd.h 2015-07-11 23:20:34.282977519 +0000 -@@ -17,7 +17,9 @@ - - #include <features.h> - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - #include "config.h" - #include "libcgroup.h" -@@ -119,7 +121,9 @@ - */ - void cgre_catch_term(int signum); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _CGRULESENGD_H */ - -diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h ---- libcgroup-0.41.orig/src/libcgroup-internal.h 2015-07-11 23:16:37.497976764 +0000 -+++ libcgroup-0.41/src/libcgroup-internal.h 2015-07-11 23:20:22.299977481 +0000 -@@ -16,7 +16,9 @@ - - #define __LIBCG_INTERNAL - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - #include "config.h" - #include <fts.h> -@@ -279,6 +281,8 @@ - */ - int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif diff --git a/packages/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch b/packages/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch deleted file mode 100644 index 191de87..0000000 --- a/packages/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch +++ /dev/null @@ -1,74 +0,0 @@ -Replace INCLUDES with AM_CPPFLAGS in Makefile.am - -We replace the deprecated INCLUDES with AM_CPPFLAGS in all -Makefile.am's. - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> - -diff -Naur libcgroup-0.41.orig/src/Makefile.am libcgroup-0.41/src/Makefile.am ---- libcgroup-0.41.orig/src/Makefile.am 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/src/Makefile.am 2015-07-13 14:36:38.922428040 +0000 -@@ -9,7 +9,7 @@ - - CLEANFILES = lex.c parse.c parse.h - --INCLUDES = -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/include - lib_LTLIBRARIES = libcgroup.la - libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c log.c - libcgroup_la_LIBADD = -lpthread -diff -Naur libcgroup-0.41.orig/src/bindings/Makefile.am libcgroup-0.41/src/bindings/Makefile.am ---- libcgroup-0.41.orig/src/bindings/Makefile.am 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/src/bindings/Makefile.am 2015-07-13 14:37:12.267428146 +0000 -@@ -1,5 +1,5 @@ - SUBDIRS = . --INCLUDES = -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/include - - lib_LTLIBRARIES = _libcgroup.la - _libcgroup_la_SOURCES = libcgroup.c -@@ -11,5 +11,5 @@ - - libcgroup.c: libcgroup.p $(top_srcdir)/include/libcgroup.h - cp libcgroup.p libcgroup.i -- $(CC) $(INCLUDES) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i -+ $(CC) $(CPPFLAGS) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i - $(SWIG) -python -o libcgroup.c libcgroup.i -diff -Naur libcgroup-0.41.orig/src/daemon/Makefile.am libcgroup-0.41/src/daemon/Makefile.am ---- libcgroup-0.41.orig/src/daemon/Makefile.am 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/src/daemon/Makefile.am 2015-07-13 14:36:55.781428093 +0000 -@@ -1,4 +1,4 @@ --INCLUDES = -I $(top_srcdir)/include -+AM_CPPFLAGS = -I $(top_srcdir)/include - - if WITH_DAEMON - -diff -Naur libcgroup-0.41.orig/src/pam/Makefile.am libcgroup-0.41/src/pam/Makefile.am ---- libcgroup-0.41.orig/src/pam/Makefile.am 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/src/pam/Makefile.am 2015-07-13 14:36:28.768428007 +0000 -@@ -1,4 +1,4 @@ --INCLUDES = -I $(top_srcdir)/include -+AM_CPPFLAGS = -I $(top_srcdir)/include - - if WITH_PAM - -diff -Naur libcgroup-0.41.orig/src/tools/Makefile.am libcgroup-0.41/src/tools/Makefile.am ---- libcgroup-0.41.orig/src/tools/Makefile.am 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/src/tools/Makefile.am 2015-07-13 14:36:19.098427976 +0000 -@@ -1,4 +1,4 @@ --INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include - LDADD = $(top_builddir)/src/.libs/libcgroup.la - - if WITH_TOOLS -diff -Naur libcgroup-0.41.orig/tests/Makefile.am libcgroup-0.41/tests/Makefile.am ---- libcgroup-0.41.orig/tests/Makefile.am 2014-01-13 14:05:56.000000000 +0000 -+++ libcgroup-0.41/tests/Makefile.am 2015-07-13 14:37:23.146428181 +0000 -@@ -1,6 +1,6 @@ - SUBDIRS = tools - --INCLUDES = -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/include - LDADD = $(top_builddir)/src/.libs/libcgroup.la - - # compile the tests, but do not install them diff --git a/packages/dev-libs/libcgroup/libcgroup-0.41-r1.exheres-0 b/packages/dev-libs/libcgroup/libcgroup-0.41-r1.exheres-0 deleted file mode 100644 index 5f816dc..0000000 --- a/packages/dev-libs/libcgroup/libcgroup-0.41-r1.exheres-0 +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2010-2017 Wulf C. Krueger <philantrop@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require libcgroup - -PLATFORMS="~amd64 ~x86" diff --git a/packages/dev-libs/libcgroup/libcgroup.exlib b/packages/dev-libs/libcgroup/libcgroup.exlib deleted file mode 100644 index 13f5d55..0000000 --- a/packages/dev-libs/libcgroup/libcgroup.exlib +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2010-2017 Wulf C. Krueger <philantrop@exherbo.org> -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -require sourceforge [ project="libcg" ] -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.13 ] ] - -export_exlib_phases pkg_postinst src_prepare - -SUMMARY="libcg is a library that abstracts the control group file system in Linux" -DESCRIPTION=" -libcgroup aims to provide programmers easily usable APIs to use the control group -file system. It should satisfy the following requirements: -- Provide a programmable interface for cgroups -- Provide persistent configuration across reboots -- Provide a programmable interface for manipulating configurations -" - -#BUGS_TO="philantrop@exherbo.org" - -UPSTREAM_DOCUMENTATION="${HOMEPAGE}/html/index.html [[ lang = en ]]" - -LICENCES="LGPL-2.1" -SLOT="0" -MYOPTIONS="" - -DEPENDENCIES=" - build+run: - sys-libs/pam -" - -# The tests since 0.38 want to mess directly with /sys *and* expect libcgroup to -# be already installed. Last checked: 0.41 -RESTRICT="test" - -DEFAULT_SRC_CONFIGURE_PARAMS=( - --enable-cgred-socket=/run/cgred.sock - --enable-daemon - --enable-pam - --enable-shared - --enable-static - --enable-tools -) - -DEFAULT_SRC_CONFIGURE_PARAMS=( --enable-opaque-hierarchy=name=systemd ) - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-replace_DECLS.patch - "${FILES}"/${PNV}-replace_INLCUDES.patch - "${FILES}"/${PNV}-reorder-headers.patch - "${FILES}"/1bce3ab63968022e97599bbd73ec1a66aacf45bc.diff -) - -libcgroup_src_prepare() { - # Change rules file location - edo sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \ - -i src/libcgroup-internal.h - edo sed -e 's:/etc/cgconfig.conf:/etc/cgroup/cgconfig.conf:' \ - -i src/libcgroup-internal.h - edo sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \ - -i src/pam/Makefile.am - edo sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed" - autotools_src_prepare -} - -libcgroup_pkg_postinst() { - default - - local cruft=( /etc/rc.d/init.d/cgconfig /etc/rc.d/init.d/cgred ) - for file in ${cruft[@]}; do - if test -f "${file}" ; then - nonfatal edo rm "${file}" || ewarn "removing ${file} failed" - fi - done -} - diff --git a/packages/dev-libs/libclc/libclc-0_pre20170929.exheres-0 b/packages/dev-libs/libclc/libclc-0_pre20170929.exheres-0 deleted file mode 100644 index 942b553..0000000 --- a/packages/dev-libs/libclc/libclc-0_pre20170929.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2016 Niels Ole Salscheider <olesalscheider@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require libclc - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/dev-libs/libclc/libclc-scm.exheres-0 b/packages/dev-libs/libclc/libclc-scm.exheres-0 deleted file mode 100644 index 942b553..0000000 --- a/packages/dev-libs/libclc/libclc-scm.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2016 Niels Ole Salscheider <olesalscheider@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require libclc - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/dev-libs/libclc/libclc.exlib b/packages/dev-libs/libclc/libclc.exlib deleted file mode 100644 index 3d6b762..0000000 --- a/packages/dev-libs/libclc/libclc.exlib +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2013-2016 Niels Ole Salscheider <olesalscheider@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -export_exlib_phases src_configure - -SCM_REPOSITORY="https://git.llvm.org/git/libclc.git" -ever is_scm || SCM_REVISION="0c31bd5e8d277bee26f34162c246a321f086ad55" -require scm-git - -SUMMARY="libclc is an implementation of the library requirements of the OpenCL C programming language" -HOMEPAGE="https://libclc.llvm.org/" - -LICENCES="|| ( UoI-NCSA MIT )" -SLOT="0" -MYOPTIONS="" - -DEPENDENCIES=" - build: - dev-lang/python:* - build+run: - dev-lang/clang[>=3.9] - dev-lang/llvm[>=3.9] -" - -DEFAULT_SRC_COMPILE_PARAMS=( VERBOSE=1 ) - -libclc_src_configure() { - edo ./configure.py \ - --prefix=/usr \ - --includedir=/usr/$(exhost --target)/include \ - --libexecdir=/usr/$(exhost --target)/lib/clc \ - --pkgconfigdir=/usr/$(exhost --target)/lib/pkgconfig - - edo sed 's/-mabm//g' -i Makefile - edo sed 's/-mlwp//g' -i Makefile - edo sed 's/-msahf//g' -i Makefile - edo sed 's/-mprefer-avx128//g' -i Makefile - edo sed 's/-mvzeroupper//g' -i Makefile - edo sed 's/-mtls-dialect=gnu2//g' -i Makefile - edo sed 's/-fabi-version=8//g' -i Makefile - edo sed 's/-mfpmath=both//g' -i Makefile -} - diff --git a/packages/dev-libs/libunwind/files/0001-tests-Use-correctly-prefixed-nm-binary.patch b/packages/dev-libs/libunwind/files/0001-tests-Use-correctly-prefixed-nm-binary.patch deleted file mode 100644 index 1f61c0e..0000000 --- a/packages/dev-libs/libunwind/files/0001-tests-Use-correctly-prefixed-nm-binary.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 488db3f013e3d50c104760df8fa0771a2f679d9c Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt <marv@exherbo.org> -Date: Sun, 25 Sep 2016 20:00:02 +0200 -Subject: [PATCH 1/2] tests: Use correctly prefixed nm binary - ---- - configure.ac | 4 ++++ - tests/check-namespace.sh.in | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cffe19b..61f6cfc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,6 +21,10 @@ LT_INIT - AM_PROG_AS - AM_PROG_CC_C_O - -+dnl for namespace test -+AC_PROG_GREP -+AC_PROG_NM -+ - dnl Checks for libraries. - AC_CHECK_LIB(uca, __uc_get_grs) - OLD_LIBS=${LIBS} -diff --git a/tests/check-namespace.sh.in b/tests/check-namespace.sh.in -index d2e6efb..56a63f1 100644 ---- a/tests/check-namespace.sh.in -+++ b/tests/check-namespace.sh.in -@@ -28,10 +28,10 @@ fetch_symtab () { - # Unfortunately, "nm --defined" is a GNU-extension. For portability, - # build the list of defined symbols by hand. - # -- symtab=`nm -g $filename` -+ symtab=`$NM -g $filename` - saved_IFS="$IFS" - IFS="" -- undef=`nm -g -u $filename` -+ undef=`$NM -g -u $filename` - for line in $undef; do - symtab=`echo "$symtab" | grep -v "^${line}"\$` - done; --- -2.10.0 - diff --git a/packages/dev-libs/libunwind/files/0002-tests-Remove-coredump-tests.patch b/packages/dev-libs/libunwind/files/0002-tests-Remove-coredump-tests.patch deleted file mode 100644 index 38afde2..0000000 --- a/packages/dev-libs/libunwind/files/0002-tests-Remove-coredump-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8815239fc4e9cc8bc60a2703a622c0f5280f36c2 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt <marv@exherbo.org> -Date: Mon, 26 Sep 2016 08:11:21 +0200 -Subject: [PATCH 2/2] tests: Remove coredump tests -Upstream: No, not a suitable solution. Improvement of tests is/was discussed at https://lists.nongnu.org/archive/html/libunwind-devel/2016-02/ -msg00019.html - -The coredump tests rely on the assumption that coredump files -are created in the current working directory. This assumption is -false when e.g. systemd-coredump is used. ---- - tests/Makefile.am | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 7287e7b..796df0c 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -66,17 +66,6 @@ if SUPPORT_CXX_EXCEPTIONS - check_PROGRAMS_cdep += Ltest-cxx-exceptions - endif - --if OS_LINUX --if BUILD_COREDUMP -- check_SCRIPTS_cdep += run-coredump-unwind -- noinst_PROGRAMS_cdep += crasher test-coredump-unwind -- --if HAVE_LZMA -- check_SCRIPTS_cdep += run-coredump-unwind-mdi --endif # HAVE_LZMA --endif # BUILD_COREDUMP --endif # OS_LINUX -- - perf: perf-startup Gperf-simple Lperf-simple Lperf-trace - @echo "########## Basic performance of generic libunwind:" - @./Gperf-simple --- -2.13.1 - diff --git a/packages/dev-libs/libunwind/libunwind-scm.exheres-0 b/packages/dev-libs/libunwind/libunwind-scm.exheres-0 deleted file mode 100644 index 27d63fe..0000000 --- a/packages/dev-libs/libunwind/libunwind-scm.exheres-0 +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2012, 2014 Ali Polatel <alip@exherbo.org> -# Based in part upon libunwind-1.1.ebuild of Gentoo which is: -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="git://git.sv.gnu.org/libunwind.git" -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 ] ] -require scm-git - -SUMMARY="C programming interface to determine the call-chain of a program" -DESCRIPTION=" -The primary goal of this project is to define a portable and efficient C -programming interface (API) to determine the call-chain of a program. The API -additionally provides the means to manipulate the preserved (callee-saved) state -of each call-frame and to resume execution at any point in the call-chain -(non-local goto). -" -HOMEPAGE="http://www.nongnu.org/libunwind/" -DOWNLOADS="" - -LICENCES="MIT" -SLOT="0" -PLATFORMS="~amd64 ~armv7 ~armv8 ~x86" -MYOPTIONS=" - debug [[ description = [ Enable debug-frame, minidebuginfo and other goodies ] ]] - doc -" - -DEPENDENCIES=" - build: - doc? ( app-text/texlive-core [[ note = latex2man ]] ) - build+run: - debug? ( app-arch/xz ) -" - -BUGS_TO="alip@exherbo.org" - -# Some tests are known to fail on some platforms including x86, see -# https://bugs.gentoo.org/show_bug.cgi?id=461958 and -# https://lists.nongnu.org/archive/html/libunwind-devel/2013-03/msg00005.html -RESTRICT="test" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/0001-tests-Use-correctly-prefixed-nm-binary.patch - "${FILES}"/0002-tests-Remove-coredump-tests.patch -) - -DEFAULT_SRC_CONFIGURE_PARAMS=( --enable-cxx-exceptions ) -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( - debug - 'debug minidebuginfo' - 'debug debug-frame' - 'doc documentation' -) - diff --git a/packages/dev-util/ccache/ccache-3.3.6.exheres-0 b/packages/dev-util/ccache/ccache-3.3.6.exheres-0 deleted file mode 100644 index b504532..0000000 --- a/packages/dev-util/ccache/ccache-3.3.6.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2008 Bo Ørsted Andresen <zlin@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require ccache - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/dev-util/ccache/ccache.exlib b/packages/dev-util/ccache/ccache.exlib deleted file mode 100644 index 18bc702..0000000 --- a/packages/dev-util/ccache/ccache.exlib +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2008 Bo Ørsted Andresen <zlin@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 -# Inspired from Gentoo's ccache-2.4-r7.ebuild which is: -# Copyright 1999-2008 Gentoo Foundation - -SUMMARY="Compiler cache" -HOMEPAGE="https://${PN}.samba.org" -DOWNLOADS="https://samba.org/ftp/${PN}/${PNV}.tar.xz" - -MY_PV=$(ever replace_all _) -UPSTREAM_RELEASE_NOTES="${HOMEPAGE}/releasenotes.html#_${PN}_${MY_PV%_0}" - -LICENCES="GPL-3" -SLOT="0" -MYOPTIONS="" - -DEPENDENCIES=" - build+run: - sys-libs/zlib[>=1.2.3] -" - diff --git a/packages/dev-util/codeblocks/codeblocks-17.12.exheres-0 b/packages/dev-util/codeblocks/codeblocks-17.12.exheres-0 deleted file mode 100644 index 8ce497b..0000000 --- a/packages/dev-util/codeblocks/codeblocks-17.12.exheres-0 +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2008-2016 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -require codeblocks - -PLATFORMS="~amd64" - -WORK="${WORKBASE}/${PNV}" - diff --git a/packages/dev-util/codeblocks/codeblocks-scm.exheres-0 b/packages/dev-util/codeblocks/codeblocks-scm.exheres-0 deleted file mode 100644 index b14029e..0000000 --- a/packages/dev-util/codeblocks/codeblocks-scm.exheres-0 +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2008-2016 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="https://svn.code.sf.net/p/${PN}/code" -#SCM_SECONDARY_REPOSITORIES="FortranProject PythonPlugins wxCrafterCB" -#SCM_FortranProject_REPOSITORY="https://svn.code.sf.net/p/fortranproject/code" -#SCM_PythonPlugins_REPOSITORY="https://github.com/spillz/codeblocks-python" -#SCM_wxCrafterCB_REPOSITORY="https://github.com/eranif/wxCrafterCB" -#SCM_EXTERNAL_REFS=" -# src/plugins/contrib/FortranProject:FortranProject -# src/plugins/contrib/PythonPlugins:PythonPlugins -# src/plugins/contrib/wxCrafterCB:wxCrafterCB -#" - -require codeblocks scm-svn - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/dev-util/codeblocks/codeblocks.exlib b/packages/dev-util/codeblocks/codeblocks.exlib deleted file mode 100644 index 1afda42..0000000 --- a/packages/dev-util/codeblocks/codeblocks.exlib +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2008-2016 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -require sourceforge [ pnv="${PN}_${PV}" suffix='tar.xz' ] -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 1.11 1.10 ] ] -require freedesktop-desktop freedesktop-mime -export_exlib_phases src_prepare src_install pkg_postinst pkg_postrm - -SUMMARY="Code::Blocks C/C++ IDE" -DESCRIPTION="Code::Blocks free C/C++ IDE" -HOMEPAGE="http://www.codeblocks.org" - -LICENCES="GPL-3" -SLOT="0" -MYOPTIONS=" - contrib-plugins [[ description = [ Build community-contributed plugins ] ]] -" - -DEPENDENCIES=" - build: - app-arch/zip - virtual/pkg-config - build+run: - app-admin/gamin - app-spell/hunspell:= - dev-libs/boost - media-libs/fontconfig - x11-libs/wxGTK:=[>=2.8.12] -" - -DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'contrib-plugins' ) - -codeblocks_src_prepare() { - if ever at_least scm; then - edo chmod +x update_revision.sh - edo ./update_revision.sh - fi - - edo sed -e "s/pkg-config,/${PKG_CONFIG},/" -i configure.ac - - [[ -e "${WORK}/m4" ]] || edo mkdir "${WORK}/m4" - - autotools_src_prepare -} - -codeblocks_src_install() { - default - hereenvd 50codeblocks <<EOF -CODEBLOCKS_DATA_DIR="/usr" -EOF -} - -codeblocks_pkg_postinst() { - freedesktop-desktop_pkg_postinst - freedesktop-mime_pkg_postinst -} - -codeblocks_pkg_postrm() { - freedesktop-desktop_pkg_postrm - freedesktop-mime_pkg_postrm -} - diff --git a/packages/media/mpv/mpv-scm.exheres-0 b/packages/dev-util/codelite/codelite-12.0.exheres-0 index 91119e8..1405ecd 100644 --- a/packages/media/mpv/mpv-scm.exheres-0 +++ b/packages/dev-util/codelite/codelite-12.0.exheres-0 @@ -1,7 +1,7 @@ -# Copyright 2012-2016 Johannes Nixdorf <mixi@exherbo.org> # Distributed under the terms of the GNU General Public License v2 -require mpv +SCM_TAG="12.0" +require codelite PLATFORMS="~amd64 ~x86" diff --git a/packages/dev-util/codelite/codelite-scm.exheres-0 b/packages/dev-util/codelite/codelite-scm.exheres-0 index 32daacf..f10af18 100644 --- a/packages/dev-util/codelite/codelite-scm.exheres-0 +++ b/packages/dev-util/codelite/codelite-scm.exheres-0 @@ -1,48 +1,5 @@ # Distributed under the terms of the GNU General Public License v2 -SCM_REPOSITORY="git://github.com/eranif/codelite.git" -require scm-git - -HOMEPAGE="http://www.codelite.org" -SUMMARY="A Free, open source, cross platform C,C++,PHP and Node.js IDE" -DESCRIPTION="" -SLOT="0" - -require cmake [ api=2 ] - -DOWNLOADS="" +require codelite PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - clang - flex - pch - sftp - webview -" - -DEPENDENCIES=" - build+run: - x11-libs/wxGTK[>=3] - net-libs/libssh - dev-db/sqlite -" - -src_configure() { - local cmakeparams=() - cmakeparams+=( - $(cmake_enable clang CLANG) - $(cmake_with flex FLEX) - $(cmake_with pch PCH) - $(cmake_enable sftp SFTP) - $(cmake_with webview WEBVIEW) - ) - ecmake "${cmakeparams[@]}" -} -src_install() { - cmake_src_install - cd "${IMAGE}"/usr - mkdir $(exhost --target) - edo mv bin $(exhost --target)/ - edo mv lib $(exhost --target)/ -} diff --git a/packages/dev-util/codelite/codelite.exlib b/packages/dev-util/codelite/codelite.exlib new file mode 100644 index 0000000..59e807b --- /dev/null +++ b/packages/dev-util/codelite/codelite.exlib @@ -0,0 +1,50 @@ +# Distributed under the terms of the GNU General Public License v2 + +SCM_REPOSITORY="git://github.com/eranif/codelite.git" +require scm-git + +HOMEPAGE="http://www.codelite.org" +SUMMARY="A Free, open source, cross platform C,C++,PHP and Node.js IDE" +DESCRIPTION="" +SLOT="0" +LICENCES="GPL-2" + +require cmake [ api=2 ] + +export_exlib_phases src_configure src_install + +DOWNLOADS="" +MYOPTIONS=" + clang + flex + pch + sftp + webview +" + +DEPENDENCIES=" + build+run: + x11-libs/wxGTK[>=3] + net-libs/libssh + dev-db/sqlite +" + +codelite_src_configure() { + local cmakeparams=() + cmakeparams+=( + $(cmake_enable clang CLANG) + $(cmake_with flex FLEX) + $(cmake_with pch PCH) + $(cmake_enable sftp SFTP) + $(cmake_with webview WEBVIEW) + ) + ecmake "${cmakeparams[@]}" +} + +codelite_src_install() { + cmake_src_install + cd "${IMAGE}"/usr + mkdir $(exhost --target) + edo mv bin $(exhost --target)/ + edo mv lib $(exhost --target)/ +} diff --git a/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0 b/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0 deleted file mode 100644 index 53fea1a..0000000 --- a/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0 +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Purpose License v2 - -SCM_REPOSITORY="git://git.gnome.org/evolution-data-server" - -require scm-git -#require gnome.org [ suffix=tar.xz ] -require gsettings -require vala [ with_opt=true vala_dep=true ] -require cmake [ api=2 cmake_minimum_version=3.1 ] -require test-dbus-daemon - -SUMMARY="Backend store for contact data" -HOMEPAGE="http://projects.gnome.org/evolution" - -LICENCES="LGPL-2" -SLOT="1.2" -PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - gobject-introspection - google [[ description = [ build google addressbook backend ] ]] - gtk [[ description = [ build GTK+ based prompting service ] ]] - kerberos [[ description = [ Enable kerberos authentication support ] ]] - ldap [[ description = [ Enable LDAP support in evolution ] ]] - vapi [[ - description = [ Build Vala bindings ] - requires = [ gobject-introspection ] - ]] - weather [[ description = [ Enable weather calendar component ] ]] - ( linguas: am ar as ast az be bg bn bn_IN bs ca ca@valencia cs cy da de dz el en_AU en_CA en_GB - en@shaw eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka km kn ko ku lt lv - mai mk ml mn mr ms nb ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sq sr sr@latin - sv ta te tg th tr ug uk vi wa xh zh_CN zh_HK zh_TW ) -" - -DEPENDENCIES=" - build: - virtual/pkg-config[>=0.20] - dev-lang/python:* - build+run: - dev-libs/glib:2[>=2.46] - dev-libs/libxml2:2.0[>=2.0.0] - gnome-desktop/libsoup:2.4[>=2.42] - office-libs/libical[>=2.0.0] - gnome-desktop/gnome-online-accounts[>=3.8] - dev-libs/libsecret:1[>=0.5] - gnome-desktop/gcr[>=3.4] - sys-libs/db:= - dev-libs/nspr - dev-libs/nss - dev-db/sqlite:3[>=3.7.17] - dev-util/gperf - dev-libs/icu:= - gobject-introspection? ( gnome-desktop/gobject-introspection:1[>=0.9.12] ) - google? ( - core/json-glib[>=1.0.4] - gnome-desktop/libgdata[>=0.15.1] - net-libs/webkit:4.0[>=2.11.91] - ) - gtk? ( x11-libs/gtk+:3[>=3.10.0] ) - kerberos? ( app-crypt/heimdal ) - ldap? ( net-directory/openldap[>=2.4.0] ) - weather? ( gnome-desktop/libgweather:3.0[>=3.10] ) -" - -AT_M4DIR=( m4 ) - -CMAKE_SRC_CONFIGURE_PARAMS=( - -DSHARE_INSTALL_PREFIX:STRING=/usr/share - -DSYSCONF_INSTALL_DIR:STRING=/etc - -DENABLE_IPV6:BOOL=TRUE - -DENABLE_GOA:BOOL=TRUE - -DENABLE_LARGEFILE:BOOL=TRUE - -DENABLE_SMIME:BOOL=TRUE - -DWITH_SUNLDAP:BOOL=FALSE - -DENABLE_BACKTRACES:BOOL=TRUE - -DENABLE_UOA:BOOL=FALSE - -DENABLE_EXAMPLES:BOOL=FALSE - -DENABLE_BACKEND_PER_PROCESS:BOOL=TRUE -) -CMAKE_SRC_CONFIGURE_OPTIONS=( - 'gobject-introspection ENABLE_INTROSPECTION' - 'google ENABLE_GOOGLE' - 'google ENABLE_OAUTH2' - 'gtk ENABLE_GTK' - 'kerberos WITH_KRB5' - 'ldap WITH_OPENLDAP' - 'vapi ENABLE_VALA_BINDINGS' - 'weather ENABLE_WEATHER' -) - -src_test() { - test-dbus-daemon_src_test -} - diff --git a/packages/kde-frameworks/kdnssd/kdnssd-5.47.0.exheres-0 b/packages/kde-frameworks/kdnssd/kdnssd-5.47.0.exheres-0 deleted file mode 100644 index 6592330..0000000 --- a/packages/kde-frameworks/kdnssd/kdnssd-5.47.0.exheres-0 +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2014 Bernd Steinhauser <berniyh@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require kdnssd - -MYOPTIONS=" - ( linguas: - af ar as ast be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb - cy da de el en_GB eo es et eu fa fi fr fy ga gd gl gu ha he hi hne hr - hsb hu hy ia id is it ja ka kk km kn ko ku lb lt lv mai mk ml mr ms nb - nds ne nl nn oc or pa pl ps pt pt_BR ro ru se si sk sl sq sr - sr@ijekavian sr@ijekavianlatin sr@latin sv ta te tg th tr tt ug uk uz - uz@cyrillic vi wa xh zh_CN zh_HK zh_TW - ) -" - -PLATFORMS="~amd64 ~armv8 ~x86" - diff --git a/packages/kde-frameworks/kdnssd/kdnssd-scm.exheres-0 b/packages/kde-frameworks/kdnssd/kdnssd-scm.exheres-0 deleted file mode 100644 index 8d7decf..0000000 --- a/packages/kde-frameworks/kdnssd/kdnssd-scm.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2014 Bernd Steinhauser <berniyh@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require kdnssd - -PLATFORMS="~amd64 ~armv8 ~x86" - diff --git a/packages/kde-frameworks/kdnssd/kdnssd.exlib b/packages/kde-frameworks/kdnssd/kdnssd.exlib deleted file mode 100644 index 2059459..0000000 --- a/packages/kde-frameworks/kdnssd/kdnssd.exlib +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2014 Bernd Steinhauser <berniyh@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require kde-frameworks kde [ translations='qt' ] - -SUMMARY="Network service discovery using Zeroconf" -DESCRIPTION=" -KDNSSD is a library for handling the DNS-based Service Discovery Protocol -(DNS-SD), the layer of [Zeroconf](http://www.zeroconf.org) that allows network -services, such as printers, to be discovered without any user intervention or -centralized infrastructure. -" - -LICENCES="BSD-3 [[ note = [ cmake scripts ] ]] LGPL-2.1" -MYOPTIONS="zeroconf" - -DEPENDENCIES=" - build+run: - zeroconf? ( net-dns/avahi ) -" - diff --git a/packages/mail-client/evolution/evolution-scm.exheres-0 b/packages/mail-client/evolution/evolution-scm.exheres-0 deleted file mode 100644 index aec55e6..0000000 --- a/packages/mail-client/evolution/evolution-scm.exheres-0 +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2009, 2011, 2013 Marvin Schmidt <marv@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="git://git.gnome.org/evolution" - -require scm-git -require evolution gsettings gtk-icon-cache freedesktop-desktop -require cmake [ api=2 cmake_minimum_version=3.1 ] - -PLATFORMS="~amd64 ~x86" - -MYOPTIONS=" - bogofilter gtk-doc help libnotify weather - - bogofilter [[ description = [ Enable spam filtering using Bogofilter ] ]] - geolocation [[ - description = [ Adds a map showing the locations of your contacts ] - ]] - gtkspell [[ description = [ Enable spell checking using gtkspell ] ]] - help [[ description = [ Install the user documentation ] ]] - ldap [[ description = [ Enable LDAP support in evolution ] ]] - spamassassin [[ description = [ Enable spam filtering using SpamAssassin ] ]] - weather [[ description = [ Build the weather calendar plugin ] ]] - ( linguas: af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia cs cy da de dz el - en_AU en_CA en_GB en@shaw eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk kn - ko ku lt lv mai mk ml mn mr ms nb nds ne nl nn oc or pa pl ps pt pt_BR ro ru rw si sk - sl sq sr sr@latin sv ta te tg th tr ug uk vi wa xh zh_CN zh_HK zh_TW ) -" -# pst-import plugin needs libpst - -DEPENDENCIES=" - build: - dev-util/intltool[>=0.40.0] - gnome-desktop/yelp-tools - virtual/pkg-config - gtk-doc? ( dev-doc/gtk-doc[>=1.14] ) - build+run: - app-spell/enchant:0[>=1.6.0] - app-text/iso-codes[>=0.49] - dev-libs/atk - dev-libs/glib:2[>=2.46.0] - dev-libs/libcryptui - dev-libs/libxml2:2.0[>=2.7.3] - dev-libs/nspr - dev-libs/nss - gnome-desktop/gnome-autoar[>=0.1.1] - gnome-desktop/evolution-data-server:1.2[>=$(ever range 1-3)][gtk][weather?][ldap?] - gnome-desktop/gcr[>=3.4] - gnome-desktop/gnome-desktop:3.0[>=2.91.3] - gnome-desktop/gsettings-desktop-schemas[>=2.91.92] - gnome-desktop/libsoup:2.4[>=2.42] - media-libs/libcanberra[>=0.25][providers:gtk3] - net-libs/webkit:4.0[>=2.16.0] - x11-libs/cairo - x11-libs/gdk-pixbuf:2.0[>=2.24.0] - x11-libs/gtk+:3[>=3.22.0] - x11-misc/shared-mime-info[>=0.22] - bogofilter? ( mail-filter/bogofilter ) - geolocation? ( - gnome-desktop/geocode-glib:1.0[>=3.10.0] - x11-libs/clutter-gtk:1.0[>=0.90] - x11-libs/libchamplain:0.12 - ) - gtkspell? ( app-spell/gtkspell:3.0 ) - ldap? ( net-directory/openldap[>=2.4.0] ) - libnotify? ( x11-libs/libnotify[>=0.7] ) - spamassassin? ( mail-filter/spamassassin ) - weather? ( gnome-desktop/libgweather:3.0[>=3.10] ) -" - -CMAKE_SRC_CONFIGURE_PARAMS=( - -DSHARE_INSTALL_PREFIX:STRING=/usr/share - -DSYSCONF_INSTALL_DIR:STRING=/etc - -DENABLE_AUTOAR:BOOL=TRUE - -DENABLE_CANBERRA:BOOL=TRUE - -DENABLE_GNOME_DESKTOP:BOOL=TRUE - -DENABLE_LIBCRYPTUI:BOOL=TRUE - -DENABLE_PLUGINS:STRING=all - -DENABLE_SMIME:BOOL=TRUE - -DENABLE_PST_IMPORT:BOOL=FALSE - -DENABLE_TEXT_HIGHLIGHT:BOOL=FALSE - -DENABLE_YTNEF:BOOL=FALSE -) -CMAKE_SRC_CONFIGURE_OPTIONS=( - 'bogofilter WITH_BOGOFILTER' - 'geolocation ENABLE_CONTACT_MAPS' - 'gtkspell ENABLE_GTKSPELL' - 'spamassassin WITH_SPAMASSASSIN' - 'weather ENABLE_WEATHER' - 'help WITH_HELP' - 'ldap WITH_OPENLDAP' -) - -pkg_postinst() { - freedesktop-desktop_pkg_postinst - gsettings_pkg_postinst - gtk-icon-cache_pkg_postinst -} - -pkg_postrm() { - freedesktop-desktop_pkg_postrm - gsettings_pkg_postrm - gtk-icon-cache_pkg_postrm -} - diff --git a/packages/mail-client/evolution/evolution.exlib b/packages/mail-client/evolution/evolution.exlib deleted file mode 100644 index 401a62c..0000000 --- a/packages/mail-client/evolution/evolution.exlib +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2009 Marvin Schmidt <marv@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -SUMMARY="Personal/groupwork information manager (e-mail, adressbook, calendar, tasks etc.)" -HOMEPAGE="http://projects.gnome.org/${PN}" - -SLOT="0" -LICENCES="( LGPL-2 LGPL-3 )" - -BUGS_TO="marv@exherbo.org" - diff --git a/packages/media-libs/libbluray/libbluray-scm.exheres-0 b/packages/media-libs/libbluray/libbluray-scm.exheres-0 deleted file mode 100644 index be6ca11..0000000 --- a/packages/media-libs/libbluray/libbluray-scm.exheres-0 +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2011 Alex ELsayed <eternaleye@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - - -SCM_REPOSITORY="https://git.videolan.org/git/libbluray.git" -SCM_EXTERNAL_REFS=" - contrib/libudfread:libudfread -" -SCM_SECONDARY_REPOSITORIES=" - libudfread -" -SCM_libudfread_REPOSITORY="git://git.videolan.org/libudfread.git" - -require scm-git autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ] - -SUMMARY="Open-source library designed for Blu-Ray Discs playback for media players, like VLC or MPlayer" -HOMEPAGE="https://www.videolan.org/developers/${PN}.html" - - -PLATFORMS="~amd64" - - -LICENCES="LGPL-2.1" -SLOT="0" -MYOPTIONS=" - doc - examples -" - -DEPENDENCIES=" - build: - dev-java/apache-ant - virtual/pkg-config[>=0.9.0] - doc? ( app-doc/doxygen[dot] ) - virtual/jdk:1.8 - build+run: - dev-libs/libxml2:2.0[>=2.6] - media-libs/fontconfig - media-libs/freetype:2 - suggestion: - virtual/libaacs [[ description = [ Decrypt encrypted blurays ] ]] -" - -# Disable ps and pdf generation due to chronic latex shortage -# dlopen the crypto libs at runtime to avoid build-time automagic checks -DEFAULT_SRC_CONFIGURE_PARAMS=( - --enable-bdjava-jar - --disable-doxygen-{pdf,ps} - --disable-static - --with-fontconfig - --with-freetype - --with-libxml2 -) -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( - "doc doxygen-doc" - "doc doxygen-dot" - examples -) - -AT_M4DIR=( m4 ) - -src_configure() { - export JDK_HOME="/usr/$(exhost --target)/lib/jdk" - - default -} - diff --git a/packages/media-sound/mpd/mpd-0.20.20.exheres-0 b/packages/media-sound/mpd/mpd-0.20.20.exheres-0 deleted file mode 100644 index 28d993f..0000000 --- a/packages/media-sound/mpd/mpd-0.20.20.exheres-0 +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2008 Richard Brown -# Copyright 2009 Bo Ørsted Andresen -# Copyright 2009 Thomas Anderson -# Copyright 2011 Ali Polatel -# Copyright 2011-2012 Quentin "Sardem FF7" Glidic <sardemff7@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mpd - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/media-sound/mpd/mpd-scm.exheres-0 b/packages/media-sound/mpd/mpd-scm.exheres-0 deleted file mode 100644 index e590309..0000000 --- a/packages/media-sound/mpd/mpd-scm.exheres-0 +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2008 Richard Brown -# Copyright 2009 Bo Ørsted Andresen -# Copyright 2009 Thomas Anderson -# Copyright 2011 Ali Polatel -# Copyright 2011-2012 Quentin "Sardem FF7" Glidic <sardemff7@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="https://github.com/MusicPlayerDaemon/MPD.git" - -require mpd -require scm-git -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 1.11 ] need_libtool=false ] -DOWNLOADS="" - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/media-sound/mpd/mpd.exlib b/packages/media-sound/mpd/mpd.exlib deleted file mode 100644 index 1f3b5b7..0000000 --- a/packages/media-sound/mpd/mpd.exlib +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 2008 Richard Brown -# Copyright 2009 Bo Ørsted Andresen -# Copyright 2009 Thomas Anderson -# Copyright 2011 Ali Polatel -# Copyright 2011-2012 Quentin "Sardem FF7" Glidic <sardemff7@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require systemd-service - -SUMMARY="A flexible, powerful, server-side application for playing music" -DESCRIPTION=" -Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music. -Through plugins and libraries it can play a variety of sound files while being controlled by -its network protocol. -" -HOMEPAGE="https://www.musicpd.org" -DOWNLOADS="${HOMEPAGE}/download/${PN}/$(ever range -2)/${PNV}.tar.xz" - -UPSTREAM_RELEASE_NOTES="http://git.musicpd.org/cgit/master/${PN}.git/plain/NEWS?h=v${PV}" - -LICENCES="GPL-2" -SLOT="0" -MYOPTIONS="aac alsa avahi doc libsamplerate ogg openal pulseaudio sndfile tcpd - cdio [[ description = [ CD support through libcdio ] ]] - curl [[ description = [ Support obtaining song data via HTTP and enable the WebDAV storage plugin ] ]] - dsd [[ description = [ Support for decoding DSD ] ]] - id3 [[ description = [ Support for ID3 tags ] ]] - jack [[ description = [ Enable jack-audio-connection-kit audio output ] ]] - libmpdclient [[ description = [ Enable support for remote mpd databases ] ]] - mms [[ description = [ Microsoft Media Server protocol support ] ]] - nfs [[ description = [ Enable support for streaming music over a NFS share ] ]] - opus [[ description = [ Opus codec support ] requires = ogg ]] - samba [[ description = [ Enable support for streaming music over a SMB share ] ]] - shout [[ description = [ Enable support for streaming through shout (mp3, and ogg if ogg is enabled) ] ]] - soundcloud [[ description = [ SoundCloud.com support (input) ] ]] - soxr [[ description = [ Enable support for the libsoxr resampler ] ]] - sqlite [[ description = [ Enable support for storing the MPD database in an Sqlite database ] ]] - systemd [[ description = [ systemd socket activation support ] ]] - upnp [[ description = [ Support Service Discovery via UPnP ] ]] - zip [[ description = [ zip archive support ] ]] - ( - aac mp3 mikmod musepack wavpack - audiofile [[ description = [ Enable audiofile support, enables wave support ] ]] - ffmpeg [[ description = [ Enable the ffmpeg input plugin, allowing you to play all audio formats supported by ffmpeg/libav ] ]] - modplug [[ description = [ mod-like file format support ] ]] - ( flac shout vorbis ) [[ requires = ogg ]] - ) [[ number-selected = at-least-one ]] - ffmpeg? ( ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]] ) -" - -DEPENDENCIES=" - build: - virtual/pkg-config - doc? ( - app-text/docbook-xml-dtd:4.2 - app-text/xmlto - app-doc/doxygen - ) - build+run: - app-arch/bzip2 - dev-libs/boost[>=1.46] - dev-libs/expat - dev-libs/glib:2[>=2.28] - dev-libs/icu:= - aac? ( media-libs/faad2 ) - alsa? ( sys-sound/alsa-lib[>=0.9.0] ) - audiofile? ( media-libs/audiofile[>=0.3] ) - avahi? ( net-dns/avahi ) - cdio? ( - dev-libs/libcdio - dev-libs/libcdio-paranoia - ) - curl? ( net-misc/curl[>=7.18] ) - flac? ( media-libs/flac[>=1.2][ogg?] ) - id3? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - libmpdclient? ( media-libs/libmpdclient[>=2.2] ) - libsamplerate? ( media-libs/libsamplerate[>=0.1.3] ) - mms? ( media-libs/libmms[>=0.4] ) - mikmod? ( media-libs/libmikmod[>=3.3.6] ) - modplug? ( media-libs/libmodplug ) - mp3? ( - media-libs/libmad - media-sound/lame - ) - musepack? ( media-libs/musepack ) - nfs? ( net-fs/libnfs ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - opus? ( media-libs/opus ) - ffmpeg? ( - providers:ffmpeg? ( media/ffmpeg ) - providers:libav? ( media/libav ) - ) - pulseaudio? ( media-sound/pulseaudio[>=0.9.16] ) - samba? ( net-fs/samba ) - shout? ( media-libs/libshout ) - sndfile? ( media-libs/libsndfile ) - soundcloud? ( dev-libs/yajl[>=2.0] ) - soxr? ( media-libs/soxr ) - sqlite? ( dev-db/sqlite:3[>=3.7.3] ) - systemd? ( sys-apps/systemd ) - tcpd? ( sys-apps/tcp-wrappers ) - upnp? ( - net-libs/libupnp - ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - zip? ( dev-libs/zziplib[>=0.13] ) - test: - dev-cpp/cppunit - suggestion: - media-sound/ario [[ description = [ Provides rhythmbox-like client ] ]] - media-sound/gmpc [[ description = [ Provides fast and fully featured GTK-based client ] ]] - media-sound/mpc [[ description = [ Provides command line client ] ]] - media-sound/mpdcron [[ description = [ Executes scripts based on mpd's idle events ] ]] - media-sound/ncmpc [[ description = [ Provides ncurses based command line client ] ]] - media-sound/pms [[ description = [ Provides an alternative ncurses based command line client ] ]] - media-sound/qmpdclient [[ description = [ Provides simple QT client ] ]] - media-sound/sonata [[ description = [ Provides an elegant GTK-based client ] ]] - sys-sound/oss [[ description = [ Provides an alternative sound architecture instead of ALSA ] ]] -" - -DEFAULT_SRC_CONFIGURE_PARAMS=( - --enable-bzip2 - --enable-cue - --enable-daemon - --enable-database - --enable-expat - --enable-fifo - --enable-httpd-output - --enable-icu - --enable-inotify - --enable-ipv6 - --enable-oss - --enable-pipe-output - --enable-recorder-output - --enable-syslog - --enable-tcp - --enable-un - --enable-wave-encoder - --disable-adplug - --disable-ao - --disable-fluidsynth - --disable-gme - --disable-haiku - --disable-iconv - --disable-iso9660 - --disable-mpg123 - --disable-roar - --disable-shine-encoder - --disable-sidplay - --disable-sndio - --disable-twolame-encoder - --disable-werror - --disable-wildmidi - --without-tremor -) - -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( - aac - alsa - audiofile - 'cdio cdio-paranoia' - curl - 'curl webdav' - 'doc documentation' - dsd - ffmpeg - flac - id3 - jack - libmpdclient - 'libsamplerate lsr' - mms - mikmod - modplug - 'mp3 mad' - 'mp3 lame-encoder' - 'musepack mpc' - nfs - vorbis - 'vorbis vorbis-encoder' - openal - opus - 'pulseaudio pulse' - 'samba smbclient' - shout - sndfile - soundcloud - soxr - sqlite - 'systemd systemd-daemon' - 'tcpd libwrap' - upnp - wavpack - 'zip zzip' -) - -DEFAULT_SRC_CONFIGURE_TESTS=( '--enable-test --disable-test' ) - -DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( - 'avahi zeroconf avahi' - "systemd systemdsystemunitdir ${SYSTEMDSYSTEMUNITDIR}" - "systemd systemduserunitdir ${SYSTEMDUSERUNITDIR}" -) - diff --git a/packages/media-sound/pulseaudio/files/pulse-rt.conf b/packages/media-sound/pulseaudio/files/pulse-rt.conf deleted file mode 100644 index 646f291..0000000 --- a/packages/media-sound/pulseaudio/files/pulse-rt.conf +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/security/limits.d/pulse-rt.conf - -# Define capability limits for the pulse-rt group - -# setrlimit -@pulse-rt - rtprio 9 -@pulse-rt - rtprio -11 - diff --git a/packages/media-sound/pulseaudio/files/pulseaudio-support-elogind.patch b/packages/media-sound/pulseaudio/files/pulseaudio-support-elogind.patch deleted file mode 100644 index c30ce96..0000000 --- a/packages/media-sound/pulseaudio/files/pulseaudio-support-elogind.patch +++ /dev/null @@ -1,80 +0,0 @@ -Upstream: No -Author: Rasmus Thomsen <cogitri@exherbo.org> -Reason: Support elogind session tracking -diff --git a/configure.ac b/configure.ac -index 77b5ff5..1f9709d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1220,6 +1220,11 @@ AC_ARG_ENABLE([systemd-login], - AC_ARG_ENABLE([systemd-journal], - AS_HELP_STRING([--disable-systemd-journal],[Disable optional systemd journal support])) - -+#### elogind support (optional) #### -+ -+AC_ARG_ENABLE([elogind-login], -+ AS_HELP_STRING([--disable-elogind-login],[Disable optional elogind login support])) -+ - # Newer systemd's combine their subcomponent libraries into one - # If it exists, we should use it for the further checks - -@@ -1267,6 +1272,19 @@ AC_SUBST(HAVE_SYSTEMD_LOGIN) - AM_CONDITIONAL([HAVE_SYSTEMD_LOGIN], [test "x$HAVE_SYSTEMD_LOGIN" = x1]) - AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], AC_DEFINE([HAVE_SYSTEMD_LOGIN], 1, [Have SYSTEMDLOGIN?])) - -+#### elogind login support (optional) #### -+ -+AS_IF([test "x$enable_elogind_login" != "xno"], -+ [AS_IF([test "x$HAVE_ELOGIND_LOGIN" != "x1"], [PKG_CHECK_MODULES(LIBELOGIND, [ libelogind ], HAVE_ELOGIND_LOGIN=1, HAVE_ELOGIND_LOGIN=0)])], -+ HAVE_ELOGIND_LOGIN=0) -+ -+AS_IF([test "x$enable_elogind_login" = "xyes" && test "x$HAVE_ELOGIND_LOGIN" = "x0"], -+ [AC_MSG_ERROR([*** Needed elogind login support not found])]) -+ -+AC_SUBST(HAVE_ELOGIND_LOGIN) -+AM_CONDITIONAL([HAVE_ELOGIND_LOGIN], [test "x$HAVE_ELOGIND_LOGIN" = x1]) -+AS_IF([test "x$HAVE_ELOGIND_LOGIN" = "x1"], AC_DEFINE([HAVE_ELOGIND_LOGIN], 1, [Have ELOGINDLOGIN?])) -+ - #### systemd journal support (optional) #### - - AS_IF([test "x$enable_systemd_journal" != "xno"], -@@ -1565,6 +1583,7 @@ AS_IF([test "x$HAVE_UDEV" = "x1"], ENABLE_UDEV=yes, ENABLE_UDEV=no) - AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], ENABLE_SYSTEMD_DAEMON=yes, ENABLE_SYSTEMD_DAEMON=no) - AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], ENABLE_SYSTEMD_LOGIN=yes, ENABLE_SYSTEMD_LOGIN=no) - AS_IF([test "x$HAVE_SYSTEMD_JOURNAL" = "x1"], ENABLE_SYSTEMD_JOURNAL=yes, ENABLE_SYSTEMD_JOURNAL=no) -+AS_IF([test "x$HAVE_ELOGIND_LOGIN" = "x1"], ENABLE_ELOGIND_LOGIN=yes, ENABLE_ELOGIND_LOGIN=no) - AS_IF([test "x$HAVE_BLUEZ_4" = "x1"], ENABLE_BLUEZ_4=yes, ENABLE_BLUEZ_4=no) - AS_IF([test "x$HAVE_BLUEZ_5" = "x1"], ENABLE_BLUEZ_5=yes, ENABLE_BLUEZ_5=no) - AS_IF([test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"], ENABLE_BLUEZ_5_OFONO_HEADSET=yes, ENABLE_BLUEZ_5_OFONO_HEADSET=no) -diff --git a/src/Makefile.am b/src/Makefile.am -index 3ff1139..16ae3f6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1421,6 +1421,11 @@ modlibexec_LTLIBRARIES += \ - module-systemd-login.la - endif - -+if HAVE_ELOGIND_LOGIN -+modlibexec_LTLIBRARIES += \ -+ module-systemd-login.la -+endif -+ - if HAVE_DBUS - modlibexec_LTLIBRARIES += \ - module-rygel-media-server.la \ -diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c -index d15bee5..a8b0dc5 100644 ---- a/src/modules/module-systemd-login.c -+++ b/src/modules/module-systemd-login.c -@@ -28,7 +28,12 @@ - #include <stdlib.h> - #include <sys/types.h> - -+#ifdef HAVE_SYSTEMD_LOGIN - #include <systemd/sd-login.h> -+#endif -+#ifdef HAVE_ELOGIND_LOGIN -+#include <elogind/sd-login.h> -+#endif - - #include <pulse/xmalloc.h> - diff --git a/packages/media-sound/pulseaudio/pulseaudio-12.0.exheres-0 b/packages/media-sound/pulseaudio/pulseaudio-12.0.exheres-0 deleted file mode 100644 index 04fdd82..0000000 --- a/packages/media-sound/pulseaudio/pulseaudio-12.0.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2009 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Public License v2 - -require pulseaudio - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES+=( - "${FILES}"/pulseaudio-support-elogind.patch -) - - diff --git a/packages/media-sound/pulseaudio/pulseaudio-scm.exheres-0 b/packages/media-sound/pulseaudio/pulseaudio-scm.exheres-0 deleted file mode 100644 index 33e7121..0000000 --- a/packages/media-sound/pulseaudio/pulseaudio-scm.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2009 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Public License v2 - -require pulseaudio - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/media-sound/pulseaudio/pulseaudio.exlib b/packages/media-sound/pulseaudio/pulseaudio.exlib deleted file mode 100644 index ef6b0b5..0000000 --- a/packages/media-sound/pulseaudio/pulseaudio.exlib +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2009 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Public License v2 - -require bash-completion \ - option-renames [ renames=[ 'gtk3 gtk' 'systemd providers:systemd' ] ] \ - systemd-service \ - udev-rules \ - zsh-completion \ - autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ] \ - gsettings - -export_exlib_phases src_prepare src_install - -SUMMARY="A sound server for POSIX and Win32 systems" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio" - -if ever is_scm; then - DOWNLOADS="" - SCM_REPOSITORY="https://anongit.freedesktop.org/git/${PN}/${PN}.git" - require scm-git -else - DOWNLOADS="https://freedesktop.org/software/${PN}/releases/${PNV}.tar.xz" -fi - -REMOTE_IDS="freecode:${PN}" - -UPSTREAM_CHANGELOG="${HOMEPAGE}/Notes/${PV} [[ lang = en ]]" - -LICENCES=" - AGPL-3 [[ note = [ src/utils/qpaeq ] ]] - LGPL-2.1 - MIT [[ note = [ src/modules/reserve{-monitor,}.{c,h} src/modules/rtkit.{c,h} ] ]] - g711 [[ note = [ src/pulsecore/g711.c ] ]] - adrian-license [[ note = [ src/modules/echo-cancel/* ] ]] - as-is [[ note = [ src/pulsecore/g711.h ] ]] - - bluetooth? ( - GPL-2 [[ note = [ src/modules/bluetooth/{a2dp-codecs.h,proximity-helper.c}, everything using - the bluetooth module (libpulsecore and everything linking against it), see LICENSE ] ]] - LGPL-2.1 [[ note = [ the pulseaudio client lib (libpulse), see LICENSE ] ]] - ) -" -SLOT="0" -MYOPTIONS=" - X [[ description = [ Enable X session integration ] ]] - async-dns [[ description = [ Support for asynchronous name service queries ] ]] - avahi - bluetooth - caps - equalizer [[ description = [ Modules which need equalizer functions ] ]] - gtk - jack - journald - oss - tcpd - webrtc-aec [[ description = [ Alternative to speex for echo cancellation, has higher quality ] ]] - arm_cpu_features: neon - ( linguas: as be bn_IN ca cs de de_CH el es fi fr gl gu he hi hr hu id it ja kn ko lt ml mr nl - nn oc or pa pl pt pt_BR ru sk sr sr@latin sv ta te tr uk zh_CN zh_TW ) - ( providers: libressl openssl ) [[ number-selected = exactly-one ]] - ( providers: eudev systemd ) [[ number-selected = exactly-one ]] - ( providers: consolekit elogind systemd ) [[ - *description = [ Session tracking provider ] - number-selected = at-most-one - ]] -" - -DEPENDENCIES=" - build: - dev-util/intltool[>=0.35.0] - sys-devel/gettext[>=0.18.1] - virtual/pkg-config[>=0.20] - build+run: - group/audio - group/pulse - group/pulse-access - group/pulse-rt - user/pulse - dev-libs/glib:2[>=2.26.0] - dev-libs/orc:0.4[>=0.4.16] [[ - note = [ dev-libs/orc-0.4.15 is known to cause freezes, see https://bugs.freedesktop.org/show_bug.cgi?id=41589 ] - ]] - media-libs/libsndfile[>=1.0.20] - media-libs/soxr[>=0.1.1] - media-libs/speexdsp - sys-apps/dbus[>=1.4.12][providers:consolekit?][providers:elogind?][providers:systemd?] - sys-devel/libtool[>=2.4] - sys-libs/gdbm - sys-sound/alsa-lib[>=1.0.19] - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11[xcb(+)] - x11-libs/libxcb[>=1.6] - x11-libs/libXtst - x11-utils/xcb-util - ) - async-dns? ( net-libs/libasyncns[>=0.1] ) - avahi? ( net-dns/avahi[>=0.6.0][dbus] ) - bluetooth? ( - media-libs/sbc[>=1.0] - net-wireless/bluez[>=5.0] - ) - caps? ( sys-libs/libcap ) - equalizer? ( sci-libs/fftw ) - gtk? ( x11-libs/gtk+:3[>=3.0] ) - jack? ( media-sound/jack-audio-connection-kit[>=0.117] ) - journald? ( sys-apps/systemd[>=165] ) - providers:elogind? ( sys-auth/elogind[>=165] ) - providers:eudev? ( sys-apps/eudev ) - providers:libressl? ( dev-libs/libressl:= ) - providers:openssl? ( dev-libs/openssl ) - providers:systemd? ( sys-apps/systemd[>=165] ) - tcpd? ( sys-apps/tcp-wrappers ) - webrtc-aec? ( media-libs/webrtc-audio-processing[>=0.2] ) - run: - providers:consolekit? ( sys-auth/ConsoleKit2 ) - test: - dev-libs/check[>=0.9.10] - suggestion: - media-sound/pavucontrol [[ description = [ Provides a simple GTK based volume mixer tool ] ]] - media-sound/pulseaudio-dlna [[ description = [ Stream to DLNA/UPNP and Chromecast devices via PulseAudio ] ]] - sys-sound/oss [[ description = [ Provides an alternative sound architecture instead of ALSA ] ]] - sound-themes/sound-theme-freedesktop [[ description = [ Sample PulseAudio event sounds mentioned in default.pa ] ]] -" - - -DEFAULT_SRC_CONFIGURE_PARAMS=( - --localstatedir=/var - --enable-alsa # udev needs alsa or oss support - --enable-dbus # recommended by upstream - --enable-glib2 - --enable-gsettings # We already depend on glib anyway and this just builds a module - --enable-ipv6 - --enable-manpages - --enable-memfd - --enable-openssl - --enable-udev - --disable-adrian-aec # alternative to speex - --disable-bluez4 - --disable-bluez5-ofono-headset - --disable-esound - --disable-gconf - --disable-lirc - --disable-per-user-esound-socket - --disable-samplerate - --disable-solaris - --with-database=gdbm # alternative tdb or simple - --with-speex # recommended and default resampler - --with-soxr # will eventually replace speex as the default resampler - --with-systemduserunitdir="${SYSTEMDUSERUNITDIR}" - --with-udev-rules-dir="${UDEVRULESDIR}" - CFLAGS="${CFLAGS} -D_GNU_SOURCE" -) - -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( - 'X x11' - 'arm_cpu_features:neon neon-opt' - 'async-dns asyncns' - avahi - 'bluetooth bluez5' - 'bluetooth bluez5-native-headset' - 'gtk gtk3' - jack - 'journald systemd-journal' - 'oss oss-output' - 'oss oss-wrapper' - 'providers:elogind elogind-login' - 'providers:systemd systemd-daemon' - 'providers:systemd systemd-login' - 'tcpd tcpwrap' - webrtc-aec -) -DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( - "bash-completion bash-completion-dir /usr/share/bash-completion/completions" - caps - "equalizer fftw" - "zsh-completion zsh-completion-dir /usr/share/zsh/site-functions" -) -DEFAULT_SRC_CONFIGURE_TESTS=( '--enable-tests --disable-tests' ) - -AT_M4DIR=( m4 ) - -pulseaudio_src_prepare() { - # Pulseaudio i18n is weird - edo mkdir -p build-aux - edo touch build-aux/config.rpath - - edo intltoolize --automake --copy --force - autotools_src_prepare -} - -pulseaudio_src_install() { - default - - # keep the administrator's override directives directories - keepdir /etc/pulse/{client,daemon}.conf.d - - insinto /etc/security/limits.d/ - doins "${FILES}"/pulse-rt.conf - - keepdir /usr/$(exhost --target)/libexec/pulse - - option providers:systemd || option providers:elogind && edo sed \ - -e '/module-console-kit/,/.endif/{ /^#/!{ s/^/#/ } }' \ - -i "${IMAGE}"/etc/pulse/default.pa - - ! option zsh-completion && edo rm -r "${IMAGE}"/no -} - diff --git a/packages/media/mpv/mpv.exlib b/packages/media/mpv/mpv.exlib deleted file mode 100644 index 7c1201b..0000000 --- a/packages/media/mpv/mpv.exlib +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 2012-2015 Johannes Nixdorf <mixi@exherbo.org> -# Based in part upon 'mplayer2.exlib', which is -# Copyright 2011 Elias Pipping <pipping@exherbo.org> -# Copyright 2011 Alex Elsayed <eternaleye@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -# last checked revision: f59371de2170141fc28540d03c4e7ecc62844ebf - -require freedesktop-desktop github [ user="mpv-player" tag="v${PV}" ] gtk-icon-cache waf \ - lua [ multibuild=false whitelist="5.1 5.2" with_opt=true ] - -export_exlib_phases src_prepare src_configure pkg_postrm pkg_postinst - -if ever at_least 0.28; then - WAF_VER=1.9.8 -else - WAF_VER=1.8.12 -fi - -SUMMARY="Video player based on MPlayer/mplayer2" -HOMEPAGE="https://mpv.io" -DOWNLOADS+=" https://waf.io/pub/release/waf-${WAF_VER}" - -UPSTREAM_RELEASE_NOTES="https://github.com/mpv-player/mpv/releases" - -LICENCES="GPL-2 GPL-3 LGPL-2.1" -SLOT="0" - -# TODO(sardemff7): Drop dvd-menu option as there is no menu support in mpv -MYOPTIONS=" - alsa - bluray [[ description = [ Adds support for video blurays ] ]] - cd [[ description = [ Adds support for audio CDs ] ]] - drm [[ description = [ Adds support for a video output directly to the framebuffer ] ]] - dvd - dvd-menu [[ description = [ Adds dvd menu support through libdvdnav ] - requires = [ dvd ] ]] - icc [[ description = [ Adds support for using ICC profiles through lcms2 ] ]] - lua [[ description = [ Adds lua scripting support and an onscreen controller ] ]] - opengl - pulseaudio - sndio [[ description = [ Adds support for sound output through sndio (OpenBSD sound API, also ported to Linux) ] ]] - va [[ description = [ Adds support for decoding and presenting video using the Video Acceleration API ] - requires = [ providers: ffmpeg ] ]] - vdpau [[ description = [ Adds support for presenting and decoding video using the VDPAU API (-vo=vdpau and -hwdec=vdpau) ] - requires = [ providers: ffmpeg ] ]] - wayland - X - zsh-completion [[ description = [ Generate and install a zsh completion file ] ]] - ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]] - ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]] -" - -# disabled because i can't figure out waf -RESTRICT="test" - -DEPENDENCIES=" - build: - dev-lang/python:* - dev-python/docutils - virtual/pkg-config - X? ( x11-proto/xorgproto ) - zsh-completion? ( dev-lang/perl:*[>=5.8] ) - build+run: - media-libs/libass[fontconfig][>=0.12.1] - sys-libs/ncurses - sys-libs/zlib - alsa? ( sys-sound/alsa-lib[>=1.0.18] ) - bluray? ( media-libs/libbluray[>=0.3.0] ) - cd? ( - dev-libs/libcdio - dev-libs/libcdio-paranoia - ) - drm? ( x11-dri/libdrm ) - dvd? ( media-libs/libdvdread[>=4.1.0] ) - dvd-menu? ( media-libs/libdvdnav[>=4.2.0] ) - icc? ( media-libs/lcms2[>=2.6] ) - opengl? ( x11-dri/mesa[>=9.0.0][X?][wayland?] ) - providers:ffmpeg? ( media/ffmpeg[>=3.3][va?][vdpau?] ) - providers:ijg-jpeg? ( media-libs/jpeg:= ) - providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) - providers:libav? ( media/libav[>=12] ) - pulseaudio? ( media-sound/pulseaudio[>=1.0] ) - sndio? ( sys-sound/sndio ) - va? ( x11-libs/libva[>=1.4.0][X?][wayland?] ) - vdpau? ( x11-libs/libvdpau[>=0.2] ) - wayland? ( - sys-libs/wayland[>=1.6.0] - x11-libs/libxkbcommon[>=0.3.0] - ) - X? ( - x11-libs/libX11[>=1.0.0] - x11-libs/libXScrnSaver[>=1.0.0] - x11-libs/libXext[>=1.0.0] - x11-libs/libXinerama[>=1.0.0] - x11-libs/libXrandr[>=1.2.0] - x11-libs/libXv - ) - suggestion: - lua? ( net-misc/youtube-dl[>=2015.02.23.1] [[ description = [ Support to play videos from YouTube and other video sites ] ]] ) -" - -if ever at_least 0.28; then - DEPENDENCIES+=" - build+run: - providers:ffmpeg? ( media/ffmpeg[>=4.0][va?][vdpau?] ) - wayland? ( sys-libs/wayland-protocols ) - " -fi - -mpv_src_prepare() { - edo cp "${FETCHEDDIR}"/waf-${WAF_VER} waf - chmod +x waf - - default -} - -mpv_src_configure() { - local args=( - ## paths - --prefix=/usr/$(exhost --target) - --confdir=/etc/${PN} - --datadir=/usr/share - --docdir=/usr/share/doc/${PNVR} - --htmldir=/usr/share/doc/${PNVR}/html - - ## doc - --enable-manpage-build - --disable-html-build - --disable-pdf-build - - ## misc - # Since upstream commit d0238711 this is disabled by default and will be deprecated at some - # point soon. - --enable-iconv - --enable-jpeg - --enable-libass - --enable-libass-osd - --enable-libmpv-shared - --disable-javascript - --disable-macos-touchbar - --disable-test - --disable-uchardet - --disable-vapoursynth - --disable-vapoursynth-lazy - $(option lua --lua=${LUA_ABIS/./}fbsd --disable-lua) - $(option_enable zsh-completion zsh-comp) - - ## sources - --enable-audio-input - --enable-dvbin - --enable-tv - --enable-tv-v4l2 - --disable-libarchive - --disable-libsmbclient - --disable-libv4l2 - $(option_enable bluray libbluray) - $(option_enable cd cdda) - $(option_enable dvd dvdread) - $(option_enable dvd-menu dvdnav) - $(option_enable providers:ffmpeg libavdevice) - - ## audio - --disable-rubberband - - ## audio out - --enable-oss-audio - --disable-audiounit - --disable-coreaudio - --disable-jack - --disable-openal - --disable-opensles - --disable-rsound - --disable-sdl2 - --disable-sndio - --disable-wasapi - $(option_enable alsa) - $(option_enable pulseaudio pulse) - $(option_enable sndio) - - ## video - --disable-caca - $(option_enable icc lcms2) - - ## video out - $(option_enable drm) - $(if option drm; then - option_enable opengl egl-drm - option_enable va vaapi-drm - fi) - - $(option_enable opengl gl) - $(option_enable opengl plain-gl) - - $(option_enable wayland) - $(if option wayland; then - option_enable opengl gl-wayland - option_enable va vaapi-wayland - fi) - - $(option_enable X x11) - $(option_enable X xv) - $(if option X; then - option_enable opengl gl-x11 - option_enable opengl egl-x11 - option_enable va vaapi-x11 - if option opengl; then - option_enable va vaapi-glx - option_enable vdpau vdpau-gl-x11 - fi - fi) - - ## platform - --disable-android - --disable-cocoa - --disable-direct3d - --disable-egl-angle - --disable-gl-cocoa - --disable-gl-win32 - --disable-ios-gl - --disable-mali-fbdev - --disable-rpi - --disable-videotoolbox-gl - - ## hwaccel - --disable-cuda-hwaccel - --disable-d3d-hwaccel - --disable-d3d9-hwaccel - --disable-gl-dxinterop-d3d9 - $(option_enable va vaapi) - $(option_enable vdpau) - ) - -if ever at_least 0.28; then - args+=( - ## video out - --disable-crossc - --disable-shaderc - --disable-vulkan - $(option_enable drm drmprime) - $(option_enable wayland wayland-protocols) - $(option_enable wayland wayland-scanner) - ## platform - --disable-d3d11 - ) -else - args+=( - ## misc - --enable-shm - --enable-termios - ## hwaccel - --disable-d3d-hwaccel-new - --disable-videotoolbox-hwaccel-new - --disable-videotoolbox-hwaccel-old - $(option_enable va vaapi-hwaccel) - $(option_enable vdpau vdpau-hwaccel) - ) -fi - - ewaf --jobs=1 configure \ - "${args[@]}" -} - -mpv_pkg_postrm() { - freedesktop-desktop_pkg_postrm - gtk-icon-cache_pkg_postrm -} - -mpv_pkg_postinst() { - freedesktop-desktop_pkg_postinst - gtk-icon-cache_pkg_postinst -} - diff --git a/packages/net-fs/samba/files/a222b7506b53e689708834237f18877231dca589.patch b/packages/net-fs/samba/files/a222b7506b53e689708834237f18877231dca589.patch deleted file mode 100644 index 8bcbf3d..0000000 --- a/packages/net-fs/samba/files/a222b7506b53e689708834237f18877231dca589.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a222b7506b53e689708834237f18877231dca589 Mon Sep 17 00:00:00 2001 -From: Volker Lendecke <vl@samba.org> -Date: Sat, 3 Feb 2018 07:07:55 +0100 -Upstream: yes, in master -Subject: [PATCH] libgpo: Fix the build --without-ads - -Signed-off-by: Volker Lendecke <vl@samba.org> -Reviewed-by: David Disseldorp <ddiss@samba.org> - -Autobuild-User(master): David Disseldorp <ddiss@samba.org> -Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144 ---- - libgpo/pygpo.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c -index 7a02a0dc2aa..b6b53b76212 100644 ---- a/libgpo/pygpo.c -+++ b/libgpo/pygpo.c -@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self, - return result; - } - -+#ifdef HAVE_ADS - static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const char *samaccountname, - uint32_t *uac_ret, const char **dn_ret) -@@ -468,11 +469,15 @@ static PyObject *py_ads_get_gpo_list(ADS *self, PyObject *args, PyObject *kwds) - return ret; - } - -+#endif -+ - static PyMethodDef ADS_methods[] = { - { "connect", (PyCFunction)py_ads_connect, METH_NOARGS, - "Connect to the LDAP server" }, -+#ifdef HAVE_ADS - { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS, - NULL }, -+#endif - { NULL } - }; - diff --git a/packages/net-fs/samba/samba-4.8.2.exheres-0 b/packages/net-fs/samba/samba-4.8.2.exheres-0 deleted file mode 100644 index 118f43e..0000000 --- a/packages/net-fs/samba/samba-4.8.2.exheres-0 +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2011-2013 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -require samba - -PLATFORMS="~amd64" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/a222b7506b53e689708834237f18877231dca589.patch -) - diff --git a/packages/net-fs/samba/samba-scm.exheres-0 b/packages/net-fs/samba/samba-scm.exheres-0 deleted file mode 100644 index 2d800c1..0000000 --- a/packages/net-fs/samba/samba-scm.exheres-0 +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2011 Pierre Lejeune <superheron@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="git://git.samba.org/samba.git" - -require samba scm-git - -DOWNLOADS="" -PLATFORMS="~amd64" - diff --git a/packages/net-fs/samba/samba.exlib b/packages/net-fs/samba/samba.exlib deleted file mode 100644 index cdf9f85..0000000 --- a/packages/net-fs/samba/samba.exlib +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 2011-2012 Pierre Lejeune <superheron@gmail.com> -# Copyright 2013-2017 Wulf C. Krueger <philantrop@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require pam wafsamba systemd-service - -export_exlib_phases src_prepare src_configure src_install - -SUMMARY="Samba provides seamless file and print services to SMB/CIFS clients, e. g. Windows" -DESCRIPTION=" -Samba is a free software implementation of the SMB/CIFS networking protocol that -can be run on many platforms other than Microsoft Windows. Samba uses the TCP/IP -protocol that is installed on the host. When correctly configured, it allows -that host to interact with a Microsoft Windows client or server as if it is a Windows -file and print server. Additionally, it can act as a PDC, a domain member server -or as a part of an Active Directory. -" -HOMEPAGE="https://www.${PN}.org" -DOWNLOADS="mirror://samba/stable/${PNV}.tar.gz" - -BUGS_TO="tgurr@exherbo.org" - -LICENCES="GPL-3" -SLOT="0" -MYOPTIONS=" - acl - addc [[ - description = [ Allow Samba to act as an Active Directory Domain Controller ] - requires = [ gnutls ] - ]] - ads [[ - description = [ Enable Active Directory support ] - requires = [ acl gnutls ldap winbind ] - ]] - avahi [[ description = [ Enable Avahi support ] ]] - cluster [[ description = [ Enable the Samba cluster extensions ] ]] - cups - gnutls - gpg [[ - description = [ Store cleartext passwords in a PGP/OpenGPG encrypted form ] - requires = [ addc ] - ]] - ldap - pam - quotas [[ description = [ Enables support for user quotas ] ]] - syslog [[ description = [ Enables support for syslog ] ]] - system-krb5 [[ description = [ Use krb5 instead of the bundled heimdal ] ]] - systemd - winbind [[ description = [ Enables support for the winbind auth daemon ] ]] -" - -# The test are simply broken. -RESTRICT="test" - -# !system-krb5? ( app-crypt/heimdal[>=1.5] ) -DEPENDENCIES=" - build+run: - app-arch/libarchive[>=3.1.2] - dev-db/ldb[>=1.3.3][python_abis:*(-)?] - dev-db/tdb[>=1.3.15][python_abis:*(-)?] - dev-lang/perl:= - dev-libs/iniparser - dev-libs/libbsd [[ note = [ automagic ] ]] - dev-libs/libgcrypt - dev-libs/libgpg-error - dev-libs/popt - dev-libs/talloc[>=2.1.11][python_abis:*(-)?] - dev-libs/tevent[>=0.9.36][python_abis:*(-)?] - dev-perl/Parse-Yapp - dev-python/iso8601[python_abis:*(-)?] - dev-util/subunit[python_abis:*(-)?] - net-libs/cyrus-sasl - sys-apps/attr - sys-apps/dbus - sys-libs/libcap - pam? ( sys-libs/pam ) - sys-libs/readline:= - acl? ( sys-apps/acl ) - addc? ( dev-python/pycrypto[python_abis:*(-)?] ) - ads? ( dev-python/dnspython[python_abis:*(-)?] ) - avahi? ( net-dns/avahi ) - cluster? ( dev-libs/ctdb ) - cups? ( net-print/cups ) - gnutls? ( dev-libs/gnutls ) - gpg? ( - app-crypt/gpgme - dev-python/pygpgme[python_abis:*(-)?] - ) - ldap? ( net-directory/openldap ) - syslog? ( virtual/syslog ) - system-krb5? ( app-crypt/krb5[>=1.15.1] ) - systemd? ( sys-apps/systemd ) - test: - dev-util/cmocka[>=1.1.1] - sys-libs/nss_wrapper[>=1.1.3] - sys-libs/pam_wrapper[>=1.0.4] - sys-libs/resolv_wrapper[>=1.1.4] - sys-libs/socket_wrapper[>=1.1.9] - sys-libs/uid_wrapper[>=1.2.4] - suggestion: - app-antivirus/clamav [[ - description = [ vfs_virusfilter can use ClamAV to scan for viruses ] - ]] - media-gfx/graphviz [[ - description = [ samba-tool utilizes Graphviz for dot output and text-based heatmaps ] - ]] -" - -WAF_SRC_CONFIGURE_PARAMS+=( - --builtin-libraries=NONE - --nopyc - --nopyo - --sbindir=/usr/x86_64-pc-linux-gnu/bin - --systemd-install-services - --enable-fhs - --enable-pthreadpool - --disable-cephfs - --disable-glusterfs - --with-iconv - --with-libarchive - --with-lockdir=/run/lock/samba - --with-modulesdir=/usr/$(exhost --target)/lib/samba - --with-piddir=/run - --with-privatedir=/var/lib/${PN}/private - --with-sendfile-support - --with-sockets-dir=/run/samba - --with-systemddir=${SYSTEMDSYSTEMUNITDIR} - --with-utmp - --without-automount - --without-dmapi - --without-fam - --without-lttng - --without-ntvfs-fileserver -) - -if ever is_scm; then - DEPENDENCIES+=" - build+run: - dev-db/ldb[>=1.4.0][python_abis:*(-)?] - - " - WAF_SRC_CONFIGURE_PARAMS+=( - --without-json-audit - ) -fi - -WAF_SRC_CONFIGURE_OPTION_ENABLES=( - avahi - cups - gnutls -) - -WAF_SRC_CONFIGURE_OPTION_WITHS=( - "acl acl-support" - ads - "ads dnsupdate" - "cluster cluster-support" - "gpg gpgme" - ldap - quotas - syslog - systemd - winbind -) - -WAF_SRC_CONFIGURE_TESTS=( - --enable-selftest -) - -# Build failed: -> missing file: '[...]/bin/default/docs-xml/smbdotconf/parameters.all.xml' -#WAF_SRC_COMPILE_PARAMS+=( -j1 ) - -samba_src_prepare() { - default - - # adjust to /run - edo sed \ - -e "s:/var/run:/run:g" \ - -i packaging/systemd/samba.conf.tmp - - # rpcgen hardcodes the cpp command - local dir=${WORKBASE}/symlinked-build-tools - edo mkdir -p ${dir} - edo ln -s /usr/host/bin/$(exhost --target)-cpp ${dir}/cpp - edo sed \ - -e "s:rpcgen:rpcgen -Y ${WORKBASE}/symlinked-build-tools:g" \ - -i source3/modules/wscript_build \ - -i ctdb/wscript - -# # ensure system heimdal is used -# if ever at_least 4.3.0; then -# edo rm source4/heimdal_build/krb5-types.h -# edo rm source4/heimdal/kdc/kdc.h -# fi -} - -samba_src_configure() { - WAF_SRC_CONFIGURE_PARAMS+=( - $(option system-krb5 && echo --with-system-mitkrb5) - $(option !addc && echo --without-ad-dc) - ) - - # Samba doesn't build with heimdal 1.5.3, 1.6_rc2 or git master - if ! option system-krb5; then - WAF_SRC_CONFIGURE_PARAMS+=( - --bundled-libraries=NONE,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile - ) - else - WAF_SRC_CONFIGURE_PARAMS+=( - --bundled-libraries=NONE - ) - fi - if option pam; then - WAF_SRC_CONFIGURE_PARAMS+=( - --with-pam - --with-pammodulesdir=$(getpam_mod_dir) - ) - else - WAF_SRC_CONFIGURE_PARAMS+=( - --without-pam - ) - fi - - waf_src_configure -} - -samba_src_install() { - waf_src_install - - python_bytecompile - - option addc || edo rm "${IMAGE}"/${SYSTEMDSYSTEMUNITDIR}/samba.service - option winbind || edo rm "${IMAGE}"/${SYSTEMDSYSTEMUNITDIR}/winbind.service - - # tmpfile is included but doesn't get installed, last checked: 4.8.0 - insinto /usr/$(exhost --target)/lib/tmpfiles.d - hereins ${PN}.conf <<EOF -d /run/samba 0755 root root - -EOF - - if option cluster; then - insinto /usr/$(exhost --target)/lib/tmpfiles.d - hereins ctdb.conf <<EOF -d /run/ctdb 0755 root root - -EOF - fi - - if option cups; then - dodir $(cups-config --serverbin)/backend - dosym /usr/$(exhost --target)/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - keepdir /var/{cache,lib,log}/samba - edo rmdir "${IMAGE}"/run/{lock/{samba,},{samba,}} - - keepdir /var/lib/samba/bind-dns - keepdir /var/lib/samba/private/smbd.tmp/messaging - - insinto /etc/${PN} - doins "${WORK}"/examples/smb.conf.default -} - diff --git a/packages/net-misc/tor/files/libressl.patch b/packages/net-misc/tor/files/libressl.patch deleted file mode 100644 index e448031..0000000 --- a/packages/net-misc/tor/files/libressl.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c -index 0200d0fe9..30e276d5d 100644 ---- a/src/lib/crypt_ops/crypto_hkdf.c -+++ b/src/lib/crypt_ops/crypto_hkdf.c -@@ -19,10 +19,10 @@ - - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) -+/*#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) - #define HAVE_OPENSSL_HKDF 1 - #include <openssl/kdf.h> --#endif -+#endif */ - - #include <string.h> - diff --git a/packages/net-misc/tor/files/openrc/confd/tor b/packages/net-misc/tor/files/openrc/confd/tor deleted file mode 100644 index 4195bf3..0000000 --- a/packages/net-misc/tor/files/openrc/confd/tor +++ /dev/null @@ -1,3 +0,0 @@ -# -# Set the file limit -rc_ulimit="-n 30000" diff --git a/packages/net-misc/tor/files/openrc/initd/tor b/packages/net-misc/tor/files/openrc/initd/tor deleted file mode 100644 index 799cca1..0000000 --- a/packages/net-misc/tor/files/openrc/initd/tor +++ /dev/null @@ -1,84 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -PIDFILE=/var/run/tor/tor.pid -CONFFILE=/etc/tor/torrc -GRACEFUL_TIMEOUT=${GRACEFUL_TIMEOUT:-60} - -# See bug #523552, and https://trac.torproject.org/projects/tor/ticket/5525 -# Graceful = wait 30 secs or so until all connections are properly closed. -extra_commands="checkconfig" -extra_started_commands="graceful gracefulstop reload" -description="Anonymizing overlay network for TCP" -description_checkconfig="Check for valid config file." -description_reload="Reload the configuration." -description_graceful="Gracefully restart." -description_gracefulstop="Gracefully stop." - -depend() { - need net -} - -checkconfig() { - # first check that it exists - if [ ! -f ${CONFFILE} ] ; then - eerror "You need to setup ${CONFFILE} first" - eerror "Example is in ${CONFFILE}.sample" - return 1 - fi - - # now verify whether the configuration is valid - /usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - einfo "Tor configuration (${CONFFILE}) is valid." - return 0 - else - eerror "Tor configuration (${CONFFILE}) not valid." - /usr/bin/tor --verify-config -f ${CONFFILE} - return 1 - fi -} - -start() { - checkconfig || return 1 - checkpath -d -m 0755 -o tor:tor /var/run/tor - ebegin "Starting Tor" - HOME=/var/lib/tor - start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping Tor" - start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}" - eend $? -} - -graceful() { - gracefulstop - start - eend $? -} - -gracefulstop() { - local rc=0 - ebegin "Gracefully stopping Tor" - ebegin "This can take up to ${GRACEFUL_TIMEOUT} seconds" - start-stop-daemon -P --stop --signal INT -R ${GRACEFUL_TIMEOUT} --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}" - rc=$? - eend "done" - eend $rc -} - -reload() { - if [ ! -f ${PIDFILE} ]; then - eerror "${SVCNAME} isn't running" - return 1 - fi - checkconfig || return 1 - ebegin "Reloading Tor configuration" - start-stop-daemon --signal HUP --pidfile ${PIDFILE} - eend $? -} diff --git a/packages/net-misc/tor/files/systemd/tor.service b/packages/net-misc/tor/files/systemd/tor.service deleted file mode 100644 index 5ca14e5..0000000 --- a/packages/net-misc/tor/files/systemd/tor.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Anonymizing Internet communication system - -[Service] -ExecStart=/usr/bin/tor -f /etc/tor/torrc -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/packages/net-misc/tor/files/tor.conf b/packages/net-misc/tor/files/tor.conf deleted file mode 100644 index 4e4c639..0000000 --- a/packages/net-misc/tor/files/tor.conf +++ /dev/null @@ -1,3 +0,0 @@ -tor hard nofile 30000 -tor soft nofile 30000 - diff --git a/packages/net-misc/tor/files/tor.logrotate.in.patch b/packages/net-misc/tor/files/tor.logrotate.in.patch deleted file mode 100644 index 083913f..0000000 --- a/packages/net-misc/tor/files/tor.logrotate.in.patch +++ /dev/null @@ -1,20 +0,0 @@ -Source: Gentoo (bug #178975) -Upstream: no -Reason: Logrotate script fails if Tor is not running. This should really go - upstream. - -diff -ruN tor-0.2.5.10.orig/contrib/operator-tools/tor.logrotate.in tor-0.2.5.10/contrib/operator-tools/tor.logrotate.in ---- tor-0.2.5.10.orig/contrib/operator-tools/tor.logrotate.in 2014-06-27 23:45:19.000000000 +0200 -+++ tor-0.2.5.10/contrib/operator-tools/tor.logrotate.in 2014-11-01 09:06:46.466585311 +0100 -@@ -6,9 +6,9 @@ - missingok - notifempty - # you may need to change the username/groupname below -- create 0640 _tor _tor -+ create 0640 tor tor - sharedscripts - postrotate -- /etc/init.d/tor reload > /dev/null -+ /etc/init.d/tor reload > /dev/null || true - endscript - } diff --git a/packages/net-misc/tor/files/torrc.sample.in-sane-defaults.patch b/packages/net-misc/tor/files/torrc.sample.in-sane-defaults.patch deleted file mode 100644 index 6919c3c..0000000 --- a/packages/net-misc/tor/files/torrc.sample.in-sane-defaults.patch +++ /dev/null @@ -1,33 +0,0 @@ -Source: Sterling X. Winter <sterling.winter@gmail.com> -Upstream: no -Reason: By default: drop daemon privs to tor/tor, enable logging, use a sane - data dir. - ---- tor-0.2.7.6.orig/src/config/torrc.sample.in 2015-11-13 14:41:38.000000000 +0100 -+++ tor-0.2.7.6/src/config/torrc.sample.in 2016-02-04 13:20:50.024381439 +0100 -@@ -12,6 +12,9 @@ - ## Tor will look for this file in various places based on your platform: - ## https://www.torproject.org/docs/faq#torrc - -+# On startup, setuid to this user and setgid to their primary group. -+User tor -+ - ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't - ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only - ## as a relay, and not make any local application connections yourself. -@@ -40,6 +43,7 @@ - #Log debug file @LOCALSTATEDIR@/log/tor/debug.log - ## Use the system log instead of Tor's logfiles - #Log notice syslog -+Log notice file @LOCALSTATEDIR@/log/tor/tor.log - ## To send all messages to stderr: - #Log debug stderr - -@@ -51,6 +55,7 @@ - ## The directory for keeping all the keys/etc. By default, we store - ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. - #DataDirectory @LOCALSTATEDIR@/lib/tor -+DataDirectory @LOCALSTATEDIR@/lib/tor/data - - ## The port on which Tor will listen for local connections from Tor - ## controller applications, as documented in control-spec.txt. diff --git a/packages/net-misc/tor/tor-scm.exheres-0 b/packages/net-misc/tor/tor-scm.exheres-0 deleted file mode 100644 index b37a0df..0000000 --- a/packages/net-misc/tor/tor-scm.exheres-0 +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 2009 Sterling X. Winter <replica@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 -# Based in part upon 'tor-0.2.0.32-r1.ebuild' from Gentoo, which is: -# Copyright 1999-2008 Gentoo Foundation - -SCM_REPOSITORY="https://git.torproject.org/tor.git" - -SCM_EXTERNAL_REFS=" - src/ext/rust:torrust -" -SCM_SECONDARY_REPOSITORIES=" - torrust -" - -SCM_torrust_REPOSITORY="https://git.torproject.org/tor-rust-dependencies" - -require systemd-service -require openrc-service [ openrc_confd_files=[ "${FILES}"/openrc/confd ] ] -require scm-git -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ] - -SUMMARY="Anonymizing Internet communication system" -DESCRIPTION=" -Tor helps you defend against traffic analysis, a form of network surveillance -that threatens personal freedom and privacy, confidential business activities -and relationships, and state security. Tor protects you by bouncing your -communications around a distributed network of relays run by volunteers all -around the world: it prevents somebody watching your Internet connection from -learning what sites you visit, and it prevents the sites you visit from learning -your physical location. Tor works with many of your existing applications, -including web browsers, instant messaging clients, remote login, and other -applications based on the TCP protocol. -" -HOMEPAGE="http://www.torproject.org/" -DOWNLOADS="" - -LICENCES="BSD-3" -SLOT="0" -PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - debug [[ description = [ Compile with debugging info ] ]] - systemd [[ description = [ Enable systemd notification support ] ]] - ( providers: libressl openssl ) [[ number-selected = exactly-one ]] -" - -DEPENDENCIES=" - build: - sys-devel/automake[>=1.7] - build+run: - app-arch/zstd[>=1.1] - dev-libs/libevent[>=1.2] - dev-libs/libpcap - providers:libressl? ( dev-libs/libressl:= ) - providers:openssl? ( dev-libs/openssl[>=1.0.1] ) - sys-libs/libseccomp - systemd? ( sys-apps/systemd ) - - group/tor - user/tor - - suggestion: - app-admin/logrotate [[ description = [ Use logrotate for rotating logs ] ]] - net-proxy/polipo [[ description = [ - Tor-friendly HTTP proxy, recommended by upstream over Privoxy - ] ]] - net-proxy/torsocks [[ description = [ - Tor-friendly SOCKS proxy, recommended by upstream over tsocks - ] ]] -" - -REMOTE_IDS="freecode:${PN}" -UPSTREAM_CHANGELOG="https://git.torproject.org/checkout/tor/master/ChangeLog [[ lang = en ]]" -UPSTREAM_DOCUMENTATION="https://www.torproject.org/docs/tor-doc-unix.html.en [[ lang = en ]]" -UPSTREAM_RELEASE_NOTES="https://git.torproject.org/checkout/tor/master/ReleaseNotes [[ lang = en ]]" - -DEFAULT_SRC_PREPARE_PATCHES=( - -p1 "${FILES}"/torrc.sample.in-sane-defaults.patch - -p1 "${FILES}"/tor.logrotate.in.patch -) - -src_prepare() { - option providers:libressl && expatch "${FILES}"/libressl.patch - autotools_src_prepare -} - -DEFAULT_SRC_CONFIGURE_PARAMS=( - --enable-lzma - --enable-zstd - --localstatedir=/var - --with-tor-user=tor - --with-tor-group=tor -) -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( debug systemd ) - -DEFAULT_SRC_INSTALL_EXTRA_PREFIXES=( doc/ ) -DEFAULT_SRC_INSTALL_EXTRA_DOCS=( - ReleaseNotes - doc/spec/{{address,control,dir,path,rend,tor,version}-spec,socks-extensions}.txt -) - -src_install() { - default - - keepdir /var/{lib,log}/tor - edo chown tor:tor "${IMAGE}"/var/{lib,log}/tor - edo chmod 750 "${IMAGE}"/var/{lib,log}/tor - - install_systemd_files - install_openrc_files - - insinto /etc/logrotate.d - newins contrib/operator-tools/tor.logrotate tor - - # Allow user 'tor' more open file handles to avoid errors, see Gentoo bug 251171 - insinto /etc/security/limits.d/ - doins "${FILES}"/tor.conf -} - -pkg_postinst() { - elog "Before using Tor you need a configuration in /etc/tor/torrc. An example can be" - elog "found in /etc/tor/torrc.sample." -} - diff --git a/packages/net-misc/youtube-dl/youtube-dl-scm.exheres-0 b/packages/net-misc/youtube-dl/youtube-dl-scm.exheres-0 deleted file mode 100644 index 92355e3..0000000 --- a/packages/net-misc/youtube-dl/youtube-dl-scm.exheres-0 +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2010-2015 Johannes Nixdorf <mixi@shadowice.org> -# Distributed under the terms of the GNU General Public License v2 - -require bash-completion -require zsh-completion -require github [ user=rg3 release=${PV} suffix=tar.gz ] -require setup-py [ import=setuptools has_bin=true multibuild=false ] - -SUMMARY="A small command-line program to download videos from youtube.com or other video platforms" - -LICENCES="Unlicense" -SLOT="0" -PLATFORMS="~amd64 ~armv7 ~x86" - -# they need internet access -RESTRICT="test" - -DEPENDENCIES="" -# test: -# dev-python/nose - -#WORK=${WORKBASE}/${PN} - -src_prepare() { -# edo mv ${WORKBASE}/${PNV} ${WORKBASE}/${PN} - setup-py_src_prepare - - # don't install etc/bash_completion.d into /usr - # don't install fish completion in /usr/etc/... - # don't install README.txt to /usr/share/doc/${PNV} - # (it's installed by emagicdocs to the right place) - edo sed -e '/bash_completion/d' \ - -e '/youtube-dl.fish/d' \ - -e '/README.txt/d' \ - -i setup.py -} - -src_install() { - dobashcompletion devscripts/bash-completion.in - dozshcompletion devscripts/zsh-completion.in - - setup-py_src_install - #TODO: something better - edo rmdir ${IMAGE}/usr/share/man/man1 - edo rmdir ${IMAGE}/usr/share/man -} - diff --git a/packages/net-p2p/pybitmessage/pybitmessage-scm.exheres-0 b/packages/net-p2p/pybitmessage/pybitmessage-scm.exheres-0 deleted file mode 100644 index a18c6ab..0000000 --- a/packages/net-p2p/pybitmessage/pybitmessage-scm.exheres-0 +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2016 Julian Ospald -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="https://github.com/Bitmessage/PyBitmessage.git" - -require setup-py [ blacklist='3' has_bin=true multibuild=false python_opts='[sqlite]' import='distutils' ] -require scm-git -require gtk-icon-cache - -DOWNLOADS="" - -SUMMARY="P2P communications protocol" -DESCRIPTION=" -Bitmessage is a P2P communications protocol used to send encrypted messages to -another person or to many subscribers. It is decentralized and trustless, -meaning that you need-not inherently trust any entities like root certificate -authorities. It uses strong authentication, which means that the sender of a -message cannot be spoofed, and it aims to hide 'non-content' data, like the -sender and receiver of messages, from passive eavesdroppers like those running -warrantless wiretapping programs. -" -HOMEPAGE+=" https://bitmessage.org" - -LICENCES="MIT" -SLOT="0" -PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - ( providers: libressl openssl ) [[ number-selected = exactly-one ]] -" - -DEPENDENCIES=" - run: - dev-python/PyQt4[python_abis:*(-)?] - dev-python/msgpack[python_abis:*(-)?] - providers:libressl? ( dev-libs/libressl ) - providers:openssl? ( dev-libs/openssl ) - suggestion: - dev-python/pyopencl[python_abis:*(-)?] [[ description = [ Use GPU acceleration for proof of work ] ]] - media-sound/mpg123 [[ description = [ For playing mp3 files ] ]] - net-misc/tor [[ description = [ For running bitmessage traffic - through the tor network ] ]] - sys-sound/alsa-utils [[ description = [ For playing wav files ] ]] -" - - -#src_install() { -# local SITEDIR="$(python_get_sitedir)/${PN}" -# python setup.py install -# herebin ${PN} <<EOF -##!/bin/sh -#cd "${SITEDIR}" -#exec "${PYTHON}" "./bitmessagemain.py" -#EOF - -# insinto "${SITEDIR}" -# doins -r src/* - -# emagicdocs -# doman man/* - -# insinto /usr/share/icons/hicolor/24x24/apps -# newins desktop/icon24.png ${PN}.png -# insinto /usr/share/icons/hicolor/scalable/apps -# newins desktop/can-icon.svg ${PN}.svg - -# insinto /usr/share/applications -# doins desktop/${PN}.desktop - -# python_bytecompile -#} - diff --git a/packages/net-p2p/retroshare/files/cflags.patch b/packages/net-p2p/retroshare/files/cflags.patch deleted file mode 100644 index ef76ad7..0000000 --- a/packages/net-p2p/retroshare/files/cflags.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro -index d9e5816c4..916bc6ca5 100644 ---- a/libbitdht/src/libbitdht.pro -+++ b/libbitdht/src/libbitdht.pro -@@ -69,14 +69,14 @@ win32 { - QMAKE_CXXFLAGS += -Wextra - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - # Switch on optimization for debug version -- #QMAKE_CXXFLAGS_DEBUG += -O2 -- #QMAKE_CFLAGS_DEBUG += -O2 -+ #QMAKE_CXXFLAGS_DEBUG += -+ #QMAKE_CFLAGS_DEBUG += - } - - ################################# MacOSX ########################################## -diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro -index fa9491c63..9063efd43 100644 ---- a/libretroshare/src/libretroshare.pro -+++ b/libretroshare/src/libretroshare.pro -@@ -27,7 +27,7 @@ debug { - # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG - # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG - -- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer -+ QMAKE_CXXFLAGS -= -fomit-frame-pointer - QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer - } - -@@ -251,14 +251,14 @@ win32-g++ { - QMAKE_CXXFLAGS += -Wextra - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - # Switch on optimization for debug version -- #QMAKE_CXXFLAGS_DEBUG += -O2 -- #QMAKE_CFLAGS_DEBUG += -O2 -+ #QMAKE_CXXFLAGS_DEBUG += -+ #QMAKE_CFLAGS_DEBUG += - - DEFINES += USE_CMD_ARGS - -diff --git a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro -index 8fa292c61..cfa6a7d83 100644 ---- a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro -+++ b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro -@@ -53,7 +53,7 @@ debug { - # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -100,14 +100,14 @@ win32 { - QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro -index d95c4bcd4..82f921fc8 100644 ---- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro -+++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro -@@ -36,7 +36,7 @@ debug { - # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -85,14 +85,14 @@ win32 { - QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro -index 8fa292c61..cfa6a7d83 100644 ---- a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro -+++ b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro -@@ -53,7 +53,7 @@ debug { - # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -100,14 +100,14 @@ win32 { - QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro -index f667a0d23..5975a7bfb 100644 ---- a/openpgpsdk/src/openpgpsdk.pro -+++ b/openpgpsdk/src/openpgpsdk.pro -@@ -26,10 +26,10 @@ win32-g++ { - DEFINES *= WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - mLibs = bz2 z ssl crypto - static { -diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri -index c6124862c..8a322aae4 100644 ---- a/plugins/Common/retroshare_plugin.pri -+++ b/plugins/Common/retroshare_plugin.pri -@@ -49,14 +49,14 @@ win32 { - # DESTDIR = lib - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - # Switch on optimization for debug version -- #QMAKE_CXXFLAGS_DEBUG += -O2 -- #QMAKE_CFLAGS_DEBUG += -O2 -+ #QMAKE_CXXFLAGS_DEBUG += -+ #QMAKE_CFLAGS_DEBUG += - - DEFINES += USE_CMD_ARGS - -diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro -index 30b2af946..1a721643e 100644 ---- a/retroshare-gui/src/retroshare-gui.pro -+++ b/retroshare-gui/src/retroshare-gui.pro -@@ -170,14 +170,14 @@ win32-g++ { - QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - # Switch on optimization for debug version -- #QMAKE_CXXFLAGS_DEBUG += -O2 -- #QMAKE_CFLAGS_DEBUG += -O2 -+ #QMAKE_CXXFLAGS_DEBUG += -+ #QMAKE_CFLAGS_DEBUG += - - OBJECTS_DIR = temp/obj - -diff --git a/retroshare.pri b/retroshare.pri -index c4f47aedf..6b1f0961f 100644 ---- a/retroshare.pri -+++ b/retroshare.pri -@@ -308,11 +308,11 @@ rs_chatserver { - } - - debug { -- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer -- QMAKE_CFLAGS -= -O2 -fomit-frame-pointer -+ QMAKE_CXXFLAGS -= -fomit-frame-pointer -+ QMAKE_CFLAGS -= -fomit-frame-pointer - -- QMAKE_CXXFLAGS *= -O0 -g -fno-omit-frame-pointer -- QMAKE_CFLAGS *= -O0 -g -fno-omit-frame-pointer -+ QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer -+ QMAKE_CFLAGS *= -g -fno-omit-frame-pointer - } - - profiling { -diff --git a/supportlibs/pegmarkdown/pegmarkdown.pro b/supportlibs/pegmarkdown/pegmarkdown.pro -index cc21ccaf3..9fc25562c 100644 ---- a/supportlibs/pegmarkdown/pegmarkdown.pro -+++ b/supportlibs/pegmarkdown/pegmarkdown.pro -@@ -10,7 +10,7 @@ QMAKE_CC = gcc - - #CONFIG += debug - debug { -- QMAKE_CFLAGS -= -O2 -+ QMAKE_CFLAGS -= - QMAKE_CFLAGS *= -g - } - -@@ -39,8 +39,8 @@ win32 { - QMAKE_CFLAGS += -Wextra - - # Switch off optimization for release version -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - CONFIG += dummy_glib - -diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro -index 94c942f53..e7432ca38 100644 ---- a/tests/librssimulator/librssimulator.pro -+++ b/tests/librssimulator/librssimulator.pro -@@ -14,7 +14,7 @@ profiling { - - - debug { -- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer -+ QMAKE_CXXFLAGS -= -fomit-frame-pointer - QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer - } - -@@ -159,14 +159,14 @@ win32 { - QMAKE_CXXFLAGS += -Wextra - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - # Switch on optimization for debug version -- #QMAKE_CXXFLAGS_DEBUG += -O2 -- #QMAKE_CFLAGS_DEBUG += -O2 -+ #QMAKE_CXXFLAGS_DEBUG += -+ #QMAKE_CFLAGS_DEBUG += - - DEFINES += USE_CMD_ARGS - -diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro -index d95c4bcd4..82f921fc8 100644 ---- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro -+++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro -@@ -36,7 +36,7 @@ debug { - # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -85,14 +85,14 @@ win32 { - QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro -index c17be5b77..6721f39d7 100644 ---- a/tests/unittests/unittests.pro -+++ b/tests/unittests/unittests.pro -@@ -120,14 +120,14 @@ win32 { - QMAKE_LFLAGS += -Wl,--start-group - - # Switch off optimization for release version -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O0 -- QMAKE_CFLAGS_RELEASE -= -O2 -- QMAKE_CFLAGS_RELEASE += -O0 -+ QMAKE_CXXFLAGS_RELEASE -= -+ QMAKE_CXXFLAGS_RELEASE += -+ QMAKE_CFLAGS_RELEASE -= -+ QMAKE_CFLAGS_RELEASE += - - # Switch on optimization for debug version -- #QMAKE_CXXFLAGS_DEBUG += -O2 -- #QMAKE_CFLAGS_DEBUG += -O2 -+ #QMAKE_CXXFLAGS_DEBUG += -+ #QMAKE_CFLAGS_DEBUG += - - OBJECTS_DIR = temp/obj - #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats" diff --git a/packages/net-p2p/retroshare/files/clang.patch b/packages/net-p2p/retroshare/files/clang.patch deleted file mode 100644 index 56663c5..0000000 --- a/packages/net-p2p/retroshare/files/clang.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libretroshare/src/util/cxx11retrocompat.h b/libretroshare/src/util/cxx11retrocompat.h -index 587b1374d..2acf87995 100644 ---- a/libretroshare/src/util/cxx11retrocompat.h -+++ b/libretroshare/src/util/cxx11retrocompat.h -@@ -19,11 +19,13 @@ - - #ifdef __GNUC__ - # define GCC_VERSION (__GNUC__*10000+__GNUC_MINOR__*100+__GNUC_PATCHLEVEL__) --# if GCC_VERSION < 40700 --# define override --# define final --# endif // GCC version < 40700 --# if GCC_VERSION < 40600 --# define nullptr NULL --# endif // GCC_VERSION < 40600 -+# ifndef __clang__ -+# if GCC_VERSION < 40700 -+# define override -+# define final -+# endif // GCC version < 40700 -+# if GCC_VERSION < 40600 -+# define nullptr NULL -+# endif // GCC_VERSION < 40600 -+# endif //__clang__ - #endif //defined GNUC diff --git a/packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch b/packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch deleted file mode 100644 index a1efe6b..0000000 --- a/packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp -index 1ec3d39f0..37c630e1e 100644 ---- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp -+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp -@@ -25,6 +25,7 @@ - #include <QTextBrowser> - #include <QTimer> - #include <QTreeWidget> -+#include <QClipboard> - - #include <algorithm> - #include <time.h> -@@ -325,6 +326,9 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint) - contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Add Auto Subscribe"), this, SLOT(autoSubscribeItem())); - - contextMnu.addAction(QIcon(IMAGE_COPYRSLINK), tr("Copy RetroShare Link"), this, SLOT(copyItemLink())); -+ -+ if(!item->text(COLUMN_NAME).isEmpty()) -+ contextMnu.addAction(QIcon(IMAGE_COPYRSLINK), tr("Copy name to clipboard"), this, SLOT(copyLobbyNameToClipboard())); - } - - contextMnu.addSeparator();//------------------------------------------------------------------- -@@ -898,9 +902,8 @@ void ChatLobbyWidget::autoSubscribeItem() - void ChatLobbyWidget::copyItemLink() - { - QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem(); -- if (item == NULL || item->type() != TYPE_LOBBY) { -+ if (item == NULL) //this is always lobby, do not need to check twice - return; -- } - - ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong(); - QString name = item->text(COLUMN_NAME); -@@ -913,6 +916,18 @@ void ChatLobbyWidget::copyItemLink() - } - } - -+ -+void ChatLobbyWidget::copyLobbyNameToClipboard() -+{ -+ QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem(); -+ if (item == NULL) -+ return; -+ -+ QClipboard *clipboard = QGuiApplication::clipboard(); -+ clipboard->setText(item->text(COLUMN_NAME)); -+} -+ -+ - QTreeWidgetItem *ChatLobbyWidget::getTreeWidgetItem(ChatLobbyId id) - { - for(int p=0;p<4;++p) -diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h -index cc3c26af3..86dadb7f0 100644 ---- a/retroshare-gui/src/gui/ChatLobbyWidget.h -+++ b/retroshare-gui/src/gui/ChatLobbyWidget.h -@@ -79,6 +79,7 @@ protected slots: - void updatePeerLeaving(ChatLobbyId); - void autoSubscribeItem(); - void copyItemLink(); -+ void copyLobbyNameToClipboard(); - - private slots: - void filterColumnChanged(int); diff --git a/packages/net-p2p/retroshare/files/disable_key_array_redraw.patch b/packages/net-p2p/retroshare/files/disable_key_array_redraw.patch deleted file mode 100644 index 8bca5fa..0000000 --- a/packages/net-p2p/retroshare/files/disable_key_array_redraw.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp -index 44c99736d..a4d452ec0 100644 ---- a/retroshare-gui/src/gui/NetworkView.cpp -+++ b/retroshare-gui/src/gui/NetworkView.cpp -@@ -36,7 +36,7 @@ - - /** Constructor */ - NetworkView::NetworkView(QWidget *parent) --: RsAutoUpdatePage(60000,parent) -+/*: RsAutoUpdatePage(60000,parent) */ - { - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); -@@ -90,9 +90,9 @@ void NetworkView::changedFoFCheckBox( ) - } - void NetworkView::redraw() - { -- ui.graphicsView->clearNodesPositions() ; -+/* ui.graphicsView->clearNodesPositions() ; - clear() ; -- updateDisplay() ; -+ updateDisplay() ; */ - } - - void NetworkView::clear() diff --git a/packages/net-p2p/retroshare/files/hidden_service.patch b/packages/net-p2p/retroshare/files/hidden_service.patch deleted file mode 100644 index 8efb5b1..0000000 --- a/packages/net-p2p/retroshare/files/hidden_service.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/libretroshare/src/pqi/p3netmgr.cc b/libretroshare/src/pqi/p3netmgr.cc -index 3381705cd..70c6e81cd 100644 ---- a/libretroshare/src/pqi/p3netmgr.cc -+++ b/libretroshare/src/pqi/p3netmgr.cc -@@ -996,7 +996,7 @@ bool p3NetMgrIMPL::checkNetAddress() - std::cerr << "p3NetMgrIMPL::checkNetAddress() LOOPBACK ... forcing to 127.0.0.1"; - std::cerr << std::endl; - #endif -- sockaddr_storage_ipv4_aton(prefAddr, "127.0.0.1"); -+ sockaddr_storage_ipv4_aton(prefAddr, "0.0.0.0"); - validAddr = true; - } - else -diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc -index d1e9e4e97..377d14ce5 100644 ---- a/libretroshare/src/pqi/p3peermgr.cc -+++ b/libretroshare/src/pqi/p3peermgr.cc -@@ -80,7 +80,7 @@ static struct RsLog::logInfo p3peermgrzoneInfo = {RsLog::Default, "p3peermgr"}; - #define MAX_AVAIL_PERIOD 230 //times a peer stay in available state when not connected - #define MIN_RETRY_PERIOD 140 - --static const std::string kConfigDefaultProxyServerIpAddr = "127.0.0.1"; -+static const std::string kConfigDefaultProxyServerIpAddr = "0.0.0.0"; - static const uint16_t kConfigDefaultProxyServerPortTor = 9050; // standard port. - static const uint16_t kConfigDefaultProxyServerPortI2P = 4447; // I2Pd's standard port - -diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc -index c6d686469..0f3323eba 100644 ---- a/libretroshare/src/rsserver/p3peers.cc -+++ b/libretroshare/src/rsserver/p3peers.cc -@@ -314,7 +314,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) - - if(sockaddr_storage_isnull(ps.localaddr)) // that happens if the address is not initialised. - { -- d.localAddr = "INVALID_IP"; -+ d.localAddr = "0.0.0.0"; - d.localPort = 0 ; - } - else -diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc -index 095dbaeaf..0be569c14 100644 ---- a/libretroshare/src/rsserver/rsinit.cc -+++ b/libretroshare/src/rsserver/rsinit.cc -@@ -127,7 +127,7 @@ class RsInitConfig - - /* Listening Port */ - bool forceExtPort; -- bool forceLocalAddr; -+// bool forceLocalAddr; - unsigned short port; - std::string inet ; - -@@ -188,7 +188,7 @@ void RsInit::InitRsConfig() - - rsInitConfig->load_trustedpeer = false; - rsInitConfig->port = 0 ; -- rsInitConfig->forceLocalAddr = false; -+// rsInitConfig->forceLocalAddr = false; - rsInitConfig->haveLogFile = false; - rsInitConfig->outStderr = false; - rsInitConfig->forceExtPort = false; -@@ -359,7 +359,7 @@ int RsInit::InitRetroShare(int argc, char **argv, bool /* strictCheck */) - if(rsInitConfig->autoLogin) rsInitConfig->startMinimised = true ; - if(rsInitConfig->outStderr) rsInitConfig->haveLogFile = false ; - if(!rsInitConfig->logfname.empty()) rsInitConfig->haveLogFile = true; -- if(rsInitConfig->inet != "127.0.0.1") rsInitConfig->forceLocalAddr = true; -+// if(rsInitConfig->inet != "127.0.0.1") rsInitConfig->forceLocalAddr = true; - #ifdef LOCALNET_TESTING - if(!portRestrictions.empty()) doPortRestrictions = true; - #endif -@@ -1684,23 +1684,23 @@ int RsServer::StartupRetroShare() - /**************************************************************************/ - std::cerr << "Force Any Configuration before Startup (After Load)" << std::endl; - -- if (rsInitConfig->forceLocalAddr) -- { -- struct sockaddr_storage laddr; -- -- /* clean sockaddr before setting values (MaxOSX) */ -- sockaddr_storage_clear(laddr); -- -- struct sockaddr_in *lap = (struct sockaddr_in *) &laddr; -- -- lap->sin_family = AF_INET; -- lap->sin_port = htons(rsInitConfig->port); -- -- // universal -- lap->sin_addr.s_addr = inet_addr(rsInitConfig->inet.c_str()); -- -- mPeerMgr->setLocalAddress(ownId, laddr); -- } -+// if (rsInitConfig->forceLocalAddr) -+// { -+// struct sockaddr_storage laddr; -+// -+// /* clean sockaddr before setting values (MaxOSX) */ -+// sockaddr_storage_clear(laddr); -+// -+// struct sockaddr_in *lap = (struct sockaddr_in *) &laddr; -+// -+// lap->sin_family = AF_INET; -+// lap->sin_port = htons(rsInitConfig->port); -+// -+// // universal -+// lap->sin_addr.s_addr = inet_addr(rsInitConfig->inet.c_str()); -+// -+// mPeerMgr->setLocalAddress(ownId, laddr); -+// } - - if (rsInitConfig->forceExtPort) - { diff --git a/packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch b/packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch deleted file mode 100644 index aa220cb..0000000 --- a/packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch +++ /dev/null @@ -1,115 +0,0 @@ -From ed867c52bd0497d0017eadc24d0c2cf678efa9e0 Mon Sep 17 00:00:00 2001 -From: Julian Ospald <hasufell@posteo.de> -Date: Fri, 27 May 2016 18:07:28 +0200 -Subject: [PATCH] Don't hardcode g++ in the toolchain settings -Upstream: merged, https://github.com/RetroShare/RetroShare/pull/395 - -Although it's already quite ugly that we overwrite QMAKE_CC like this, -hardcoding 'g++' can break the build where prefixed versions of -the toolchain are expected and where QMAKE_CXX is already properly -defined. So we just use QMAKE_CXX variable here. - -This fixes build failures on some distributions, e.g. -https://galileo.mailstation.de/jenkins/job/lipidity/36/console ---- - libbitdht/src/libbitdht.pro | 6 +++--- - libretroshare/src/libretroshare.pro | 6 +++--- - tests/librssimulator/librssimulator.pro | 6 +++--- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro -index a525159..738deea 100644 ---- a/libbitdht/src/libbitdht.pro -+++ b/libbitdht/src/libbitdht.pro -@@ -29,7 +29,7 @@ debug { - - ################################# Linux ########################################## - linux-* { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - } - - linux-g++ { -@@ -64,7 +64,7 @@ win32-x-g++ { - ################################# Windows ########################################## - - win32 { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T -@@ -89,7 +89,7 @@ win32 { - ################################# MacOSX ########################################## - - mac { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - } -diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro -index d01d4c9..d9e64d3 100644 ---- a/libretroshare/src/libretroshare.pro -+++ b/libretroshare/src/libretroshare.pro -@@ -122,7 +122,7 @@ linux-* { - CONFIG += link_pkgconfig - - QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64 -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - - contains(CONFIG, NO_SQLCIPHER) { - DEFINES *= NO_SQLCIPHER -@@ -225,7 +225,7 @@ win32-x-g++ { - ################################# Windows ########################################## - - win32 { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T -@@ -259,7 +259,7 @@ win32 { - ################################# MacOSX ########################################## - - mac { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW -diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro -index 14f1d5c..5211e7e 100644 ---- a/tests/librssimulator/librssimulator.pro -+++ b/tests/librssimulator/librssimulator.pro -@@ -70,7 +70,7 @@ linux-* { - - DESTDIR = lib - QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64 -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - - SSL_DIR = /usr/include/openssl - UPNP_DIR = /usr/include/upnp -@@ -143,7 +143,7 @@ win32-x-g++ { - ################################# Windows ########################################## - - win32 { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T -@@ -188,7 +188,7 @@ win32 { - ################################# MacOSX ########################################## - - mac { -- QMAKE_CC = g++ -+ QMAKE_CC = $${QMAKE_CXX} - OBJECTS_DIR = temp/obj - MOC_DIR = temp/moc - #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW --- -2.8.3 - diff --git a/packages/net-p2p/retroshare/retroshare-scm.exheres-0 b/packages/net-p2p/retroshare/retroshare-scm.exheres-0 deleted file mode 100644 index 410d531..0000000 --- a/packages/net-p2p/retroshare/retroshare-scm.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2013 Ankur Kothari -# Distributed under the terms of the GNU General Public License v2 - -require retroshare - -PLATFORMS="~amd64" - diff --git a/packages/net-p2p/retroshare/retroshare.exlib b/packages/net-p2p/retroshare/retroshare.exlib deleted file mode 100644 index 3c2d115..0000000 --- a/packages/net-p2p/retroshare/retroshare.exlib +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 2013 Ankur Kothari -# Distributed under the terms of the GNU General Public License v2 - -require flag-o-matic -require github [ user=RetroShare project=RetroShare tag=v${PV} ] -require qmake [ slot=5 ] -require gtk-icon-cache freedesktop-desktop - -export_exlib_phases src_configure src_install pkg_postinst pkg_postrm - -SUMMARY="A decentralized, private and secure commmunication and sharing platform" -DESCRIPTION=" -RetroShare is basically a platform that establishes encrypted connections -between authenticated friends. This connection is used for various -communication services and filesharing. It is independent of any corporate -system or central servers, all data is only sent to friends and in some cases -relayed by them to their friends, making RetroShare a decentralised Social -Sharing Network designed For the People. Encrypted communication ensures that -all shared information is only known to you and your friends. - -Communication services in RetroShare: - * Private chat with friends - * Private or public chat lobbies, that allow chatting with friends - and friends of friends - * Messages to friends - * Forums - * Voice over IP -" -HOMEPAGE="https://retroshare.github.io/" - -LICENCES="GPL-2" -SLOT="0" -MYOPTIONS=" - ( providers: libressl openssl ) [[ number-selected = exactly-one ]] - ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]] - sqlcipher - plugins -" - -DEPENDENCIES=" - build: - virtual/pkg-config - build+run: - sqlcipher? ( app-crypt/sqlcipher ) - dev-libs/libxml2:2.0 - dev-libs/libxslt - dev-libs/protobuf - gnome-desktop/libgnome-keyring:1 - plugins? ( media-libs/opencv - media-libs/speex - media-libs/speexdsp - providers:ffmpeg? ( media/ffmpeg ) - providers:libav? ( media/libav ) - ) - net-libs/libmicrohttpd - net-libs/libssh - net-libs/libupnp - net-misc/curl - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/qtbase:5 - x11-libs/qtmultimedia:5 - x11-libs/qttools:5 - x11-libs/qtx11extras:5 - providers:libressl? ( dev-libs/libressl:= ) - providers:openssl? ( dev-libs/openssl ) -" - -EQMAKE_PARAMS=( - "CONFIG-=debug" - "CONFIG+=release" - "CONFIG-=c++11" -) - -DEFAULT_SRC_PREPARE_PATCHES+=( - "${FILES}"/cflags.patch - "${FILES}"/clang.patch - "${FILES}"/disable_key_array_redraw.patch - "${FILES}"/hidden_service.patch -) - -retroshare_src_configure(){ - # weird speex failures, also see - # https://github.com/RetroShare/RetroShare/issues/393 - append-flags -DHAVE_STDINT_H - - # fix hardcoded extension directory - edo sed -i \ - -e "s|/usr/lib/retroshare/extensions6/|/usr/$(exhost --target)/lib/${PN}/extensions6/|" \ - libretroshare/src/rsserver/rsinit.cc - option sqlcipher || EQMAKE_PARAMS+=( "CONFIG+=no_sqlcipher" ) - option plugins || EQMAKE_PARAMS+=( "CONFIG+=no_retroshare_plugins" ) - - eqmake \ - BIN_DIR="/usr/$(exhost --target)/bin" \ - LIB_DIR="/usr/$(exhost --target)/lib" \ - PLUGIN_DIR="/usr/$(exhost --target)/lib/${PN}/extensions6/" \ - INC_DIR="/usr/$(exhost --target)/include" \ - RetroShare.pro -} - -retroshare_src_install() { - emake INSTALL_ROOT="${IMAGE}" install - - # overwrite desktop file - insinto /usr/share/applications - hereins ${PN}06.desktop <<EOF -[Desktop Entry] -Version=1.0 -Name=RetroShare06 -Comment=Securely share files with your friends -Exec=RetroShare06 -Icon=retroshare06 -Terminal=false -Type=Application -Categories=Network; -EOF -} - -retroshare_pkg_postinst() { - freedesktop-mime_pkg_postinst - freedesktop-desktop_pkg_postinst - gtk-icon-cache_pkg_postinst -} - -retroshare_pkg_postrm() { - freedesktop-mime_pkg_postrm - freedesktop-desktop_pkg_postrm - gtk-icon-cache_pkg_postrm -} - diff --git a/packages/net-p2p/syncthing/files/systemd/syncthing.service b/packages/net-p2p/syncthing/files/systemd/syncthing.service deleted file mode 100644 index e5ff0ae..0000000 --- a/packages/net-p2p/syncthing/files/systemd/syncthing.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Syncthing service for %i -After=network.target - -[Service] -User=%i -Environment=STNORESTART=yes -ExecStart=/usr/bin/syncthing -Restart=always - -[Install] -WantedBy=multi-user.target
\ No newline at end of file diff --git a/packages/net-p2p/syncthing/files/tls_params.patch b/packages/net-p2p/syncthing/files/tls_params.patch deleted file mode 100644 index 92b79ed..0000000 --- a/packages/net-p2p/syncthing/files/tls_params.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go -index 29fc35b9..8e080237 100644 ---- a/cmd/syncthing/gui.go -+++ b/cmd/syncthing/gui.go -@@ -187,19 +187,14 @@ func (s *apiService) getListener(guiCfg config.GUIConfiguration) (net.Listener, - } - tlsCfg := &tls.Config{ - Certificates: []tls.Certificate{cert}, -- MinVersion: tls.VersionTLS10, // No SSLv3 -+ MinVersion: tls.VersionTLS11, - CipherSuites: []uint16{ - // No RC4 -+ tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, -+ tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, -+ tls.TLS_RSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, -- tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, -- tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, -- tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, -- tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, -- tls.TLS_RSA_WITH_AES_128_CBC_SHA, -- tls.TLS_RSA_WITH_AES_256_CBC_SHA, -- tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, -- tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA, - }, - } - diff --git a/packages/net-p2p/syncthing/syncthing-scm.exheres-0 b/packages/net-p2p/syncthing/syncthing-scm.exheres-0 deleted file mode 100644 index 3126b9e..0000000 --- a/packages/net-p2p/syncthing/syncthing-scm.exheres-0 +++ /dev/null @@ -1,42 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="https://github.com/syncthing/syncthing.git" - - -require scm-git systemd-service - -DOWNLOADS="" -SLOT="0" -PLATFORMS="~amd64 ~x86" -SUMMARY="Open, trustworthy and decentralized syncing engine" -DESCRIPTION="" -HOMEPAGE="http://syncthing.net" -LICENCES="MIT" -DEPENDENCIES=" - dev-lang/go -" - -export GOPATH="${WORK}" - -GO_PN="github.com/${PN}/${PN}" - -#SCM_CHECKOUT_TO="${WORK}/src/github.com/syncthing/syncthing" -DEFAULT_SRC_PREPARE_PATCHES=( - ${FILES}/tls_params.patch -) - -src_prepare() { - default - WORK=${WORK}/src/github.com/syncthing/syncthing - edo mkdir -p ${WORK} - mv * ${WORK}/ -} - -src_compile() { - edo go run build.go -} - -src_install() { - dobin bin/syncthing - base_src_install_docs -} diff --git a/packages/sys-apps/sydbox/sydbox-scm.exheres-0 b/packages/sys-apps/sydbox/sydbox-scm.exheres-0 deleted file mode 100644 index c5942a5..0000000 --- a/packages/sys-apps/sydbox/sydbox-scm.exheres-0 +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2009, 2012 Ali Polatel <alip@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="https://git.exherbo.org/sydbox-1.git" -SCM_BRANCH="inspect" - -require sydbox autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 1.11 1.10 ] ] scm-git - -DOWNLOADS="" - -PLATFORMS="~amd64 ~armv7" - -DEPENDENCIES=" - build: - dev-libs/libxslt -" - -AT_M4DIR=( m4 ) - diff --git a/packages/sys-apps/sydbox/sydbox.exlib b/packages/sys-apps/sydbox/sydbox.exlib deleted file mode 100644 index a295d3a..0000000 --- a/packages/sys-apps/sydbox/sydbox.exlib +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2009, 2010, 2011, 2012, 2013 Ali Polatel <alip@exherbo.org> -# Copyright 2015 Wouter van Kesteren <woutershep@gmail.com> -# Distributed under the terms of the GNU General Public License v2 - -export_exlib_phases src_test - -SUMMARY="Sydbox, the other sandbox" -DESCRIPTION="Sydbox is a ptrace based sandbox for Linux." -ever is_scm || DOWNLOADS="https://dev.exherbo.org/distfiles/${PN}/${PNV}.tar.bz2" - -LICENCES="GPL-2" -SLOT="0" -MYOPTIONS="" -DEPENDENCIES="" - -BUGS_TO="alip@exherbo.org" -REMOTE_IDS="freecode:${PN}" - -if ever at_least 1; then - - HOMEPAGE="https://git.exherbo.org/sydbox-1.git" - - # sydbox 1(_pre): has seccomp - MYOPTIONS+=" - seccomp [[ description = [ Enable seccomp user filter support ] ]]" - DEPENDENCIES+=" - build: - seccomp? ( sys-kernel/linux-headers[>=3.5] )" - - DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( seccomp ) - - if ever at_least 1.0.0; then - # sydbox 1: external pinktrace - DEPENDENCIES+=" - build+run: - dev-libs/pinktrace[>=0.9.0]" - else - # sydbox 1_pre: internal pinktrace - MYOPTIONS+=" - doc [[ description = [ Build API documentation of included pinktrace library ] ]]" - DEPENDENCIES+=" - build: - doc? ( app-doc/doxygen )" - - DEFAULT_SRC_CONFIGURE_PARAMS=( --enable-ipv6 ) - DEFAULT_SRC_CONFIGURE_OPTION_ENABLES+=( "doc doxygen" ) - fi - -else - - HOMEPAGE="https://git.exherbo.org/sydbox.git" - - # sydbox 0: no seccomp, glib, external pinktrace - DEPENDENCIES+=" - build+run: - dev-libs/glib:2[>=2.18] - dev-libs/pinktrace[>=0.1.2]" -fi - -sydbox_src_test() { - if ! esandbox check 2>/dev/null; then - default - else - elog "Not running tests because sydbox doesn't work under sydbox" - elog "set PALUDIS_DO_NOTHING_SANDBOXY=1 if you want to run the tests" - - if ever at_least 1.0.2; then - elog "As of sydbox-1.0.2, tests are installed by default." - elog "You can use the helper utility sydtest to run the tests." - fi - fi -} - diff --git a/packages/sys-devel/qt-creator/qt-creator-4.6.2.exheres-0 b/packages/sys-devel/qt-creator/qt-creator-4.6.2.exheres-0 deleted file mode 100644 index 67ec3d3..0000000 --- a/packages/sys-devel/qt-creator/qt-creator-4.6.2.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2010 Kim Højgaard-Hansen <kimrhh@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require qt-creator - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/sys-devel/qt-creator/qt-creator-scm.exheres-0 b/packages/sys-devel/qt-creator/qt-creator-scm.exheres-0 deleted file mode 100644 index 6483962..0000000 --- a/packages/sys-devel/qt-creator/qt-creator-scm.exheres-0 +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2010 Kim Højgaard-Hansen <kimrhh@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="git://code.qt.io/qt-creator/qt-creator.git" -SCM_EXTERNAL_REFS=" - src/shared/qbs:qbs -" - -SCM_qbs_EXTERNAL_REFS=" - src/shared/qtscript:script -" -SCM_SECONDARY_REPOSITORIES=" - qbs - script -" - - -SCM_qbs_REPOSITORY="git://code.qt.io/qbs/qbs.git" -SCM_script_REPOSITORY="git://code.qt.io/qt/qtscript.git" - -require qt-creator scm-git - -DOWNLOADS="" - -PLATFORMS="~amd64 ~x86" - -UPSTREAM_DOCUMENTATION="http://doc-snapshots.qt.io/${PN/-/}-master/index.html" -UPSTREAM_CHANGELOG="" - diff --git a/packages/sys-devel/qt-creator/qt-creator.exlib b/packages/sys-devel/qt-creator/qt-creator.exlib deleted file mode 100644 index 5aecc15..0000000 --- a/packages/sys-devel/qt-creator/qt-creator.exlib +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 2010 Kim Højgaard-Hansen <kimrhh@exherbo.org> -# Copyright 2013, 2016 Heiko Becker <heirecka@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require qmake [ slot=5 ] - -export_exlib_phases src_configure src_compile src_install pkg_preinst - -MYPNV=${PN}-opensource-src-${PV} - -SUMMARY="Qt Creator is a new cross-platform integrated development environment for use with Qt." -HOMEPAGE="http://qt-project.org/ http://www.qt.io/" - -DOWNLOADS="mirror://qt/official_releases/${PN/-/}/$(ever range 1-2)/${PV}/${MYPNV}.tar.xz" - -LICENCES=" - LGPL-2.1 LGPL-3 - BSD-3 [[ note = [ ClassView and ImageViewer plugins ] ]] - GPL-3 [[ note = [ Qt Quick Desinger ] ]] - MIT [[ note = [ Front-end for C++ ] ]] -" - -SLOT="0" -MYOPTIONS=" - webengine [[ description = [ Use QtWebEngine instead of a more basic viewer to display the docs ] ]] -" - -min_qt_ver=5.6.2 - -DEPENDENCIES=" - build: - virtual/pkg-config - build+run: - dev-lang/clang[>=5.0.0] - dev-libs/botan:1.10[>=1.10.0] - x11-libs/libX11 - x11-libs/libXext - x11-libs/qtbase:5[>=${min_qt_ver}][gui][sql] - x11-libs/qtdeclarative:5[>=${min_qt_ver}] - x11-libs/qtquickcontrols:5[>=${min_qt_ver}] - x11-libs/qtscript:5[>=${min_qt_ver}] - x11-libs/qtsvg:5[>=${min_qt_ver}] - x11-libs/qttools:5[>=${min_qt_ver}] - x11-libs/qtx11extras:5[>=${min_qt_ver}] - x11-libs/qtxmlpatterns:5[>=${min_qt_ver}] - webengine? ( x11-libs/qtwebengine:5[>=${min_qt_ver}] ) - suggestion: - sys-devel/gdb[python] [[ description = [ For debugging with Qt Creator ] ]] -" - -# TODO: Unbundle qbs properly. Simply deleting it doesn't work anymore. - -RESTRICT="test" # far to many tests need a running X server, disable building them below - -UPSTREAM_DOCUMENTATION="http://doc.qt.io/${PN/-/}/index.html" -UPSTREAM_CHANGELOG="http://code.qt.io/cgit/${PN}/${PN}.git/tree/dist/changes-$(ever range 1-3).md" - -BUGS_TO="kimrhh@exherbo.org heirecka@exherbo.org" - -ever is_scm || WORK=${WORKBASE}/${MYPNV} - -EQMAKE_SOURCES=( qtcreator.pro ) -EQMAKE_PARAMS=( - IDE_PACKAGE_MODE=1 - SUPPORT_QT_QML=1 - USE_SYSTEM_BOTAN=1 - TEST=0 -) -DEFAULT_SRC_INSTALL_PARAMS=( INSTALL_ROOT="${IMAGE}"/usr/$(exhost --target) ) - -qt-creator_src_configure() { - option webengine || edo sed -e "s/isEmpty(QT\.webenginewidgets\.name)/true/" \ - -i src/plugins/help/help.pro - qmake_src_configure -} - -qt-creator_src_compile() { - default - emake docs -} - -qt-creator_src_install(){ - default - # XXX: Unfortunately there is no way to override datadir. So simply re-organize folders here and - # add awful symlinks because program location is used to locate resources. - dodir /usr/share - edo mv "${IMAGE}"/usr/$(exhost --target)/share/qtcreator "${IMAGE}"/usr/share/ - - # Here is awful symlink - dosym /usr/share/qtcreator /usr/$(exhost --target)/share/ - - dosym /usr/$(exhost --target)/bin/qtcreator /usr/$(exhost --target)/bin/qt-creator - - # create .desktop file - insinto /usr/share/applications - hereins qtcreator.desktop <<EOF -[Desktop Entry] -Type=Application -Name=Qt Creator -Comment=Complete IDE for Qt applications -Exec=qtcreator -Icon=qtcreator -Categories=Qt;Development;IDE; -EOF -} - -qt-creator_pkg_preinst() { - # Make the update path work - local dir="${ROOT}/usr/$(exhost --target)/share/qtcreator" - if [[ -d "${dir}" && ! -L "${dir}" ]] ; then - nonfatal edo rmdir "${dir}" || ewarn "removing ${dir} failed" - fi -} - diff --git a/packages/sys-fs/squashfs-tools/squashfs-tools-scm.exheres-0 b/packages/sys-fs/squashfs-tools/squashfs-tools-scm.exheres-0 deleted file mode 100644 index 167db8f..0000000 --- a/packages/sys-fs/squashfs-tools/squashfs-tools-scm.exheres-0 +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2009-2017 Wulf C. Krueger <philantrop@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git" - -require scm-git - -SUMMARY="The Squashfs tools for creating compressed filesystems" -DESCRIPTION=" -Squashfs is a highly compressed read-only filesystem for Linux. It uses zlib to -compress files, inodes, and directories. All blocks are packed to minimize the -data overhead, and block sizes of between 4K and 1M are supported. It is intended -to be used for archival use, for live CDs, and for embedded systems where low -overhead is needed. This package allows you to create such filesystems. -" - -REMOTE_IDS+="freecode:squashfs" - -LICENCES="GPL-2" -SLOT="0" -PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - xz [[ description = [ Support xz compressed images ] ]] - lzma [[ description = [ Support lzma compressed images ] ]] - lz4 [[ description = [ Support lz4 compressed images ] ]] - lzo [[ description = [ Support lzo compressed images ] ]] - zstd [[ description = [ Support zstd compressed images ] ]] - xattr -" - -DEPENDENCIES=" - build+run: - xz? ( app-arch/xz ) - lzma? ( app-arch/xz ) - lz4? ( app-arch/lz4 ) - lzo? ( app-arch/lzo:2 ) - zstd? ( app-arch/zstd ) - xattr? ( sys-apps/attr ) - run: - sys-libs/zlib -" - -WORK=${WORK}/squashfs-tools - -DEFAULT_SRC_COMPILE_PARAMS=( CC="${CC}" LDFLAGS="${LDFLAGS}" ) -DEFAULT_SRC_INSTALL_PARAMS=( INSTALL_DIR="${IMAGE}"/usr/$(exhost --target)/bin ) -DEFAULT_SRC_INSTALL_EXTRA_PREFIXES=( ../ ) -DEFAULT_SRC_INSTALL_EXTRA_DOCS=( ACKNOWLEDGEMENTS PERFORMANCE.README ) - -src_prepare() { - default - - option xz && edo sed -i -e 's/#XZ_SUPPORT = 1/XZ_SUPPORT = 1/' Makefile - option lzma && edo sed -i -e 's/#LZMA_SUPPORT = 1/LZMA_SUPPORT = 1/' Makefile - option lz4 && edo sed -i -e 's/#LZ4_SUPPORT = 1/LZ4_SUPPORT = 1/' Makefile - option lzo && edo sed -i -e 's/#LZO_SUPPORT = 1/LZO_SUPPORT = 1/' Makefile - option zstd && edo sed -i -e 's/#ZSTD_SUPPORT = 1/ZSTD_SUPPORT = 1/' Makefile - option xattr && edo sed -i -e 's/#XATTR_SUPPORT = 1/XATTR_SUPPORT = 1/' Makefile -} - diff --git a/packages/sys-libs/vulkan/vulkan-scm.exheres-0 b/packages/sys-libs/vulkan/vulkan-scm.exheres-0 deleted file mode 100644 index e464f6c..0000000 --- a/packages/sys-libs/vulkan/vulkan-scm.exheres-0 +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2017 Marc-Antoine Perennou <keruspe@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - - -SCM_EXTERNAL_REFS=" - submodules/googletest:googletest -" - -SCM_SECONDARY_REPOSITORIES=" - googletest -" - -SCM_googletest_REPOSITORY="https://github.com/google/googletest.git" - - -require github [ user=KhronosGroup pn=Vulkan-LoaderAndValidationLayers tag=sdk-${PV} ] \ - python [ blacklist=2 multibuild=false has_bin=false has_lib=false ] \ - cmake [ api=2 ] - -SUMMARY="Vulkan loader and validation layers" -DESCRIPTION=" -Vulkan is an Explicit API, enabling direct control over how GPUs actually work. No (or very little) -validation or error checking is done inside a Vulkan driver. Applications have full control and -responsibility. Any errors in how Vulkan is used often result in a crash. This project provides -standard validation layers that can be enabled to ease development by helping developers verify -their applications correctly use the Vulkan API. -" -HOMEPAGE="https://www.khronos.org/vulkan/" - -LICENCES="Apache-2.0" -SLOT="0" -PLATFORMS="~amd64" -MYOPTIONS="X wayland" - -DEPENDENCIES=" - build: - virtual/pkg-config - build+run: - X? ( - x11-libs/libxcb - x11-libs/libX11 - ) - wayland? ( sys-libs/wayland ) -" - -BUGS_TO="keruspe@exherbo.org" - -CMAKE_SRC_CONFIGURE_PARAMS=( - -DUSE_CCACHE:BOOL=FALSE - -DBUILD_ICD:BOOL=TRUE - -DBUILD_LOADER:BOOL=TRUE - -DBUILD_SHARED_LIBS:BOOL=TRUE - -DBUILD_VKJSON:BOOL=TRUE - # Those need glsl and spirv - -DBUILD_DEMOS:BOOL=FALSE - -DBUILD_GMOCK:BOOL=FALSE - -DBUILD_GTEST:BOOL=FALSE - -DBUILD_TESTS:BOOL=FALSE - -DBUILD_LAYERS:BOOL=FALSE - -DBUILD_WSI_MIR_SUPPORT:BOOL=FALSE - $(exhost --is-native -q || echo -DCMAKE_ASM-ATT_FLAGS="--32" ) -) -CMAKE_SRC_CONFIGURE_OPTION_BUILDS=( - "X WSI_XCB_SUPPORT" - "X WSI_XLIB_SUPPORT" - "wayland WSI_WAYLAND_SUPPORT" -) - - -src_install() { - cmake_src_install - - keepdir /etc/vulkan/icd.d -} - diff --git a/packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch b/packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch deleted file mode 100644 index 87aaee0..0000000 --- a/packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/mumble/AudioInput.ui b/src/mumble/AudioInput.ui -index f2a67a5b..b250b3b7 100644 ---- a/src/mumble/AudioInput.ui -+++ b/src/mumble/AudioInput.ui -@@ -483,7 +483,7 @@ - <number>8000</number> - </property> - <property name="maximum"> -- <number>96000</number> -+ <number>128000</number> - </property> - <property name="singleStep"> - <number>1000</number> -@@ -534,11 +534,14 @@ - <number>1</number> - </property> - <property name="maximum"> -- <number>4</number> -+ <number>6</number> - </property> - <property name="pageStep"> - <number>2</number> - </property> -+ <property name="value"> -+ <number>6</number> -+ </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> diff --git a/packages/voip/mumble/files/crosscompiling.patch b/packages/voip/mumble/files/crosscompiling.patch deleted file mode 100644 index c666f0b..0000000 --- a/packages/voip/mumble/files/crosscompiling.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp -index 7062ede6..3becca72 100644 ---- a/src/mumble/main.cpp -+++ b/src/mumble/main.cpp -@@ -662,7 +662,7 @@ int main(int argc, char **argv) { - } - - #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG) --extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &); -+//extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &); - - extern "C" __declspec(dllexport) int MumbleMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdArg, int cmdShow) { - Q_UNUSED(cmdArg); -@@ -672,7 +672,7 @@ extern "C" __declspec(dllexport) int MumbleMain(HINSTANCE instance, HINSTANCE pr - - // qWinMain takes argv as a reference. - QVector<char *> argv; -- qWinMain(instance, prevInstance, cmdParam.data(), cmdShow, argc, argv); -+// qWinMain(instance, prevInstance, cmdParam.data(), cmdShow, argc, argv); - - int result = main(argc, argv.data()); - return result; diff --git a/packages/voip/mumble/files/gcc.patch b/packages/voip/mumble/files/gcc.patch deleted file mode 100644 index 12d2851..0000000 --- a/packages/voip/mumble/files/gcc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/SSLCipherInfo.h b/src/SSLCipherInfo.h -index 508db61..2889b82 100644 ---- a/src/SSLCipherInfo.h -+++ b/src/SSLCipherInfo.h -@@ -30,6 +30,7 @@ -
- #ifndef MUMBLE_SSLCIPHERINFO_H_
- #define MUMBLE_SSLCIPHERINFO_H_
-+#include <string.h> -
- struct SSLCipherInfo {
- const char *openssl_name;
diff --git a/packages/voip/mumble/files/higher_opus_complexity.patch b/packages/voip/mumble/files/higher_opus_complexity.patch deleted file mode 100644 index c1f37d0..0000000 --- a/packages/voip/mumble/files/higher_opus_complexity.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp -index 38d12dff6..f89f62633 100644 ---- a/src/mumble/AudioInput.cpp -+++ b/src/mumble/AudioInput.cpp -@@ -100,6 +100,7 @@ AudioInput::AudioInput() : opusBuffer(g.s.iFramesPerPacket * (SAMPLE_RATE / 100) - } - - oCodec->opus_encoder_ctl(opusState, OPUS_SET_VBR(0)); // CBR -+ oCodec->opus_encoder_ctl(opusState, OPUS_SET_COMPLEXITY(10)); // more efficient comression - } - #endif - diff --git a/packages/voip/mumble/files/tls12_strong_ciphers.patch b/packages/voip/mumble/files/tls12_strong_ciphers.patch deleted file mode 100644 index 5fab971..0000000 --- a/packages/voip/mumble/files/tls12_strong_ciphers.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/Connection.cpp b/src/Connection.cpp -index 5dc7443e..2287f174 100644 ---- a/src/Connection.cpp -+++ b/src/Connection.cpp -@@ -27,7 +27,9 @@ Connection::Connection(QObject *p, QSslSocket *qtsSock) : QObject(p) { - qtsSocket->setParent(this); - iPacketLength = -1; - bDisconnectedEmitted = false; -- -+#if QT_VERSION >= 0x050500 -+ qtsSocket->setProtocol(QSsl::TlsV1_2OrLater); -+#endif - static bool bDeclared = false; - if (! bDeclared) { - bDeclared = true; -diff --git a/src/SSL.cpp b/src/SSL.cpp -index 7f7e8121..16cddd28 100644 ---- a/src/SSL.cpp -+++ b/src/SSL.cpp -@@ -40,7 +40,7 @@ void MumbleSSL::destroy() { - } - - QString MumbleSSL::defaultOpenSSLCipherString() { -- return QLatin1String("EECDH+AESGCM:EDH+aRSA+AESGCM:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:AES256-SHA:AES128-SHA"); -+ return QLatin1String("DHE-RSA-CHACHA20-POLY1305:DHE-RSA-CAMELLIA256-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384"); - } - - QList<QSslCipher> MumbleSSL::ciphersFromOpenSSLCipherString(QString cipherString) { -diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp -index 7e30e76a..60c39121 100644 ---- a/src/mumble/ServerHandler.cpp -+++ b/src/mumble/ServerHandler.cpp -@@ -335,7 +335,7 @@ void ServerHandler::run() { - - - #if QT_VERSION >= 0x050500 -- qtsSock->setProtocol(QSsl::TlsV1_0OrLater); -+ qtsSock->setProtocol(QSsl::TlsV1_2OrLater); - #elif QT_VERSION >= 0x050400 - // In Qt 5.4, QSsl::SecureProtocols is equivalent - // to "TLSv1.0 or later", which we require. diff --git a/packages/voip/mumble/mumble-scm.exheres-0 b/packages/voip/mumble/mumble-scm.exheres-0 deleted file mode 100644 index effa47c..0000000 --- a/packages/voip/mumble/mumble-scm.exheres-0 +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 2010-2011 Johannes Nixdorf <mixi@user-helfen-usern.de> -# Copyright 2012-2013 Lasse Brun <bruners@gmail.com> -# Copyright 2013-2018 Timo Gurr <tgurr@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 -# Based in part upon 'mumble-1.2.2.ebuild' from Gentoo, which is: -# Copyright 1999-2010 Gentoo Foundation - - -SCM_REPOSITORY="https://github.com/mumble-voip/mumble.git" - -SCM_EXTERNAL_REFS=" - 3rdparty/speex-src:speex - 3rdparty/celt-0.11.0-src:celt011 - 3rdparty/opus-src:opus - 3rdparty/sbcelt-src:sbcelt - 3rdparty/minhook-src:minhook - 3rdparty/mach-override-src:machoverride - 3rdparty/speexdsp-src:speexdsp - 3rdparty/rnnoise-src:rnnoise - themes/Mumble:mumblethemes - 3rdparty/celt-0.7.0-src:celt07 -" - -SCM_sbcelt_EXTERNAL_REFS=" - celt-0.7.0:celt07sbcelt -" - -SCM_SECONDARY_REPOSITORIES=" - speex - celt07 - celt011 - opus - sbcelt - minhook - machoverride - speexdsp - mumblethemes - rnnoise - celt07sbcelt -" - -SCM_speex_REPOSITORY="https://github.com/mumble-voip/speex.git" -SCM_celt07_REPOSITORY="https://github.com/mumble-voip/celt-0.7.0.git" -SCM_celt011_REPOSITORY="https://github.com/mumble-voip/celt-0.11.0.git" -SCM_opus_REPOSITORY="https://github.com/mumble-voip/opus.git" -SCM_sbcelt_REPOSITORY="https://github.com/mumble-voip/sbcelt.git" -SCM_minhook_REPOSITORY="https://github.com/mumble-voip/minhook.git" -SCM_machoverride_REPOSITORY="https://github.com/mumble-voip/mach_override.git" -SCM_speexdsp_REPOSITORY="https://github.com/mumble-voip/speexdsp.git" -SCM_mumblethemes_REPOSITORY="https://github.com/mumble-voip/mumble-theme.git" -SCM_rnnoise_REPOSITORY="https://github.com/mumble-voip/rnnoise.git" -SCM_celt07sbcelt_REPOSITORY="https://git.xiph.org/celt.git/" - -require scm-git \ - qmake [ slot=5 ] \ - freedesktop-desktop \ - gtk-icon-cache \ - option-renames [ renames=[ 'speechd tts' ] ] - -SUMMARY="Mumble is an open source, low-latency, high quality voice chat software" -DESCRIPTION=" -Mumble is a voice chat application for groups. While it can be used for any kind of -activity, it is primarily intended for gaming. It can be compared to programs like Ventrilo or -TeamSpeak. People tend to simplify things, so when they talk about Mumble they either talk about -\"Mumble\" the client application or about \"Mumble & Murmur\" the whole voice chat application suite. -" -HOMEPAGE+=" https://wiki.${PN}.info/wiki/Main_Page" -DOWNLOADS="" - -LICENCES="BSD-3 MIT" -SLOT="0" -PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - alsa - avahi - dbus - oss - pulseaudio - tts [[ description = [ Support for text to speech ] ]] - ( providers: libressl openssl ) [[ number-selected = exactly-one ]] -" - -DEPENDENCIES=" - build: - virtual/pkg-config - x11-libs/qttools:5 [[ note = [ Qt5LinguistTools ] ]] - x11-proto/xorgproto - build+run: - dev-libs/boost - dev-libs/protobuf:= - media-libs/libsndfile - media-libs/opus[>=1.0.0] - media-libs/speex[>=1.2_rc1] - media-libs/speexdsp[>=1.2_rc1] - x11-libs/libX11 - x11-libs/libXi - x11-libs/qtbase:5[gui][sql][sqlite] - x11-libs/qtsvg:5 - alsa? ( sys-sound/alsa-lib ) - avahi? ( net-dns/avahi[dns_sd] ) - pulseaudio? ( media-sound/pulseaudio ) - tts? ( app-speech/speechd ) - providers:libressl? ( dev-libs/libressl:= ) - providers:openssl? ( dev-libs/openssl ) - !media-sound/mumble [[ - description = [ media-sound/mumble was moved to ::desktop voip/mumble ] - resolution = uninstall-blocked-before - ]] -" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/gcc.patch - "${FILES}"/tls12_strong_ciphers.patch - "${FILES}"/higher_opus_complexity.patch - "${FILES}"/allow_higher_bitrate_and_frame_size.patch -) - - - -src_prepare() { - default - - # TODO: report upstream - edo sed \ - -e "s:pkg-config:${PKG_CONFIG}:g" \ - -i main.pro \ - -i qmake/pkgconfig.pri \ - -i src/${PN}.pri \ - -i src/${PN}/${PN}.pro - - # set version -# edo sed \ -# -e "s:Compiled by User:${PV}:g" \ -# -i src/Version.h - -# edo rmdir ${WORK}/3rdparty/celt-0.{7,11}.0-src -# edo ln -s ${WORKBASE}/celt-0.7.0-${CELT7_REV} ${WORK}/3rdparty/celt-0.7.0-src -# edo ln -s ${WORKBASE}/celt-0.11.0-${CELT11_REV} ${WORK}/3rdparty/celt-0.11.0-src - -# edo rmdir ${WORK}/themes/Mumble -# edo ln -s ${WORKBASE}/mumble-theme-${MUMBLETHEME_REV} ${WORK}/themes/Mumble -} - -src_configure() { - config=( - release # release build - bundled-celt # bundled celt - no-bundled-opus # bundled opus - no-bundled-speex # bundled speex - no-embed-qt-translations # Qt translations embedding - no-g15 # Logitech g15 keyboard support - no-server # server part (voip/murmur) - no-update # new versions check - ) - option alsa || config+=( no-alsa ) - option avahi || config+=( no-bonjour ) - option dbus || config+=( no-dbus ) - option oss || config+=( no-oss ) - option pulseaudio || config+=( no-pulseaudio ) - option tts || config+=( no-speechd ) - - eqmake main.pro -recursive \ - CONFIG+="${config[*]}" \ - DEFINES+="PLUGIN_PATH=/usr/$(exhost --target)/lib/mumble" -} - -src_install() { - local host=$(exhost --target) - - dobin release/${PN} - dobin scripts/${PN}-overlay - - exeinto /usr/${host}/lib/${PN} - doexe release/libmumble.so.* -# dosym libmumble.so.$(ever range 1-3) /usr/${host}/lib/${PN}/libmumble.so -# dosym libmumble.so.$(ever range 1-3) /usr/${host}/lib/${PN}/libmumble.so.$(ever range 1) -# dosym libmumble.so.$(ever range 1-3) /usr/${host}/lib/${PN}/libmumble.so.$(ever range 1-2) - doexe release/plugins/lib*.so* - doexe release/libcelt0.so.0.{7,11}.0 - - insinto /usr/share/applications - doins scripts/${PN}.desktop - - insinto /usr/share/icons/hicolor/scalable/apps - doins icons/${PN}.svg - - insinto /usr/share/kde4/services - doins scripts/${PN}.protocol - - doman man/${PN}.1 - doman man/${PN}-overlay.1 - - emagicdocs -} - -pkg_postinst() { - freedesktop-desktop_pkg_postinst - gtk-icon-cache_pkg_postinst - - elog "Mumble supports reading the kernel input devices, but may fall back to using the less optimal xinput2" - elog "This can be solved with a simple udev rule: SUBSYSTEM==\"input\", GROUP=\"input\" MODE=\"660\"" -} - -pkg_postrm() { - freedesktop-desktop_pkg_postrm - gtk-icon-cache_pkg_postrm -} - diff --git a/packages/x11-apps/redshift/redshift-1.12.exheres-0 b/packages/x11-apps/redshift/redshift-1.12.exheres-0 deleted file mode 100644 index e331bdc..0000000 --- a/packages/x11-apps/redshift/redshift-1.12.exheres-0 +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2014 Markus Rothe -# Distributed under the terms of the GNU General Public License v2 - -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 ] ] -require github [ user="jonls" tag="v${PV}" ] -require python [ blacklist="2" multibuild=false with_opt=true option_name="gui" min_versions="3.2" ] -require gtk-icon-cache systemd-service - -SUMMARY="Adjusts the color temperature of your screen according to your surroundings" -HOMEPAGE="http://jonls.dk/redshift/" - -LICENCES="GPL-3" -SLOT="0" -PLATFORMS="~amd64" -MYOPTIONS=" - geoclue [[ description = [ Use geoclue to get the current location ] ]] - gui [[ description = [ Enable GUI status icon ] ]] - ( linguas: ar bg ca cs da de el es et eu fi fr gl he hi hr it ja ka lt nb nl pl pt_BR pt ru sv zh_CN ) -" - -DEPENDENCIES=" - build: - dev-util/intltool - sys-devel/gettext[>=0.17] - virtual/pkg-config - build+run: - dev-libs/glib:2[>=2.26] - geoclue? ( gps/geoclue:2.0 ) - gui? ( - dev-python/pyxdg[python_abis:*(-)?] - gnome-bindings/pygobject:3[python_abis:*(-)?] - x11-libs/gtk+:3[gobject-introspection] - ) - x11-dri/libdrm - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb -" - -BUGS_TO="markus@unixforces.net" - -AT_M4DIR=( m4 ) - -DEFAULT_SRC_CONFIGURE_PARAMS=( - '--enable-drm' - '--enable-nls' - '--enable-randr' - '--enable-vidmode' - "--with-systemduserunitdir=${SYSTEMDUSERUNITDIR}" -) -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( - 'geoclue geoclue2' - 'gui' -) - -src_prepare() { - default - edo autopoint --force - edo intltoolize --force --copy --automake - autotools_src_prepare -} - diff --git a/packages/x11-dri/mesa/files/0001-build-fix-building-vdpau-va.patch b/packages/x11-dri/mesa/files/0001-build-fix-building-vdpau-va.patch deleted file mode 100644 index e08b607..0000000 --- a/packages/x11-dri/mesa/files/0001-build-fix-building-vdpau-va.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a578f009d13ef004ba28c14ba9d9b3733175c3ef Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <cogitri@exherbo.org> -Date: Thu, 26 Apr 2018 20:45:48 +0200 -Subject: [PATCH] build: fix building vdpau&va -Upstream: No, this most likely isn't the correct way to fix this. However, Mesa's -build system is massive, so I'll file a bug an see what upstream does about it :) - -In some situations underlinking occurs. We have to link to xcb-xfixes. ---- - src/gallium/targets/va/meson.build | 2 +- - src/gallium/targets/vdpau/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build -index 57d267e..1bd544f 100644 ---- a/src/gallium/targets/va/meson.build -+++ b/src/gallium/targets/va/meson.build -@@ -46,7 +46,7 @@ libva_gallium = shared_library( - libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, - ], - dependencies : [ -- dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau, -+ dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau, dep_xcb_xfixes, - ], - link_depends : va_link_depends, - install : true, -diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build -index 93969d8..9caffc2 100644 ---- a/src/gallium/targets/vdpau/meson.build -+++ b/src/gallium/targets/vdpau/meson.build -@@ -51,7 +51,7 @@ libvdpau_gallium = shared_library( - libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, - ], - dependencies : [ -- dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, -+ dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, dep_xcb_xfixes, - ], - link_depends : vdpau_link_depends, - ) --- -2.17.0 - diff --git a/packages/x11-dri/mesa/files/045f38a50759bb225cb179703bc7050f6de752b1.patch b/packages/x11-dri/mesa/files/045f38a50759bb225cb179703bc7050f6de752b1.patch deleted file mode 100644 index d39901e..0000000 --- a/packages/x11-dri/mesa/files/045f38a50759bb225cb179703bc7050f6de752b1.patch +++ /dev/null @@ -1,42 +0,0 @@ -Source/Upstream: Git master, https://cgit.freedesktop.org/mesa/mesa/commit/?id=045f38a50759bb225cb179703bc7050f6de752b1 -Reason: Collides with files installed by vulkan-loader: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/ - -From 045f38a50759bb225cb179703bc7050f6de752b1 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Mon, 23 Jan 2017 16:48:01 -0800 -Subject: vulkan: Don't install vk_platform.h or vulkan.h. - -These files belong to the vulkan loader. - -Reviewed-by: Emil Velikov <emil.velikov@collabora.com> - -diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am -index fba3d66..95f276e 100644 ---- a/src/intel/vulkan/Makefile.am -+++ b/src/intel/vulkan/Makefile.am -@@ -23,9 +23,11 @@ include Makefile.sources - - vulkan_includedir = $(includedir)/vulkan - --vulkan_include_HEADERS = \ -+noinst_HEADERS = \ - $(top_srcdir)/include/vulkan/vk_platform.h \ -- $(top_srcdir)/include/vulkan/vulkan.h \ -+ $(top_srcdir)/include/vulkan/vulkan.h -+ -+vulkan_include_HEADERS = \ - $(top_srcdir)/include/vulkan/vulkan_intel.h - - lib_LTLIBRARIES = libvulkan_intel.la -@@ -189,7 +191,7 @@ libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) - - include $(top_srcdir)/install-lib-links.mk - --noinst_HEADERS = \ -+noinst_HEADERS += \ - tests/state_pool_test_helper.h - - LDADD = \ --- -cgit v0.10.2 - diff --git a/packages/x11-dri/mesa/files/1d01b52d761227c9675b2785cc242ec51e803e84.patch b/packages/x11-dri/mesa/files/1d01b52d761227c9675b2785cc242ec51e803e84.patch deleted file mode 100644 index a81d32f..0000000 --- a/packages/x11-dri/mesa/files/1d01b52d761227c9675b2785cc242ec51e803e84.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream: Yes -From 1d01b52d761227c9675b2785cc242ec51e803e84 Mon Sep 17 00:00:00 2001 -From: Dylan Baker <dylan@pnwbakers.com> -Date: Tue, 24 Apr 2018 14:15:47 -0700 -Subject: meson: Fix no-rtti in llvm detection -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Because I clearly wasn't thinking and clearly didn't do a good job -testing. Sigh - -Fixes: c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4 - ("meson: fix builds against LLVM built without rtti") -Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> -Reviewed-by: Marek Olšák <marek.olsak@amd.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 590ac40..52a1075 100644 ---- a/meson.build -+++ b/meson.build -@@ -1149,7 +1149,7 @@ if with_llvm - # programs, so we need to build all C++ code in mesa without rtti as well to - # ensure that linking works. - if dep_llvm.get_configtool_variable('has-rtti') == 'NO' -- cpp_args('-fno-rtti') -+ cpp_args += '-fno-rtti' - endif - elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr - error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') --- -cgit v1.1 - diff --git a/packages/x11-dri/mesa/files/3c288da5eec81ee58b85927df18d9194ead8f5c2.patch b/packages/x11-dri/mesa/files/3c288da5eec81ee58b85927df18d9194ead8f5c2.patch deleted file mode 100644 index 4850c97..0000000 --- a/packages/x11-dri/mesa/files/3c288da5eec81ee58b85927df18d9194ead8f5c2.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream: yes - -From 3c288da5eec81ee58b85927df18d9194ead8f5c2 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 12 Jun 2018 11:59:01 +0100 -Subject: [PATCH] drivers/dri/i965: add missing #include - -brw_bufmgr.h uses time_t without include time.h, so the build fails under musl. - -Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> ---- - src/mesa/drivers/dri/i965/brw_bufmgr.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h -index 8cdf944e3da..32fc7a553c9 100644 ---- a/src/mesa/drivers/dri/i965/brw_bufmgr.h -+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h -@@ -37,6 +37,8 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> -+ - #include "util/u_atomic.h" - #include "util/list.h" - diff --git a/packages/x11-dri/mesa/files/c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4.patch b/packages/x11-dri/mesa/files/c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4.patch deleted file mode 100644 index 18f7b00..0000000 --- a/packages/x11-dri/mesa/files/c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream: Yes -From c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4 Mon Sep 17 00:00:00 2001 -From: Dylan Baker <dylan@pnwbakers.com> -Date: Mon, 16 Apr 2018 14:47:58 -0700 -Subject: meson: fix builds against LLVM built without rtti - -Building without rtti is a frought with peril, but it's something that -autotools supports so we need to support it too. - -Since we've moved to version 0.44 as a whole we can use the meson -functionality for accessing random llvm-config options we can check for -rtti and add -fno-rtti to all C++ code accordingly. - -Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> ---- - meson.build | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/meson.build b/meson.build -index 2e10ed7..4019b21 100644 ---- a/meson.build -+++ b/meson.build -@@ -1143,6 +1143,13 @@ if with_llvm - '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), - '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), - ] -+ -+ # LLVM can be built without rtti, turning off rtti changes the ABI of C++ -+ # programs, so we need to build all C++ code in mesa without rtti as well to -+ # ensure that linking works. -+ if dep_llvm.get_configtool_variable('has-rtti') == 'NO' -+ cpp_args('-fno-rtti') -+ endif - elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr - error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') - endif --- -cgit v1.1 - diff --git a/packages/x11-dri/mesa/files/fix-build-without-dri.patch b/packages/x11-dri/mesa/files/fix-build-without-dri.patch deleted file mode 100644 index d6ab841..0000000 --- a/packages/x11-dri/mesa/files/fix-build-without-dri.patch +++ /dev/null @@ -1,29 +0,0 @@ -Author: Rasmus Thomsen <cogitri@exherbo.org> -Reason: Fix build without dri -Upstream: No, not yet -diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build -index 32e8188..31b3e7e 100644 ---- a/src/gallium/auxiliary/pipe-loader/meson.build -+++ b/src/gallium/auxiliary/pipe-loader/meson.build -@@ -35,6 +35,12 @@ if with_gallium_drisw_kms - libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS' - endif - -+if with_dri == true -+ dri_args = '-DHAVE_PIPE_LOADER_DRI=1' -+else -+ dri_args = [ ] -+endif -+ - libpipe_loader_static = static_library( - 'pipe_loader_static', - [files_pipe_loader, xmlpool_options_h], -@@ -43,7 +49,7 @@ libpipe_loader_static = static_library( - inc_gallium_winsys, - ], - c_args : [ -- c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1', -+ c_vis_args, dri_args , '-DGALLIUM_STATIC_TARGETS=1', - libpipe_loader_defines, - ], - link_with : [libloader, libxmlconfig], diff --git a/packages/x11-dri/mesa/files/mesa-11.1-musl.patch b/packages/x11-dri/mesa/files/mesa-11.1-musl.patch deleted file mode 100644 index 596f6eb..0000000 --- a/packages/x11-dri/mesa/files/mesa-11.1-musl.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=93059 -From 09d5b4c04356c7bd56089605aed7742be89644c1 Mon Sep 17 00:00:00 2001 -From: Kylie McClain <somasis@exherbo.org> -Date: Sat, 21 Nov 2015 16:39:20 -0500 -Subject: [PATCH] i965: don't underlink i965_dri.so, causes miserable failure - on musl libc - ---- - src/mesa/drivers/dri/i965/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am -index 9d003e4..8797431 100644 ---- a/src/mesa/drivers/dri/i965/Makefile.am -+++ b/src/mesa/drivers/dri/i965/Makefile.am -@@ -44,7 +44,7 @@ AM_CXXFLAGS = $(AM_CFLAGS) - - noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la - libi965_dri_la_SOURCES = $(i965_FILES) --libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS) -+libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS) $(top_builddir)/src/mapi/shared-glapi/libglapi.la - - libi965_compiler_la_SOURCES = $(i965_compiler_FILES) - --- -2.6.3 - diff --git a/packages/x11-dri/mesa/files/mesa-12.0-musl.patch b/packages/x11-dri/mesa/files/mesa-12.0-musl.patch deleted file mode 100644 index 1893d87..0000000 --- a/packages/x11-dri/mesa/files/mesa-12.0-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=93059 -From 553b874eefbdafb0b1f509cd39f861f5c3b98efe Mon Sep 17 00:00:00 2001 -From: Kylie McClain <somasis@exherbo.org> -Date: Sat, 21 Nov 2015 16:39:20 -0500 -Subject: [PATCH] i965: don't underlink i965_dri.so, causes miserable failure - on musl libc - ---- - src/mesa/drivers/dri/i965/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am -index 0a5222e..0a88ec5 100644 ---- a/src/mesa/drivers/dri/i965/Makefile.am -+++ b/src/mesa/drivers/dri/i965/Makefile.am -@@ -52,7 +52,8 @@ libi965_dri_la_SOURCES = $(i965_FILES) - libi965_dri_la_LIBADD = \ - $(top_builddir)/src/intel/isl/libisl.la \ - libi965_compiler.la \ -- $(INTEL_LIBS) -+ $(INTEL_LIBS) \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la - - libi965_compiler_la_SOURCES = \ - $(i965_compiler_FILES) \ --- -2.8.3 - diff --git a/packages/x11-dri/mesa/files/mesa-13.0-musl.patch b/packages/x11-dri/mesa/files/mesa-13.0-musl.patch deleted file mode 100644 index 5b898cd..0000000 --- a/packages/x11-dri/mesa/files/mesa-13.0-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=93059 -From 8c30dacc9d7f1e47f2519ab0e998a5e33f3cf75a Mon Sep 17 00:00:00 2001 -From: Kylie McClain <somasis@exherbo.org> -Date: Sat, 21 Nov 2015 16:39:20 -0500 -Subject: [PATCH] i965: don't underlink i965_dri.so, causes miserable failure - on musl libc - ---- - src/mesa/drivers/dri/i965/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am -index a192fc0..dd3c7b1 100644 ---- a/src/mesa/drivers/dri/i965/Makefile.am -+++ b/src/mesa/drivers/dri/i965/Makefile.am -@@ -83,7 +83,8 @@ libi965_dri_la_LIBADD = \ - libi965_compiler.la \ - $(top_builddir)/src/intel/blorp/libblorp.la \ - $(I965_PERGEN_LIBS) \ -- $(INTEL_LIBS) -+ $(INTEL_LIBS) \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la - - libi965_compiler_la_SOURCES = \ - $(i965_compiler_FILES) \ --- -2.10.2 - diff --git a/packages/x11-dri/mesa/files/mesa-17.1.1-musl.patch b/packages/x11-dri/mesa/files/mesa-17.1.1-musl.patch deleted file mode 100644 index 50c2d8b..0000000 --- a/packages/x11-dri/mesa/files/mesa-17.1.1-musl.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=93059 -From 8c30dacc9d7f1e47f2519ab0e998a5e33f3cf75a Mon Sep 17 00:00:00 2001 -From: Kylie McClain <somasis@exherbo.org> -Date: Sat, 21 Nov 2015 16:39:20 -0500 -Subject: [PATCH] i965: don't underlink i965_dri.so, causes miserable failure - on musl libc - -diff -Naur mesa-17.1.1/src/mesa/drivers/dri/i965/Makefile.am mesa-17.1.1.new/src/mesa/drivers/dri/i965/Makefile.am ---- mesa-17.1.1/src/mesa/drivers/dri/i965/Makefile.am 2017-05-25 09:13:13.000000000 +0200 -+++ mesa-17.1.1.new/src/mesa/drivers/dri/i965/Makefile.am 2017-05-29 18:12:35.469258076 +0200 -@@ -41,7 +41,8 @@ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(LIBDRM_CFLAGS) \ -- $(VALGRIND_CFLAGS) -+ $(VALGRIND_CFLAGS) \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la - - AM_CXXFLAGS = $(AM_CFLAGS) - diff --git a/packages/x11-dri/mesa/files/mesa-add-NDEBUG-without-rtti.patch b/packages/x11-dri/mesa/files/mesa-add-NDEBUG-without-rtti.patch deleted file mode 100644 index 47403cf..0000000 --- a/packages/x11-dri/mesa/files/mesa-add-NDEBUG-without-rtti.patch +++ /dev/null @@ -1,21 +0,0 @@ -Author: Rasmus Thomsen <cogitri@exherbo.org> -Reason: Mesa's meson build system doesn't pass -NDEBUG to the cppargs when building with LLVM -without RTTI support enabled. This causes the -build to fail because some parts of debugging -need RTTI support. -Upstream: Created bug for it, https://bugs.freedesktop.org/show_bug.cgi?id=106391 -diff --git a/meson.build b/meson.build -index 6e61766809..269b5bd3b9 100644 ---- a/meson.build -+++ b/meson.build -@@ -1150,6 +1150,9 @@ if with_llvm - # ensure that linking works. - if dep_llvm.get_configtool_variable('has-rtti') == 'NO' - cpp_args += '-fno-rtti' -+ pre_args += [ -+ '-DNDEBUG', -+ ] - endif - elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr - error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') diff --git a/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path-17.2.patch b/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path-17.2.patch deleted file mode 100644 index bce9bf7..0000000 --- a/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path-17.2.patch +++ /dev/null @@ -1,40 +0,0 @@ -Source: See below, slightly modified for 17.2.0 -Upstream: under review, https://patchwork.freedesktop.org/patch/157889/ -Reason: Fix cross compiling - -diff --git a/configure.ac b/configure.ac -index 0bd9650..c5dc8da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1696,12 +1696,18 @@ if test "x$with_platforms" = xauto; then - with_platforms=$with_egl_platforms - fi - --PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+AC_ARG_WITH([wayland-scanner-path], -+ [AS_HELP_STRING([--with-wayland-scanner-path=PATH], -+ [Path to wayland-scanner (by default the path from -+ 'pkg-config --variable=wayland_scanner wayland-scanner' is used)])], -+ [WAYLAND_SCANNER="$withval"], -+ [WAYLAND_SCANNER="auto"]) -+if test x$WAYLAND_SCANNER = xauto; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') --if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ WAYLAND_SCANNER=":") - fi -+AC_SUBST(WAYLAND_SCANNER) - - PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) - if test "x$have_wayland_protocols" = xyes; then -@@ -1718,7 +1724,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED]) - - if test "x$WAYLAND_SCANNER" = "x:"; then -- AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) -+ AC_MSG_ERROR([wayland-scanner is needed by Wayland platform but it could not be found and --with-wayland-scanner-path was not used]) - fi - if test "x$have_wayland_protocols" = xno; then - AC_MSG_ERROR([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED is needed to compile the wayland platform]) diff --git a/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path.patch b/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path.patch deleted file mode 100644 index a80f11a..0000000 --- a/packages/x11-dri/mesa/files/mesa-configure.ac-Add-with-wayland-scanner-path.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream: under review, https://patchwork.freedesktop.org/patch/157889/ -Reason: Fix cross compiling - -From b9f3b1cd55ef45e196dfa9c4f9469c7a7fa7f91d Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 23 May 2017 11:13:57 +0300 -Subject: [PATCH] configure.ac: Add --with-wayland-scanner-path - -Modify wayland-scanner lookup: Use the path given by pkg-config -but offer an option to override the path with -"--with-wayland-scanner-path=PATH". The latter is useful for -cross-compile situations. - -AC_PATH_PROG is no longer used (if the scanner is installed it should -get found by pkg-config). AC_SUBST is added so the output variable is -created when only the configure option is used. ---- - configure.ac | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b069f54155..5bd8dc76ab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1661,12 +1661,19 @@ if test "x$with_platforms" = xauto; then - with_platforms=$with_egl_platforms - fi - --PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ -+AC_ARG_WITH([wayland-scanner-path], -+ [AS_HELP_STRING([--with-wayland-scanner-path=PATH], -+ [Path to wayland-scanner (by default the path from -+ 'pkg-config --variable=wayland_scanner wayland-scanner' is used)])], -+ [WAYLAND_SCANNER="$withval"], -+ [WAYLAND_SCANNER="auto"]) -+if test x$WAYLAND_SCANNER = xauto; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') --if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ WAYLAND_SCANNER=":") - fi -+AC_SUBST(WAYLAND_SCANNER) - - # Do per platform setups and checks - platforms=`IFS=', '; echo $with_platforms` -@@ -1677,7 +1684,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED]) - - if test "x$WAYLAND_SCANNER" = "x:"; then -- AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) -+ AC_MSG_ERROR([wayland-scanner is needed by Wayland platform but it could not be found and --with-wayland-scanner-path was not used]) - fi - DEFINES="$DEFINES -DHAVE_WAYLAND_PLATFORM" - ;; --- -2.13.2 - diff --git a/packages/x11-dri/mesa/mesa-11.2.2-r1.exheres-0 b/packages/x11-dri/mesa/mesa-11.2.2-r1.exheres-0 deleted file mode 100644 index 4916199..0000000 --- a/packages/x11-dri/mesa/mesa-11.2.2-r1.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/mesa-11.1-musl.patch -) - diff --git a/packages/x11-dri/mesa/mesa-12.0.6-r2.exheres-0 b/packages/x11-dri/mesa/mesa-12.0.6-r2.exheres-0 deleted file mode 100644 index 8467eea..0000000 --- a/packages/x11-dri/mesa/mesa-12.0.6-r2.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/mesa-12.0-musl.patch -) - diff --git a/packages/x11-dri/mesa/mesa-13.0.6-r3.exheres-0 b/packages/x11-dri/mesa/mesa-13.0.6-r3.exheres-0 deleted file mode 100644 index 82fded6..0000000 --- a/packages/x11-dri/mesa/mesa-13.0.6-r3.exheres-0 +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/045f38a50759bb225cb179703bc7050f6de752b1.patch - "${FILES}"/mesa-13.0-musl.patch -) - diff --git a/packages/x11-dri/mesa/mesa-17.1.9-r2.exheres-0 b/packages/x11-dri/mesa/mesa-17.1.9-r2.exheres-0 deleted file mode 100644 index caa9ead..0000000 --- a/packages/x11-dri/mesa/mesa-17.1.9-r2.exheres-0 +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/mesa-17.1.1-musl.patch - "${FILES}"/mesa-configure.ac-Add-with-wayland-scanner-path.patch -) - diff --git a/packages/x11-dri/mesa/mesa-17.2.8-r1.exheres-0 b/packages/x11-dri/mesa/mesa-17.2.8-r1.exheres-0 deleted file mode 100644 index c1b6e6e..0000000 --- a/packages/x11-dri/mesa/mesa-17.2.8-r1.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/mesa-configure.ac-Add-with-wayland-scanner-path-17.2.patch -) - diff --git a/packages/x11-dri/mesa/mesa-17.3.9.exheres-0 b/packages/x11-dri/mesa/mesa-17.3.9.exheres-0 deleted file mode 100644 index 2d4389e..0000000 --- a/packages/x11-dri/mesa/mesa-17.3.9.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~armv7 ~armv8 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/mesa-configure.ac-Add-with-wayland-scanner-path-17.2.patch -) - diff --git a/packages/x11-dri/mesa/mesa-18.0.5.exheres-0 b/packages/x11-dri/mesa/mesa-18.0.5.exheres-0 deleted file mode 100644 index 00d12ff..0000000 --- a/packages/x11-dri/mesa/mesa-18.0.5.exheres-0 +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Copyright 2018 Rasmus Thomsen <cogitri@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa-meson - -PLATFORMS="~amd64 ~armv7 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/0001-build-fix-building-vdpau-va.patch - "${FILES}"/fix-build-without-dri.patch - "${FILES}"/c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4.patch - "${FILES}"/1d01b52d761227c9675b2785cc242ec51e803e84.patch - "${FILES}"/mesa-add-NDEBUG-without-rtti.patch -) - diff --git a/packages/x11-dri/mesa/mesa-18.1.2.exheres-0 b/packages/x11-dri/mesa/mesa-18.1.2.exheres-0 deleted file mode 100644 index f870e35..0000000 --- a/packages/x11-dri/mesa/mesa-18.1.2.exheres-0 +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Copyright 2018 Rasmus Thomsen <cogitri@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa-meson - -PLATFORMS="~amd64 ~armv7 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/0001-build-fix-building-vdpau-va.patch - "${FILES}"/fix-build-without-dri.patch - "${FILES}"/c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4.patch - "${FILES}"/1d01b52d761227c9675b2785cc242ec51e803e84.patch - "${FILES}"/mesa-add-NDEBUG-without-rtti.patch - "${FILES}"/3c288da5eec81ee58b85927df18d9194ead8f5c2.patch -) - diff --git a/packages/x11-dri/mesa/mesa-meson.exlib b/packages/x11-dri/mesa/mesa-meson.exlib deleted file mode 100644 index e94774b..0000000 --- a/packages/x11-dri/mesa/mesa-meson.exlib +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 2018 Rasmus Thomsen <cogitri@exherbo.org> -# Based in part upon 'mesa.exlib' which is: -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2008-2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Copyright 2013 Saleem Abdulrasool <compnerd@compnerd.org> - -if ever is_scm ; then - SCM_REPOSITORY="https://anongit.freedesktop.org/git/${PN}/${PN}.git" - require scm-git -else - MY_PV=${PV%%-rc*} - DOWNLOADS=" - https://mesa.freedesktop.org/archive/${MY_PV}/${PNV}.tar.xz - https://mesa.freedesktop.org/archive/${PNV}.tar.xz - " - UPSTREAM_RELEASE_NOTES="https://www.mesa3d.org/relnotes/${PV}.html" -fi - -require alternatives meson [ meson_minimum_version=0.42 ] - -export_exlib_phases src_prepare src_configure src_install - -SUMMARY="Mesa's OpenGL library" -HOMEPAGE="https://www.mesa3d.org" - -LICENCES="MIT" -SLOT="0" -MYOPTIONS=" - d3d9 [[ description = [ Gallium Direct3D 9.x state tracker ] requires = [ llvm X ] ]] - d3d9? ( - video_drivers: - ( - i915 - intel - nouveau - r300 - radeon - vmware - ) [[ number-selected = at-least-one ]] - ) - gl-vendor [[ - description = [ Install a glvnd (gl vendor) file to allow for parallel install of multiple GL implementations ] - ]] - llvm [[ description = [ Using LLVM as the shader backend for Gallium ] ]] - opencl [[ description = [ Enable the OpenCL Gallium state tracker ] requires = [ llvm ] ]] - sensors [[ description = [ Gallium extra HUD and sensors support ] ]] - sensors? ( ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] ) - texture-float [[ description = [ Enable floating-point textures and renderbuffers. SGI claims to hold patents on this code. ] ]] - va [[ description = [ Enable the VA-API state tracker ] ]] - va? ( - ( X wayland ) [[ number-selected = at-least-one ]] - video_drivers: - ( - nouveau - radeon - ) [[ number-selected = at-least-one ]] - ) - vdpau [[ description = [ Enable support for VDPAU hardware accelerated video decoding ] requires = [ X ] ]] - wayland - X [[ description = [ Enable GLX ] presumed = true ]] - xa [[ description = [ Enable the X Acceleration API (xatracker) ] ]] - xvmc [[ description = [ Enable support for XvMC hardware accelerated video decoding ] ]] - ( - platform: - amd64 - x86 - video_drivers: - ( - i915 [[ description = [ Gallium driver for i915 based Intel GPUs ] ]] - intel [[ description = [ Driver for i915, i965 and newer ] ]] - ) [[ number-selected = at-most-one ]] - gallium-swrast [[ - description = [ Gallium based software driver ] - requires = [ llvm ] - ]] - ( - nouveau [[ description = [ (Gallium) Generally for newer Nvidia cards ] ]] - nouveau-legacy [[ description = [ Generally for older Nvidia cards ] ]] - ) [[ number-selected = at-most-one ]] - ( - r300 [[ description = [ (Gallium) Driver for Radeon cards from 9500 (r300) to X1950 (r500) ] ]] - radeon [[ description = [ (Gallium) Driver for the Radeon HD-2000 (r600) and newer ] ]] - ) [[ requires = [ llvm video_drivers: gallium-swrast ] ]] - radeon-legacy [[ description = [ Classic driver for cards older than the Radeon 9500 (r300) ] ]] - virtio-gpu [[ description = [ Gallium driver for guest systems on hypervisors with VirtIO-GPU ] ]] - vmware [[ description = [ Gallium driver for VMware's SVGA virtual GPU ] ]] - ) - ( - platform: - armv7 - video_drivers: - ( - vc4 [[ description = [ Gallium driver for Raspberry Pi Videocore graphics ] ]] - ) - ) - llvm? ( - ( video_drivers: gallium-swrast i915 nouveau r300 radeon ) [[ number-selected = at-least-one ]] - ) - opencl? ( - ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] - ) - valgrind [[ description = [ Support valgrind intrinsics to suppress false warnings ] ]] - vdpau? ( ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] ) - xa? ( ( video_drivers: i915 nouveau vmware ) [[ number-selected = at-least-one ]] ) - xvmc? ( ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] ) -" - -# NOTE(Cogitri): The below version is needed to build mesa at all -LIBDRM_REQUIRED='[>=2.4.75]' -# The below version is needed to build amdvk or radeonsi -LIBDRM_REQUIRED_AMDGPU='[>=2.4.91]' -# The below version is needed to build any of the other radeon drivers -LIBDRM_REQUIRED_RADEON='[>=2.4.71]' -# The below version is needed to build dri or gallium nouveau -LIBDRM_REQUIRED_NOUVEAU='[>=2.4.66]' -# The below version is needed to build dri or gallium i915 -LIBDRM_REQUIRED_INTEL='[>=2.4.75]' -# NOTE(Cogitri): for xcb-glx -XCBDRI2_REQUIRED='[>=1.8.1]' - -# TODO state trackers: OpenMAX(omx), requires additional new dependency libomxil-bellagio -DEPENDENCIES=" - build: - dev-lang/python:2.7 - dev-libs/libpthread-stubs[>=0.4] - dev-python/Mako[>=0.8.0][python_abis:2.7] - sys-devel/bison - sys-devel/flex - virtual/pkg-config[>=0.9.0] - !x11-dri/eclectic-opengl - gl-vendor? ( dev-libs/libglvnd[>=0.2.0] ) - opencl? ( dev-lang/clang[>=3.9] ) - X? ( x11-proto/xorgproto ) - build+run: - dev-libs/expat - sys-libs/zlib[>=1.2.3] - x11-dri/libdrm${LIBDRM_REQUIRED} - llvm? ( dev-lang/llvm[>=3.9.0][-static(-)] [[ - note = [ meson build system doesn't support static llvm ] - ]] - ) - sensors? ( - sys-apps/lm_sensors[>=3.4.0] - ) - opencl? ( - dev-lang/llvm[>=3.9.0][-static(-)] - dev-libs/libclc - ) - va? ( - x11-libs/libX11 - x11-libs/libva[>=1.6.0] - x11-libs/libxcb${XCBDRI2_REQUIRED} - ) - valgrind? ( dev-util/valgrind ) - vdpau? ( - x11-libs/libX11 - x11-libs/libvdpau[>=1.1] - x11-libs/libxcb${XCBDRI2_REQUIRED} - ) - video_drivers:i915? ( x11-dri/libdrm${LIBDRM_REQUIRED_INTEL}[video_drivers:intel(+)] ) - video_drivers:intel? ( x11-dri/libdrm${LIBDRM_REQUIRED_INTEL}[video_drivers:intel(+)] ) - video_drivers:nouveau? ( x11-dri/libdrm${LIBDRM_REQUIRED_NOUVEAU}[video_drivers:nouveau(-)] ) - video_drivers:nouveau-legacy? ( x11-dri/libdrm${LIBDRM_REQUIRED_NOUVEAU}[video_drivers:nouveau(-)] ) - video_drivers:r300? ( x11-dri/libdrm${LIBDRM_REQUIRED_RADEON}[video_drivers:radeon(-)] ) - video_drivers:radeon? ( - dev-lang/llvm[>=4.0.0][-static(-)] - dev-util/elfutils - x11-dri/libdrm${LIBDRM_REQUIRED_AMDGPU}[video_drivers:radeon(-)] - ) - video_drivers:radeon-legacy? ( x11-dri/libdrm${LIBDRM_REQUIRED_RADEON}[video_drivers:radeon(-)] ) - video_drivers:vc4? ( x11-dri/libdrm[video_drivers:vc4(-)] ) - video_drivers:vmware? ( x11-dri/libdrm[video_drivers:vmware(-)] ) - wayland? ( - sys-libs/wayland[>=1.11] - sys-libs/wayland-protocols[>=1.8.0] - ) - X? ( - x11-libs/libICE - x11-libs/libX11[xcb(+)] - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXdamage[>=1.1] - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxshmfence[>=1.1] - x11-libs/libXxf86vm - ) - xvmc? ( - x11-libs/libX11 - x11-libs/libXvMC[>=1.0.6] - x11-libs/libxcb${XCBDRI2_REQUIRED} - ) - !sys-libs/wayland[<1.15.0] [[ - description = [ wayland imported libwayland-egl from mesa ] - resolution = uninstall-blocked-after - ]] - run: - opencl? ( - dev-libs/ocl-icd - ) - !media-libs/libtxc_dxtn [[ - description = [ mesa now bundles libtxc_dxtn ] - resolution = uninstall-blocked-after - ]] - suggestion: - x11-dri/mesa-demos [[ - description = [ Provides useful programs like glxinfo ] - ]] -" - -mesa-meson_src_prepare() { - # Meson's meson build system requires pkg-config to do some - # fancy, custom stuff, which use pkg-config directly. - edo mkdir "${WORKBASE}"/bin - edo ln -s "/usr/$(exhost --build)/bin/${PKG_CONFIG}" "${WORKBASE}"/bin/pkg-config - export PATH="${WORKBASE}/bin:${PATH}" - - meson_src_prepare -} - -mesa-meson_src_configure() { - DRI_DRIVERS=( ) - EGL_PLATFORMS=( ) - GALLIUM_DRIVERS=( ) - VULKAN_DRIVERS=( ) - - option !video_drivers:gallium-swrast && DRI_DRIVERS+=( swrast ) - option video_drivers:intel && DRI_DRIVERS+=( i915 i965 ) - option video_drivers:nouveau-legacy && DRI_DRIVERS+=( nouveau ) - option video_drivers:radeon-legacy && DRI_DRIVERS+=( r100 r200 ) - - # TODO: pl111,freedeno,softpipe,vc4,etnaviv,imx,svga,swr - option video_drivers:gallium-swrast && GALLIUM_DRIVERS+=( swrast ) - option video_drivers:i915 && GALLIUM_DRIVERS+=( i915 ) - option video_drivers:nouveau && GALLIUM_DRIVERS+=( nouveau ) - option video_drivers:r300 && GALLIUM_DRIVERS+=( r300 ) - option video_drivers:radeon && GALLIUM_DRIVERS+=( r600 radeonsi ) - option video_drivers:vc4 && GALLIUM_DRIVERS+=( vc4 ) - option video_drivers:virtio-gpu && GALLIUM_DRIVERS+=( virgl ) - option video_drivers:vmware && GALLIUM_DRIVERS+=( svga ) - - option X && EGL_PLATFORMS+=( x11 ) - option wayland && EGL_PLATFORMS+=( wayland ) - EGL_PLATFORMS+=( drm surfaceless ) - - option video_drivers:intel && VULKAN_DRIVERS+=( intel ) - option video_drivers:radeon && VULKAN_DRIVERS+=( amd ) - - local MESA_SRC_CONFIGURE_PARAMS - - MESA_SRC_CONFIGURE_PARAMS+=( - -Dasm=true - -Ddri-drivers="$(IFS=, ; echo "${DRI_DRIVERS[*]}")" - -Degl=true - -Dgallium-drivers=$(IFS=, ; echo "${GALLIUM_DRIVERS[*]}") - -Dgles1=true - -Dgles2=true - -Dlibunwind=false - -Dopengl=true - -Dshared-glapi=true - -Dplatforms=$(IFS=, ; echo "${EGL_PLATFORMS[*]}") - -Dshader-cache=true - -Dvulkan-drivers=$(IFS=, ; echo "${VULKAN_DRIVERS[*]}") - - # OSMesa needs either gallium_softpipe (GALLIUM_DRIVERS=swrast) or dri swrast - # (DRI_DRIVERS=SWRAST) to be enabled. - $(meson_switch video_drivers:gallium-swrast osmesa gallium classic) - - $(meson_switch d3d9 gallium-nine) - $(meson_switch gl-vendor glvnd) - $(meson_switch llvm) - $(meson_switch opencl gallium-opencl icd disabled) - $(meson_switch sensors lmsensors) - $(meson_switch sensors gallium-extra-hud) - $(meson_switch texture-float) - $(meson_switch va gallium-va) - $(meson_switch valgrind) - $(meson_switch vdpau gallium-vdpau) - $(meson_switch X dri3) - $(meson_switch X glx dri disabled) - $(meson_switch xa gallium-xa) - $(meson_switch xvmc gallium-xvmc) - ) - - # Missing dependency - if ever at_least 18.1; then - MESA_SRC_CONFIGURE_PARAMS+=( - -Dgallium-omx=disabled - ) - else - MESA_SRC_CONFIGURE_PARAMS+=( - -Dgallium-omx=false - ) - fi - - exmeson "${MESA_SRC_CONFIGURE_PARAMS[@]}" "${MESON_SOURCE}" -} - -mesa-meson_src_install() { - dodir /usr - - local host=$(exhost --target) - local X_alternatives=() - - meson_src_install - - # alternatives - local libs=(libEGL libGLESv1_CM libGLESv2) - option X && libs+=(libGL) - - edo mkdir "${IMAGE}"/usr/${host}/lib/opengl/ - - local lib path_old path_new soname - for lib in "${libs[@]}"; do - path_new=/usr/${host}/lib/opengl/${lib}-xorg.so - path_old=$(readlink -f "${IMAGE}"/usr/${host}/lib/${lib}.so) - - edo mv \ - "${path_old}" \ - "${IMAGE}"/${path_new} - - local objdump=$(exhost --tool-prefix)objdump - soname=$(edo ${objdump} -p "${IMAGE}"/${path_new} | sed -n 's/^ *SONAME *//p') - - # clean up the leftover symlinks - edo rm "${IMAGE}"/usr/${host}/lib/{${lib}.so,${soname}} - - X_alternatives+=( - /usr/${host}/lib/${lib}.so ${path_new} - /usr/${host}/lib/${soname} ${path_new} - ) - done - - if option wayland ; then - # wayland[>=1.15] imported libwayland-egl in order to allow multiple - # drivers using it. - edo rm "${IMAGE}"/usr/$(exhost --target)/lib/pkgconfig/wayland-egl.pc \ - "${IMAGE}"/usr/$(exhost --target)/lib/libwayland-egl.so* - fi - - alternatives_for opengl X.org 10 ${X_alternatives[@]} - - edo rm -rf "${IMAGE}"/usr/${host}/include/GL/{glew,glxew,wglew}.h -} - diff --git a/packages/x11-dri/mesa/mesa-scm.exheres-0 b/packages/x11-dri/mesa/mesa-scm.exheres-0 deleted file mode 100644 index a9e8833..0000000 --- a/packages/x11-dri/mesa/mesa-scm.exheres-0 +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2009, 2010 Ingmar Vanhassel <ingmar@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 - -require mesa - -PLATFORMS="~amd64 ~armv7 ~x86" - -src_install() { - mesa_src_install - - # scm doesn't care about --disable-glut there :( - edo rm -f "${IMAGE}/usr/include/GL/glut.h" -} - diff --git a/packages/x11-dri/mesa/mesa.exlib b/packages/x11-dri/mesa/mesa.exlib deleted file mode 100644 index 633ad30..0000000 --- a/packages/x11-dri/mesa/mesa.exlib +++ /dev/null @@ -1,515 +0,0 @@ -# Copyright 2008 Alexander Færøy <eroyf@eroyf.org> -# Copyright 2008-2011 Ingmar Vanhassel <ingmar@exherbo.org> -# Copyright 2013 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Public License v2 -# Based in part upon 'mesa-7.0.3.ebuild' which is: -# Copyright 1999-2008 Gentoo Foundation - -if ever is_scm ; then - SCM_REPOSITORY="https://anongit.freedesktop.org/git/${PN}/${PN}.git" - require scm-git -else - MY_PV=${PV%%-rc*} - DOWNLOADS=" - https://mesa.freedesktop.org/archive/${MY_PV}/${PNV}.tar.xz - https://mesa.freedesktop.org/archive/${PNV}.tar.xz - " - UPSTREAM_RELEASE_NOTES="https://www.mesa3d.org/relnotes/${PV}.html" -fi - -require alternatives toolchain-funcs -require flag-o-matic -require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ] - -export_exlib_phases src_configure src_install pkg_postinst - -OPENGL_DIR="xorg-x11" - -SUMMARY="Mesa's OpenGL library" -HOMEPAGE="https://www.mesa3d.org" - -# Licences for parts we don't install: -# GLUT: Mark Kilgard's copyright -LICENCES="MIT" -SLOT="0" -MYOPTIONS=" - llvm [[ description = [ Using LLVM as the shader backend for Gallium ] ]] - llvm-static [[ description = [ Link to LLVM statically ] requires = [ llvm ] ]] - opencl [[ description = [ Enable the OpenCL Gallium state tracker ] requires = [ llvm ] ]] - texture-float [[ description = [ Enable floating-point textures and renderbuffers. SGI claims to hold patents on this code. ] ]] - va [[ description = [ Enable the VA-API state tracker ] ]] - wayland - X [[ description = [ Enable GLX ] presumed = true ]] - xa [[ description = [ Enable the X Acceleration API (xatracker) ] ]] - xvmc [[ description = [ Enable support for XvMC hardware accelerated video decoding ] ]] - ( - platform: - amd64 - x86 - video_drivers: - ( - i915 [[ description = [ Gallium driver for i915 based Intel GPUs ] ]] - intel [[ description = [ Driver for i915, i965 and newer ] ]] - ) [[ number-selected = at-most-one ]] - gallium-swrast [[ description = [ Gallium based software driver ] ]] - ( - nouveau [[ description = [ (Gallium) Generally for newer Nvidia cards ] ]] - nouveau-legacy [[ description = [ Generally for older Nvidia cards ] ]] - ) [[ number-selected = at-most-one ]] - ( - r300 [[ description = [ (Gallium) Driver for Radeon cards from 9500 (r300) to X1950 (r500) ] ]] - radeon [[ description = [ (Gallium) Driver for the Radeon HD-2000 (r600) and newer ] ]] - ) [[ requires = [ llvm video_drivers: gallium-swrast ] ]] - radeon-legacy [[ description = [ Classic driver for cards older than the Radeon 9500 (r300) ] ]] - virtio-gpu [[ description = [ Gallium driver for guest systems on hypervisors with VirtIO-GPU ] ]] - vmware [[ description = [ Gallium driver for VMware's SVGA virtual GPU ] ]] - ) - ( - platform: - armv7 - video_drivers: - ( - vc4 [[ description = [ Gallium driver for Raspberry Pi Videocore graphics ] ]] - ) - ) - llvm? ( - ( video_drivers: gallium-swrast i915 nouveau r300 radeon ) [[ number-selected = at-least-one ]] - ) - opencl? ( - ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] - ) - vdpau? ( ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] ) - xa? ( ( video_drivers: i915 nouveau vmware radeon ) [[ number-selected = at-least-one ]] ) - xvmc? ( ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] ) -" - -if ever at_least 17.1.3; then - MYOPTIONS+=" - vdpau [[ description = [ Enable support for VDPAU hardware accelerated video decoding ] requires = [ X ] ]] - va? ( - ( X wayland ) [[ number-selected = at-least-one ]] - ) - " -else - MYOPTIONS+=" - vdpau [[ description = [ Enable support for VDPAU hardware accelerated video decoding ] ]] - " -fi - -if ever at_least 13.0.0; then - MYOPTIONS+=" - sensors [[ description = [ Gallium extra HUD and sensors support ] ]] - sensors? ( ( video_drivers: nouveau radeon ) [[ number-selected = at-least-one ]] ) - " -else - MYOPTIONS+=" - ( providers: eudev systemd ) [[ number-selected = exactly-one ]] - " -fi - -if ever at_least 12.0.0-rc1; then - MYOPTIONS+=" - gl-vendor [[ - description = [ Install a glvnd (gl vendor) file to allow for parallel install of multiple GL implementations ] - ]] - valgrind [[ description = [ Support valgrind intrinsics to suppress false warnings ] ]] - " -fi - -if ! ever at_least 17.1.3; then - MYOPTIONS+=" - ( providers: gcrypt libressl nettle openssl ) [[ number-selected = exactly-one ]] - " -fi - -# these high versions are not required for every package but as long as we don't need to deal with different versions use the latest -if ever at_least 17.3.7; then - LIBDRM_REQUIRED='[>=2.4.91]' -elif ever at_least 17.2.0; then - LIBDRM_REQUIRED='[>=2.4.82]' -elif ever at_least 17.1.3; then - LIBDRM_REQUIRED='[>=2.4.80]' -else - LIBDRM_REQUIRED='[>=2.4.69]' -fi - - -DEPENDENCIES=" - build: - dev-lang/python:2.7 - sys-devel/bison - sys-devel/flex - virtual/pkg-config[>=0.9.0] - !x11-dri/eclectic-opengl - llvm? ( - !llvm-static? ( dev-lang/llvm[>=3.7][-static] ) - llvm-static? ( dev-lang/llvm[>=3.7][static] ) - ) - opencl? ( - dev-lang/clang[>=3.4] - ) - video_drivers:radeon? ( dev-lang/llvm[>=3.6.0] ) - X? ( x11-proto/xorgproto ) - build+run: - dev-libs/expat - x11-dri/libdrm${LIBDRM_REQUIRED} - opencl? ( dev-libs/libclc ) - va? ( - x11-libs/libX11 - x11-libs/libva[>=1.6.0] - x11-libs/libxcb${XCBDRI2_REQUIRED} - ) - vdpau? ( - x11-libs/libX11 - x11-libs/libvdpau[>=1.1] - x11-libs/libxcb${XCBDRI2_REQUIRED} - ) - video_drivers:i915? ( x11-dri/libdrm[video_drivers:intel(+)] ) - video_drivers:intel? ( x11-dri/libdrm[video_drivers:intel(+)] ) - video_drivers:nouveau? ( x11-dri/libdrm[video_drivers:nouveau(-)] ) - video_drivers:nouveau-legacy? ( x11-dri/libdrm[video_drivers:nouveau(-)] ) - video_drivers:r300? ( x11-dri/libdrm[video_drivers:radeon(-)] ) - video_drivers:radeon? ( - dev-util/elfutils - x11-dri/libdrm[video_drivers:radeon(-)] - ) - video_drivers:radeon-legacy? ( x11-dri/libdrm[video_drivers:radeon(-)] ) - video_drivers:vc4? ( x11-dri/libdrm[video_drivers:vc4(-)] ) - video_drivers:vmware? ( x11-dri/libdrm[video_drivers:vmware(-)] ) - wayland? ( sys-libs/wayland[>=1.2.0] ) - X? ( - x11-libs/libICE - x11-libs/libX11[xcb(+)] - x11-libs/libXau - x11-libs/libxcb[>=1.9.3] - x11-libs/libXdamage[>=1.1.1] - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxshmfence[>=1.1] - x11-libs/libXxf86vm - ) - xvmc? ( - x11-libs/libX11 - x11-libs/libXvMC[>=1.0.6] - x11-libs/libxcb${XCBDRI2_REQUIRED} - ) - run: - llvm? ( - !llvm-static? ( dev-lang/llvm[>=3.7][-static] ) - ) - opencl? ( - dev-libs/ocl-icd - ) - suggestion: - x11-dri/mesa-demos -" - -if ever at_least 13.0.0; then - DEPENDENCIES+=" - build+run: - sensors? ( - sys-apps/lm_sensors[>=3.4.0] - [[ note = [ lm_sensors version in configure.ac is bogus ] ]] - ) - " -else - DEPENDENCIES+=" - build: - providers:eudev? ( sys-apps/eudev ) - providers:systemd? ( sys-apps/systemd[>=151] ) - " -fi - -if ever at_least 12.0.0-rc1; then - DEPENDENCIES+=" - build: - gl-vendor? ( dev-libs/libglvnd ) - valgrind? ( dev-util/valgrind ) - " -fi - -if ! ever at_least 17.1.3; then - DEPENDENCIES+=" - build+run: - providers:gcrypt? ( dev-libs/libgcrypt ) - providers:libressl? ( dev-libs/libressl:= ) - providers:nettle? ( dev-libs/nettle ) - providers:openssl? ( dev-libs/openssl ) - " -fi - -if ever at_least 17.1.3; then - DEPENDENCIES+=" - build: - dev-libs/libpthread-stubs[>=0.4] - gl-vendor? ( dev-libs/libglvnd[>=0.2.0] ) - video_drivers:radeon? ( dev-lang/llvm[>=3.9.0] ) - build+run: - sys-libs/zlib[>=1.2.3] - wayland? ( sys-libs/wayland[>=1.11] ) - " -fi - -if ever at_least 17.2.0; then - DEPENDENCIES+=" - build: - dev-libs/libpthread-stubs[>=0.4] - gl-vendor? ( dev-libs/libglvnd[>=0.2.0] ) - video_drivers:radeon? ( dev-lang/llvm[>=3.9.0] ) - build+run: - sys-libs/zlib[>=1.2.3] - wayland? ( - sys-libs/wayland[>=1.11] - sys-libs/wayland-protocols[>=1.8.0] - ) - " -fi - -if ever at_least 17.3.3; then - DEPENDENCIES+=" - build: - opencl? ( dev-lang/llvm[>=3.9.0] ) - build+run: - !media-libs/libtxc_dxtn [[ - description = [ mesa now bundles libtxc_dxtn ] - resolution = uninstall-blocked-after - ]] - " -fi - -if ever at_least 13.0.0; then - DEPENDENCIES+=" - build: - dev-python/Mako[>=0.8.0][python_abis:2.7] - " -else - DEPENDENCIES+=" - build: - dev-python/Mako[>=0.3.4][python_abis:2.7] - " -fi - -if ever is_scm; then - DEPENDENCIES+=" - build+run: - x11-apps/xrandr - " -fi - - -DEFAULT_SRC_TEST_PARAMS=( PTHREAD_LIBS="-lpthread" ) - -AT_M4DIR=( m4 ) - -mesa_src_configure() { - DRI_DRIVERS=( ) - EGL_PLATFORMS=( ) - GALLIUM_DRIVERS_NOSW=( ) - GALLIUM_DRIVERS=( ) - VULKAN_DRIVERS=( ) - - option !video_drivers:gallium-swrast && DRI_DRIVERS+=( swrast ) - option video_drivers:intel && DRI_DRIVERS+=( i915 i965 ) - option video_drivers:nouveau-legacy && DRI_DRIVERS+=( nouveau ) - option video_drivers:radeon-legacy && DRI_DRIVERS+=( radeon r200 ) - - # TODO: noop, swr, vc5, etnaviv, imx, pl111 - option video_drivers:i915 && GALLIUM_DRIVERS_NOSW+=( i915 ) - option video_drivers:nouveau && GALLIUM_DRIVERS_NOSW+=( nouveau ) - option video_drivers:r300 && GALLIUM_DRIVERS_NOSW+=( r300 ) - option video_drivers:radeon && GALLIUM_DRIVERS_NOSW+=( r600 radeonsi ) - option video_drivers:vc4 && GALLIUM_DRIVERS_NOSW+=( vc4 ) - option video_drivers:virtio-gpu && GALLIUM_DRIVERS_NOSW+=( virgl ) - option video_drivers:vmware && GALLIUM_DRIVERS_NOSW+=( svga ) - - # TODO: gallium-swr - GALLIUM_DRIVERS=( "${GALLIUM_DRIVERS_NOSW[@]}" ) - option video_drivers:gallium-swrast && GALLIUM_DRIVERS+=( swrast ) - - option X && EGL_PLATFORMS+=( x11 ) - option wayland && EGL_PLATFORMS+=( wayland ) - EGL_PLATFORMS+=( drm surfaceless ) - - option video_drivers:intel && VULKAN_DRIVERS+=( intel ) - option video_drivers:radeon && VULKAN_DRIVERS+=( radeon ) - - local MESA_SRC_CONFIGURE_PARAMS - - # NOTE(compnerd) disable the assembly dispatching. The code is absolutely horrid, fragile, and - # is disabled by other distributions as well (including Fedora and RHEL). It is also broken - # with LTO, and is not intended to be fixed. https://bugs.freedesktop.org/show_bug.cgi?id=55080 - MESA_SRC_CONFIGURE_PARAMS+=( - $(option llvm && echo --with-llvm-prefix=/usr/$(exhost --target)) - $($(option platform:x86 || option platform:amd64) && echo --disable-asm) - --enable-osmesa # off-screen mesa - ) - - if [[ ${#DRI_DRIVERS[@]} -gt 0 ]]; then - MESA_SRC_CONFIGURE_PARAMS+=( --with-dri-drivers=$(IFS=, ; echo "${DRI_DRIVERS[*]}") ) - else - MESA_SRC_CONFIGURE_PARAMS+=( --without-dri-drivers ) - fi - - if [[ ${#GALLIUM_DRIVERS[*]} -gt 0 ]] ; then - MESA_SRC_CONFIGURE_PARAMS+=( --with-gallium-drivers=$(IFS=, ; echo "${GALLIUM_DRIVERS[*]}") ) - else - MESA_SRC_CONFIGURE_PARAMS+=( --without-gallium-drivers ) - fi - - if [[ ${#GALLIUM_DRIVERS_NOSW[*]} -gt 0 ]] ; then - MESA_SRC_CONFIGURE_PARAMS+=( $(option video_drivers:gallium-swrast && echo "--enable-nine") ) - fi - - if ever at_least 12.0.0-rc1; then - if [[ ${#VULKAN_DRIVERS[@]} -gt 0 ]]; then - MESA_SRC_CONFIGURE_PARAMS+=( --with-vulkan-drivers=$(IFS=, ; echo "${VULKAN_DRIVERS[*]}") ) - else - MESA_SRC_CONFIGURE_PARAMS+=( --without-vulkan-drivers ) - fi - MESA_SRC_CONFIGURE_PARAMS+=( $(option_enable gl-vendor libglvnd) ) - fi - - # TODO gallium_tests - # TODO state trackers: OpenMAX(omx), requires additional new dependency libomxil-bellagio - - MESA_SRC_CONFIGURE_PARAMS+=( - --with-pic - --enable-dri - --enable-egl - --enable-gbm - --enable-gles1 - --enable-gles2 - --enable-shared-glapi - --disable-glx-read-only-text - $(option_enable !llvm-static llvm-shared-libs) - $(option_enable opencl) - $(option_enable opencl opencl-icd) - $(option_enable texture-float) - $(option_enable va) - $(option_enable vdpau) - $(option_enable X dri3) - $(option_enable X glx) - $(option_enable X glx-tls) - $(option_enable xa) - $(option_enable xvmc) - ) - - if ever at_least 17.3.4; then - MESA_SRC_CONFIGURE_PARAMS+=( - --enable-driglx-direct - --disable-omx-bellagio - ) - else - MESA_SRC_CONFIGURE_PARAMS+=( - --disable-omx - ) - fi - - if ever at_least 12.0.0-rc1; then - MESA_SRC_CONFIGURE_PARAMS+=( $(option_enable valgrind) ) - fi - - if ! ever at_least 12.0.2; then - MESA_SRC_CONFIGURE_PARAMS+=( - $(option_enable video_drivers:radeon r600-llvm-compiler) - ) - fi - - if ever at_least 13.0.0; then - MESA_SRC_CONFIGURE_PARAMS+=( - $(option_enable sensors lmsensors) - $(option_enable sensors gallium_extra_hud) - ) - else - MESA_SRC_CONFIGURE_PARASM+=( - --disable-sysfs - ) - fi - - if ever at_least 17.1.3; then - MESA_SRC_CONFIGURE_PARAMS+=( - --disable-libunwind - --with-platforms=$(IFS=, ; echo "${EGL_PLATFORMS[*]}") - --with-wayland-scanner-path=/usr/$(exhost --build)/bin/wayland-scanner - $(option_enable llvm) - ) - else - MESA_SRC_CONFIGURE_PARAMS+=( - --enable-shader-cache - --with-egl-platforms=$(IFS=, ; echo "${EGL_PLATFORMS[*]}") - $(option_enable llvm gallium-llvm) - ) - if option providers:libressl || option providers:openssl; then - MESA_SRC_CONFIGURE_PARAMS+=( - --with-sha1=libcrypto - ) - elif option providers:gcrypt; then - MESA_SRC_CONFIGURE_PARAMS+=( - --with-sha1=libgcrypt - ) - elif option providers:nettle; then - MESA_SRC_CONFIGURE_PARAMS+=( - --with-sha1=libnettle - ) - fi - fi - - # Fix using the 32bit python while it isn't needed. - # TODO: Something with python.exlib to require the neccessary modules to be built for the - # selected python. - #PYTHON2=/usr/bin/python2 \ - # TODO: check if something similar to the above might be necessary when cross-compiling - # mesa. Obviously the path doesn't work on cross. (heirecka) - econf "${MESA_SRC_CONFIGURE_PARAMS[@]}" -} - -mesa_src_install() { - dodir /usr - - local host=$(exhost --target) - local X_alternatives=() - - default - - # alternatives - local libs=(libEGL libGLESv1_CM libGLESv2) - option X && libs+=(libGL) - - edo mkdir "${IMAGE}"/usr/${host}/lib/opengl/ - - local lib path_old path_new soname - for lib in "${libs[@]}"; do - path_new=/usr/${host}/lib/opengl/${lib}-xorg.so - path_old=$(readlink -f "${IMAGE}"/usr/${host}/lib/${lib}.so) - - edo mv \ - "${path_old}" \ - "${IMAGE}"/${path_new} - - local objdump=$(exhost --tool-prefix)objdump - soname=$(edo ${objdump} -p "${IMAGE}"/${path_new} | sed -n 's/^ *SONAME *//p') - - # clean up the leftover symlinks - edo rm "${IMAGE}"/usr/${host}/lib/{${lib}.so,${soname}} - - X_alternatives+=( - /usr/${host}/lib/${lib}.so ${path_new} - /usr/${host}/lib/${soname} ${path_new} - ) - done - - alternatives_for opengl X.org 10 ${X_alternatives[@]} - - edo rm -rf "${IMAGE}"/usr/${host}/include/GL/{glew,glxew,wglew}.h -} - -mesa_pkg_postinst() { - # Clean up after old eclectic-opengl module - if [[ -f ${ROOT}/etc/env.d/03opengl ]] ; then - rm "${ROOT}/etc/env.d/03opengl" || ewarn "Remove /etc/env.d/03opengl manually" - fi - - alternatives_pkg_postinst -} - diff --git a/packages/x11-libs/exlibs/qt.exlib b/packages/x11-libs/exlibs/qt.exlib deleted file mode 100644 index f018df4..0000000 --- a/packages/x11-libs/exlibs/qt.exlib +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 2008-2010 Bo Ørsted Andresen <zlin@exherbo.org> -# Copyright 2008, 2009, 2010, 2014 Ingmar Vanhassel -# Distributed under the terms of the GNU General Public License v2 -# Based in part upon 'qt-4.3.4-r1.ebuild' from Gentoo, which is: -# Copyright 1999-2008 Gentoo Foundation - -if ever at_least 5.10.0-beta4 ; then - myexparam pn=${MY_PN:-${PN}-everywhere-src} -else - myexparam pn=${MY_PN:-${PN}-opensource-src} -fi -myexparam pv=${MY_PV:-${PV}} -MY_PNV=$(exparam pn)-$(exparam pv) - -require toolchain-funcs - -HOMEPAGE="https://www.qt.io/" -if [[ ${PV} == *-@(alpha|beta|rc|RC)* ]] ; then - BASE_URI="mirror://qt/development_releases/qt/$(ever range 1-2)/${PV/rc1/rc}/" -else - BASE_URI="mirror://qt/official_releases/qt/$(ever range 1-2)/${PV}/" -fi - -if ever is_scm; then - SCM_REPOSITORY="git://code.qt.io/qt/${PN}.git" - SCM_BRANCH="5.10" - - require scm-git - - SLOT=5 -elif ever at_least 5.2.1; then - DOWNLOADS="${BASE_URI}submodules/${MY_PNV}.tar.xz" - # Minor version specific documentation is gone - UPSTREAM_DOCUMENTATION="https://doc.qt.io/qt-$(ever major)/index.html [[ description = [ Qt Reference Documentation ] ]]" -else - DOWNLOADS="${BASE_URI}${MY_PNV}.tar.gz" - UPSTREAM_CHANGELOG="${BASE_URI}changes-${PV}" - UPSTREAM_DOCUMENTATION="https://doc.qt.io/qt-$(ever range 1-2)/index.html [[ description = [ Qt Reference Documentation ] ]]" -fi - -if ! ever is_scm; then - SLOT=$(ever major) - WORK=${WORKBASE}/${MY_PNV} -fi - -if ever at_least 5.7.0-rc ; then - LICENCES="|| ( GPL-2 LGPL-3 ) FDL-1.3" -else - LICENCES="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" -fi - -BUGS_TO="kde@exherbo.org" - -DEFAULT_SRC_INSTALL_PARAMS+=( INSTALL_ROOT="${IMAGE}" ) - -qt_mkspecs_dir() { - # Allows us to define which mkspecs dir we want to use. - local spec - - spec="linux" - if [[ ${CXX} == *c++* ]]; then - if cxx-is-gcc;then - spec+="-g++" - elif cxx-is-clang;then - spec+="-clang" - else - die "Unknown compiler ${CXX}; you will need to add a check for it to qt.exlib" - fi - else - die "Unknown compiler ${CXX}" - fi - - echo "${spec}" -} - -qt_enable() { - local opt="${1}" feature="${2:-${1}}" - local prefix="${3:+-}${3}" postfix="${4:+-}${4}" - (( ${#} >= 4 )) && shift 4 || shift ${#} - - if option "${opt}"; then - echo "${prefix}-${feature}${postfix}" "${@}" - else - echo "-no-${feature}" - fi -} - -qt_build() { - local opt="${1}" feature="${2:-${1}}" - - if option "${opt}" ; then - echo "-make ${feature}" - else - echo "-nomake ${feature}" - fi -} - diff --git a/packages/x11-libs/qtbase/files/qtbase-Revert-QTemporaryFile-Add-support-for-Linux-s-O_TMPF.patch b/packages/x11-libs/qtbase/files/qtbase-Revert-QTemporaryFile-Add-support-for-Linux-s-O_TMPF.patch deleted file mode 100644 index 7426e21..0000000 --- a/packages/x11-libs/qtbase/files/qtbase-Revert-QTemporaryFile-Add-support-for-Linux-s-O_TMPF.patch +++ /dev/null @@ -1,648 +0,0 @@ -Upstream: no -Reason: qmake fails when installing under sydbox - -From bb93dd016f2174339ae511608e998a1ceb3cab52 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Fri, 16 Feb 2018 15:22:27 +0100 -Subject: [PATCH 1/2] Revert "QTemporaryFile: hide the O_TMPFILE feature behind - a check for linkat()" - -This reverts commit 490b24b06408e90e9684d8331fd3fe8b0c51b0b5. ---- - src/corelib/configure.json | 15 --------------- - src/corelib/global/minimum-linux_p.h | 2 +- - src/corelib/global/qconfig-bootstrapped.h | 5 ----- - src/corelib/io/qtemporaryfile_p.h | 2 +- - 4 files changed, 2 insertions(+), 22 deletions(-) - -diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 8cd73d6ce4..fdb0fca66e 100644 ---- a/src/corelib/configure.json -+++ b/src/corelib/configure.json -@@ -349,15 +349,6 @@ - "qmake": "linux: LIBS += -lpthread -lrt" - } - }, -- "linkat": { -- "label": "linkat()", -- "type": "compile", -- "test": { -- "head": "#define _ATFILE_SOURCE 1", -- "include": [ "fcntl.h", "unistd.h" ], -- "main": "linkat(AT_FDCWD, \"foo\", AT_FDCWD, \"bar\", AT_SYMLINK_FOLLOW);" -- } -- }, - "ppoll": { - "label": "ppoll()", - "type": "compile", -@@ -549,12 +540,6 @@ - "condition": "libs.journald", - "output": [ "privateFeature" ] - }, -- "linkat": { -- "label": "linkat()", -- "autoDetect": "config.linux", -- "condition": "tests.linkat", -- "output": [ "privateFeature" ] -- }, - "std-atomic64": { - "label": "64 bit atomic operations", - "condition": "libs.libatomic", -diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h -index bad2488b4d..324744b856 100644 ---- a/src/corelib/global/minimum-linux_p.h -+++ b/src/corelib/global/minimum-linux_p.h -@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE - * - inotify_init1 before 2.6.12-rc12 - * - futex(2) before 2.6.12-rc12 - * - FUTEX_WAKE_OP 2.6.14 FUTEX_OP -- * - linkat(2) 2.6.17 O_TMPFILE && QT_CONFIG(linkat) -+ * - linkat(2) 2.6.17 O_TMPFILE - * - FUTEX_PRIVATE_FLAG 2.6.22 - * - O_CLOEXEC 2.6.23 - * - eventfd 2.6.23 -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index dabb715607..2164d7f21f 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -87,11 +87,6 @@ - #define QT_FEATURE_futimens -1 - #define QT_FEATURE_futimes -1 - #define QT_FEATURE_library -1 --#ifdef __linux__ --# define QT_FEATURE_linkat 1 --#else --# define QT_FEATURE_linkat -1 --#endif - #define QT_NO_QOBJECT - #define QT_FEATURE_process -1 - #define QT_FEATURE_renameat2 -1 -diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h -index fb8887af53..6f98ceed90 100644 ---- a/src/corelib/io/qtemporaryfile_p.h -+++ b/src/corelib/io/qtemporaryfile_p.h -@@ -58,7 +58,7 @@ - #include "private/qfile_p.h" - #include "qtemporaryfile.h" - --#if defined(Q_OS_LINUX) && QT_CONFIG(linkat) -+#ifdef Q_OS_LINUX - # include <fcntl.h> - # ifdef O_TMPFILE - // some early libc support had the wrong values for O_TMPFILE --- -2.16.1 - - -From 93a451315dee5dd7cc482af7263681342beb72bc Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Fri, 16 Feb 2018 15:29:14 +0100 -Subject: [PATCH 2/2] Revert "QTemporaryFile: Add support for Linux's - O_TMPFILE" - -This reverts commit 189e9c93d7ed42202ad51507c8944d64e9a7888d. - -Change-Id: I5e8e17c66320f0e58a47f0cf35d0f59e0c7d40d2 ---- - src/corelib/io/qfile.cpp | 8 +- - src/corelib/io/qtemporaryfile.cpp | 192 ++------------------- - src/corelib/io/qtemporaryfile_p.h | 18 -- - .../io/qtemporaryfile/tst_qtemporaryfile.cpp | 81 +-------- - .../qnetworkdiskcache/tst_qnetworkdiskcache.cpp | 1 - - 5 files changed, 20 insertions(+), 280 deletions(-) - -diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp -index e4888e9523..36b2467253 100644 ---- a/src/corelib/io/qfile.cpp -+++ b/src/corelib/io/qfile.cpp -@@ -557,9 +557,7 @@ bool - QFile::rename(const QString &newName) - { - Q_D(QFile); -- -- // if this is a QTemporaryFile, the virtual fileName() call here may do something -- if (fileName().isEmpty()) { -+ if (d->fileName.isEmpty()) { - qWarning("QFile::rename: Empty or null file name"); - return false; - } -@@ -720,7 +718,7 @@ bool - QFile::link(const QString &linkName) - { - Q_D(QFile); -- if (fileName().isEmpty()) { -+ if (d->fileName.isEmpty()) { - qWarning("QFile::link: Empty or null file name"); - return false; - } -@@ -766,7 +764,7 @@ bool - QFile::copy(const QString &newName) - { - Q_D(QFile); -- if (fileName().isEmpty()) { -+ if (d->fileName.isEmpty()) { - qWarning("QFile::copy: Empty or null file name"); - return false; - } -diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp -index 35699d52df..1b4dcd4ff1 100644 ---- a/src/corelib/io/qtemporaryfile.cpp -+++ b/src/corelib/io/qtemporaryfile.cpp -@@ -1,7 +1,6 @@ - /**************************************************************************** - ** - ** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2017 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -265,53 +264,6 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t - return false; - } - --enum class CreateUnnamedFileStatus { -- Success = 0, -- NotSupported, -- OtherError --}; -- --static CreateUnnamedFileStatus --createUnnamedFile(NativeFileHandle &file, QTemporaryFileName &tfn, quint32 mode, QSystemError *error) --{ --#ifdef LINUX_UNNAMED_TMPFILE -- // first, check if we have /proc, otherwise can't make the file exist later -- // (no error message set, as caller will try regular temporary file) -- if (!qt_haveLinuxProcfs()) -- return CreateUnnamedFileStatus::NotSupported; -- -- const char *p = "."; -- int lastSlash = tfn.path.lastIndexOf('/'); -- if (lastSlash != -1) { -- tfn.path[lastSlash] = '\0'; -- p = tfn.path.data(); -- } -- -- file = QT_OPEN(p, O_TMPFILE | QT_OPEN_RDWR | QT_OPEN_LARGEFILE, -- static_cast<mode_t>(mode)); -- if (file != -1) -- return CreateUnnamedFileStatus::Success; -- -- if (errno == EOPNOTSUPP || errno == EISDIR) { -- // fs or kernel doesn't support O_TMPFILE, so -- // put the slash back so we may try a regular file -- if (lastSlash != -1) -- tfn.path[lastSlash] = '/'; -- return CreateUnnamedFileStatus::NotSupported; -- } -- -- // real error -- *error = QSystemError(errno, QSystemError::NativeError); -- return CreateUnnamedFileStatus::OtherError; --#else -- Q_UNUSED(file); -- Q_UNUSED(tfn); -- Q_UNUSED(mode); -- Q_UNUSED(error); -- return CreateUnnamedFileStatus::NotSupported; --#endif --} -- - //************* QTemporaryFileEngine - QTemporaryFileEngine::~QTemporaryFileEngine() - { -@@ -361,24 +313,19 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode) - NativeFileHandle &file = d->fd; - #endif - -- CreateUnnamedFileStatus st = createUnnamedFile(file, tfn, fileMode, &error); -- if (st == CreateUnnamedFileStatus::Success) { -- unnamedFile = true; -- d->fileEntry.clear(); -- } else if (st == CreateUnnamedFileStatus::NotSupported && -- createFileFromTemplate(file, tfn, fileMode, error)) { -- filePathIsTemplate = false; -- unnamedFile = false; -- d->fileEntry = QFileSystemEntry(tfn.path, QFileSystemEntry::FromNativePath()); -- } else { -+ if (!createFileFromTemplate(file, tfn, fileMode, error)) { - setError(QFile::OpenError, error.toString()); - return false; - } - -+ d->fileEntry = QFileSystemEntry(tfn.path, QFileSystemEntry::FromNativePath()); -+ - #if !defined(Q_OS_WIN) || defined(Q_OS_WINRT) - d->closeFileHandle = true; - #endif - -+ filePathIsTemplate = false; -+ - d->openMode = openMode; - d->lastFlushFailed = false; - d->tried_stat = 0; -@@ -393,9 +340,7 @@ bool QTemporaryFileEngine::remove() - // we must explicitly call QFSFileEngine::close() before we remove it. - d->unmapAll(); - QFSFileEngine::close(); -- if (isUnnamedFile()) -- return true; -- if (!filePathIsTemplate && QFSFileEngine::remove()) { -+ if (QFSFileEngine::remove()) { - d->fileEntry.clear(); - // If a QTemporaryFile is constructed using a template file path, the path - // is generated in QTemporaryFileEngine::open() and then filePathIsTemplate -@@ -410,22 +355,12 @@ bool QTemporaryFileEngine::remove() - - bool QTemporaryFileEngine::rename(const QString &newName) - { -- if (isUnnamedFile()) { -- bool ok = materializeUnnamedFile(newName, DontOverwrite); -- QFSFileEngine::close(); -- return ok; -- } - QFSFileEngine::close(); - return QFSFileEngine::rename(newName); - } - - bool QTemporaryFileEngine::renameOverwrite(const QString &newName) - { -- if (isUnnamedFile()) { -- bool ok = materializeUnnamedFile(newName, Overwrite); -- QFSFileEngine::close(); -- return ok; -- } - QFSFileEngine::close(); - return QFSFileEngine::renameOverwrite(newName); - } -@@ -438,91 +373,6 @@ bool QTemporaryFileEngine::close() - return true; - } - --QString QTemporaryFileEngine::fileName(QAbstractFileEngine::FileName file) const --{ -- if (isUnnamedFile()) { -- if (file == LinkName) { -- // we know our file isn't (won't be) a symlink -- return QString(); -- } -- -- // for all other cases, materialize the file -- const_cast<QTemporaryFileEngine *>(this)->materializeUnnamedFile(templateName, NameIsTemplate); -- } -- return QFSFileEngine::fileName(file); --} -- --bool QTemporaryFileEngine::materializeUnnamedFile(const QString &newName, QTemporaryFileEngine::MaterializationMode mode) --{ -- Q_ASSERT(isUnnamedFile()); -- --#ifdef LINUX_UNNAMED_TMPFILE -- Q_D(QFSFileEngine); -- const QByteArray src = "/proc/self/fd/" + QByteArray::number(d->fd); -- auto materializeAt = [=](const QFileSystemEntry &dst) { -- return ::linkat(AT_FDCWD, src, AT_FDCWD, dst.nativeFilePath(), AT_SYMLINK_FOLLOW) == 0; -- }; --#else -- auto materializeAt = [](const QFileSystemEntry &) { return false; }; --#endif -- -- auto success = [this](const QFileSystemEntry &entry) { -- filePathIsTemplate = false; -- unnamedFile = false; -- d_func()->fileEntry = entry; -- return true; -- }; -- -- auto materializeAsTemplate = [=](const QString &newName) { -- QTemporaryFileName tfn(newName); -- static const int maxAttempts = 16; -- for (int attempt = 0; attempt < maxAttempts; ++attempt) { -- tfn.generateNext(); -- QFileSystemEntry entry(tfn.path, QFileSystemEntry::FromNativePath()); -- if (materializeAt(entry)) -- return success(entry); -- } -- return false; -- }; -- -- if (mode == NameIsTemplate) { -- if (materializeAsTemplate(newName)) -- return true; -- } else { -- // Use linkat to materialize the file -- QFileSystemEntry dst(newName); -- if (materializeAt(dst)) -- return success(dst); -- -- if (errno == EEXIST && mode == Overwrite) { -- // retry by first creating a temporary file in the right dir -- if (!materializeAsTemplate(templateName)) -- return false; -- -- // then rename the materialized file to target (same as renameOverwrite) -- QFSFileEngine::close(); -- return QFSFileEngine::renameOverwrite(newName); -- } -- } -- -- // failed -- setError(QFile::RenameError, QSystemError(errno, QSystemError::NativeError).toString()); -- return false; --} -- --bool QTemporaryFileEngine::isUnnamedFile() const --{ --#ifdef LINUX_UNNAMED_TMPFILE -- if (unnamedFile) { -- Q_ASSERT(d_func()->fileEntry.isEmpty()); -- Q_ASSERT(filePathIsTemplate); -- } -- return unnamedFile; --#else -- return false; --#endif --} -- - //************* QTemporaryFilePrivate - - QTemporaryFilePrivate::QTemporaryFilePrivate() -@@ -559,17 +409,6 @@ void QTemporaryFilePrivate::resetFileEngine() const - tef->initialize(fileName, 0600, false); - } - --void QTemporaryFilePrivate::materializeUnnamedFile() --{ --#ifdef LINUX_UNNAMED_TMPFILE -- if (!fileName.isEmpty() || !fileEngine) -- return; -- -- auto *tef = static_cast<QTemporaryFileEngine *>(fileEngine); -- fileName = tef->fileName(QAbstractFileEngine::DefaultName); --#endif --} -- - QString QTemporaryFilePrivate::defaultTemplateName() - { - QString baseName; -@@ -789,10 +628,6 @@ void QTemporaryFile::setAutoRemove(bool b) - QString QTemporaryFile::fileName() const - { - Q_D(const QTemporaryFile); -- auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine); -- if (tef && tef->isReallyOpen()) -- const_cast<QTemporaryFilePrivate *>(d)->materializeUnnamedFile(); -- - if(d->fileName.isEmpty()) - return QString(); - return d->engine()->fileName(QAbstractFileEngine::DefaultName); -@@ -946,10 +781,11 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file) - bool QTemporaryFile::open(OpenMode flags) - { - Q_D(QTemporaryFile); -- auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine); -- if (tef && tef->isReallyOpen()) { -- setOpenMode(flags); -- return true; -+ if (!d->fileName.isEmpty()) { -+ if (static_cast<QTemporaryFileEngine*>(d->engine())->isReallyOpen()) { -+ setOpenMode(flags); -+ return true; -+ } - } - - // reset the engine state so it creates a new, unique file name from the template; -@@ -960,11 +796,7 @@ bool QTemporaryFile::open(OpenMode flags) - d->resetFileEngine(); - - if (QFile::open(flags)) { -- tef = static_cast<QTemporaryFileEngine *>(d->fileEngine); -- if (tef->isUnnamedFile()) -- d->fileName.clear(); -- else -- d->fileName = tef->fileName(QAbstractFileEngine::DefaultName); -+ d->fileName = d->fileEngine->fileName(QAbstractFileEngine::DefaultName); - return true; - } - return false; -diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h -index 6f98ceed90..4aa8ca876f 100644 ---- a/src/corelib/io/qtemporaryfile_p.h -+++ b/src/corelib/io/qtemporaryfile_p.h -@@ -58,17 +58,6 @@ - #include "private/qfile_p.h" - #include "qtemporaryfile.h" - --#ifdef Q_OS_LINUX --# include <fcntl.h> --# ifdef O_TMPFILE --// some early libc support had the wrong values for O_TMPFILE --// (see https://bugzilla.gnome.org/show_bug.cgi?id=769453#c18) --# if (O_TMPFILE & O_DIRECTORY) == O_DIRECTORY --# define LINUX_UNNAMED_TMPFILE --# endif --# endif --#endif -- - QT_BEGIN_NAMESPACE - - struct QTemporaryFileName -@@ -94,7 +83,6 @@ public: - - QAbstractFileEngine *engine() const override; - void resetFileEngine() const; -- void materializeUnnamedFile(); - - bool autoRemove = true; - QString templateName = defaultTemplateName(); -@@ -136,17 +124,11 @@ public: - bool rename(const QString &newName) override; - bool renameOverwrite(const QString &newName) override; - bool close() override; -- QString fileName(FileName file) const override; -- -- enum MaterializationMode { Overwrite, DontOverwrite, NameIsTemplate }; -- bool materializeUnnamedFile(const QString &newName, MaterializationMode mode); -- bool isUnnamedFile() const override final; - - const QString &templateName; - quint32 fileMode; - bool filePathIsTemplate; - bool filePathWasTemplate; -- bool unnamedFile = false; - }; - - #endif // QT_NO_TEMPORARYFILE -diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp -index dbc3d68e93..186bf5155d 100644 ---- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp -+++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp -@@ -1,7 +1,6 @@ - /**************************************************************************** - ** - ** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2017 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the test suite of the Qt Toolkit. -@@ -33,7 +32,6 @@ - #include <qtemporarydir.h> - #include <qtemporaryfile.h> - #include <qfile.h> --#include <qdatetime.h> - #include <qdir.h> - #include <qset.h> - #include <qtextcodec.h> -@@ -67,7 +65,7 @@ private slots: - void fileNameIsEmpty(); - void autoRemove(); - void nonWritableCurrentDir(); -- void io(); -+ void write(); - void openCloseOpenClose(); - void removeAndReOpen(); - void removeUnnamed(); -@@ -281,18 +279,6 @@ void tst_QTemporaryFile::autoRemove() - fileName = file.fileName(); - file.close(); - } -- QVERIFY(!fileName.isEmpty()); -- QVERIFY(!QFile::exists(fileName)); -- -- // same, but gets the file name after closing -- { -- QTemporaryFile file("tempXXXXXX"); -- file.setAutoRemove(true); -- QVERIFY(file.open()); -- file.close(); -- fileName = file.fileName(); -- } -- QVERIFY(!fileName.isEmpty()); - QVERIFY(!QFile::exists(fileName)); - - // Test if disabling auto remove works. -@@ -303,19 +289,6 @@ void tst_QTemporaryFile::autoRemove() - fileName = file.fileName(); - file.close(); - } -- QVERIFY(!fileName.isEmpty()); -- QVERIFY(QFile::exists(fileName)); -- QVERIFY(QFile::remove(fileName)); -- -- // same, but gets the file name after closing -- { -- QTemporaryFile file("tempXXXXXX"); -- file.setAutoRemove(false); -- QVERIFY(file.open()); -- file.close(); -- fileName = file.fileName(); -- } -- QVERIFY(!fileName.isEmpty()); - QVERIFY(QFile::exists(fileName)); - QVERIFY(QFile::remove(fileName)); - -@@ -366,51 +339,17 @@ void tst_QTemporaryFile::nonWritableCurrentDir() - #endif - } - --void tst_QTemporaryFile::io() -+void tst_QTemporaryFile::write() - { - QByteArray data("OLE\nOLE\nOLE"); - QTemporaryFile file; -- QDateTime before = QDateTime::currentDateTimeUtc().addMSecs(-250); -- -- // discard msec component (round down) - not all FSs and OSs support them -- before.setSecsSinceEpoch(before.toSecsSinceEpoch()); -- - QVERIFY(file.open()); -- QVERIFY(file.readLink().isEmpty()); // it's not a link! -- QFile::Permissions perm = file.permissions(); -- QVERIFY(perm & QFile::ReadOwner); -- QVERIFY(file.setPermissions(perm)); -- -- QCOMPARE(int(file.size()), 0); -- QVERIFY(file.resize(data.size())); -- QCOMPARE(int(file.size()), data.size()); - QCOMPARE((int)file.write(data), data.size()); -- QCOMPARE(int(file.size()), data.size()); -- -- QDateTime mtime = file.fileTime(QFile::FileModificationTime).toUTC(); -- QDateTime btime = file.fileTime(QFile::FileBirthTime).toUTC(); -- QDateTime ctime = file.fileTime(QFile::FileMetadataChangeTime).toUTC(); -- QDateTime atime = file.fileTime(QFile::FileAccessTime).toUTC(); -- -- QDateTime after = QDateTime::currentDateTimeUtc().toUTC().addMSecs(250); -- // round msecs up -- after.setSecsSinceEpoch(after.toSecsSinceEpoch() + 1); -- -- // mtime must be valid, the rest could fail -- QVERIFY(mtime <= after && mtime >= before); -- QVERIFY(!btime.isValid() || (btime <= after && btime >= before)); -- QVERIFY(!ctime.isValid() || (ctime <= after && ctime >= before)); -- QVERIFY(!btime.isValid() || (btime <= after && btime >= before)); -- -- QVERIFY(file.setFileTime(before.addSecs(-10), QFile::FileModificationTime)); -- mtime = file.fileTime(QFile::FileModificationTime).toUTC(); -- QCOMPARE(mtime, before.addSecs(-10)); -- - file.reset(); - QFile compare(file.fileName()); - compare.open(QIODevice::ReadOnly); - QCOMPARE(compare.readAll() , data); -- QCOMPARE(compare.fileTime(QFile::FileModificationTime), mtime); -+ file.close(); - } - - void tst_QTemporaryFile::openCloseOpenClose() -@@ -476,19 +415,17 @@ void tst_QTemporaryFile::size() - { - QTemporaryFile file; - QVERIFY(file.open()); -+ QVERIFY(file.exists()); - QVERIFY(!file.isSequential()); - QByteArray str("foobar"); - file.write(str); -- -+ QVERIFY(QFile::exists(file.fileName())); - // On CE it takes more time for the filesystem to update - // the information. Usually you have to close it or seek - // to get latest information. flush() does not help either. - QCOMPARE(file.size(), qint64(6)); - file.seek(0); - QCOMPARE(file.size(), qint64(6)); -- -- QVERIFY(QFile::exists(file.fileName())); -- QVERIFY(file.exists()); - } - - void tst_QTemporaryFile::resize() -@@ -885,14 +822,6 @@ void tst_QTemporaryFile::QTBUG_4796() - QCOMPARE(file5.open(), openResult); - QCOMPARE(file6.open(), openResult); - -- // force the files to exist, if they are supposed to -- QCOMPARE(!file1.fileName().isEmpty(), openResult); -- QCOMPARE(!file2.fileName().isEmpty(), openResult); -- QCOMPARE(!file3.fileName().isEmpty(), openResult); -- QCOMPARE(!file4.fileName().isEmpty(), openResult); -- QCOMPARE(!file5.fileName().isEmpty(), openResult); -- QCOMPARE(!file6.fileName().isEmpty(), openResult); -- - QCOMPARE(file1.exists(), openResult); - QCOMPARE(file2.exists(), openResult); - QCOMPARE(file3.exists(), openResult); -diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp -index 856033fb63..7ba09a4e7f 100644 ---- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp -+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp -@@ -282,7 +282,6 @@ void tst_QNetworkDiskCache::clear() - // don't delete files that it didn't create - QTemporaryFile file(cacheDirectory + "/XXXXXX"); - if (file.open()) { -- file.fileName(); // make sure it exists with a name - QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 3); - cache.clear(); - QCOMPARE(countFiles(cacheDirectory).count(), NUM_SUBDIRECTORIES + 3); --- -2.16.1 - diff --git a/packages/x11-libs/qtbase/files/qtnetwork-5.10-libressl.patch b/packages/x11-libs/qtbase/files/qtnetwork-5.10-libressl.patch deleted file mode 100644 index 3a1f80a..0000000 --- a/packages/x11-libs/qtbase/files/qtnetwork-5.10-libressl.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:40.963385070 -0500 -+++ b/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:51.755255545 -0500 -@@ -39,7 +39,7 @@ - - #include <openssl/opensslv.h> - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - # error "OpenSSL >= 1.1 is required" - #endif - ---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-11-06 00:02:18.919611226 -0500 -+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-11-06 00:09:46.879756111 -0500 -@@ -232,7 +232,7 @@ - int q_BIO_read(BIO *a, void *b, int c); - Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if QT_CONFIG(opensslv11) - int q_BN_is_word(BIGNUM *a, BN_ULONG w); - #else - // BN_is_word is implemented purely as a -@@ -245,7 +245,7 @@ - // - // Users are required to include <openssl/bn.h>. - #define q_BN_is_word BN_is_word --#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L -+#endif // QT_CONFIG - BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); - #ifndef OPENSSL_NO_EC - const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-11-06 00:04:58.843877923 -0500 -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-11-06 00:06:12.985074360 -0500 -@@ -1017,7 +1017,7 @@ - RESOLVEFUNC(EC_GROUP_get_degree) - #endif - RESOLVEFUNC(BN_num_bits) --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if QT_CONFIG(opensslv11) - RESOLVEFUNC(BN_is_word) - #endif - RESOLVEFUNC(BN_mod_word) diff --git a/packages/x11-libs/qtbase/qtbase-scm.exheres-0 b/packages/x11-libs/qtbase/qtbase-scm.exheres-0 deleted file mode 100644 index eae25e7..0000000 --- a/packages/x11-libs/qtbase/qtbase-scm.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2014 Jorge Aparicio -# Distributed under the terms of the GNU General Public License v2 - -require qtbase - -PLATFORMS="~amd64 ~armv8" - -DEFAULT_SRC_PREPARE_PATCHES+=( - "${FILES}"/qtnetwork-5.10-libressl.patch - "${FILES}"/${PN}-Revert-QTemporaryFile-Add-support-for-Linux-s-O_TMPF.patch -) - diff --git a/packages/x11-libs/qtbase/qtbase.exlib b/packages/x11-libs/qtbase/qtbase.exlib deleted file mode 100644 index 780c579..0000000 --- a/packages/x11-libs/qtbase/qtbase.exlib +++ /dev/null @@ -1,406 +0,0 @@ -# Copyright 2008-2010 Bo Ørsted Andresen <zlin@exherbo.org> -# Copyright 2008-2009, 2010 Ingmar Vanhassel -# Copyright 2013-2018 Heiko Becker <heirecka@exherbo.org> -# Distributed under the terms of the GNU General Public License v2 -# Based in part upon 'qt-4.3.4-r1.ebuild' from Gentoo, which is: -# Copyright 1999-2008 Gentoo Foundation - -require qt -require option-renames [ renames=[ 'systemd journald' ] ] - -export_exlib_phases src_prepare src_configure src_compile src_install - -SUMMARY="Qt Cross-platform application framework for desktop and embedded development" -DESCRIPTION="Contains the following modules: -- QtCore: non-graphical classes used by other modules -- QtConcurrent: Classes for writing multi-threaded programs w/o using low-level threading primitives -- QtDBus: Classes for inter-process communication over the D-Bus protocol -- QtGui: Base classes for graphical user interface (GUI) components -- QtNetwork: Classes to make network programming easier and more portable -- QtOpenGL: OpenGL support classes -- QtPrintSupport: Classes to make printing easier and more portable -- QtSql: Classes for database integration using SQL -- QtTest: Classes for unit testing Qt applications and libraries -- QtWidgets: Classes to extend Qt GUI with C++ widgets (belonged to QtGui in 4.x) -- QtXml: C++ implementations of SAX and DOM" - -MYOPTIONS_PARTS="doc examples" -SQL_BACKENDS="mysql postgresql sqlite" # firebird odbc -MYOPTIONS="cups debug glib gui journald kms opengles sql - ${MYOPTIONS_PARTS} - ( ${SQL_BACKENDS} ) [[ requires = sql ]] - sql? ( - ( ${SQL_BACKENDS} ) [[ number-selected = at-least-one ]] - ) - cups [[ requires = gui ]] - examples [[ requires = gui ]] - glib [[ description = [ Add support for the glib eventloop ] ]] - gtk [[ description = [ Enable GTK+ style support, this will install a Qt4 style that renders using GTK+, to blend in with a GTK+ desktop ] - requires = [ glib gui ] ]] - gui [[ description = [ Build GUI related modules ] - presumed = true ]] - journald [[ description = [ Support sending logging output directly to systemd-journald ] ]] - kms [[ description = [ KMS platform plugin to run a single-window per screen without X11 ] - requires = opengles ]] - libinput [[ description = [ Support input devices via libinput ] - requires = gui ]] - libproxy [[ description = [ Use libproxy for system proxy settings ] ]] - opengles [[ description = [ Use OpenGL ES2 rather than standard desktop OpenGL ] - requires = gui ]] - sql [[ description = [ Build the QtSQL module ] ]] - - ( platform: amd64 x86 ) - ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]] - ( providers: libressl openssl ) [[ number-selected = exactly-one ]] -" - -if ever at_least 5.10.0-beta4 ; then - MYOPTIONS+=" - vulkan [[ description = [ Support for rendering via the Vulkan graphics API ] - requires = gui ]] - " -fi - -MYOPTIONS+=" - amd64_cpu_features: sse3 ssse3 sse4.1 sse4.2 avx avx2 avx512 f16c - arm_cpu_features: neon - x86_cpu_features: sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 avx512 f16c -" - -DEPENDENCIES=" - build: - virtual/pkg-config - doc? ( - x11-libs/qttools:${SLOT}[>=5.8.0-rc] [[ - note = [ qtattributionsscanner (5.8.0-rc), qhelpgenerator ] - ]] - ) - build+run: - app-admin/eclectic[>=2.0.18] [[ note = [ Split ld-*.path, @TARGET@ substitution ] ]] - dev-libs/double-conversion - dev-libs/icu:= - dev-libs/pcre2[>=10.20] - sys-apps/dbus[>=1.2.0] [[ note = [ besides QtDBUs also needed for accessibility and xcb ] ]] - sys-libs/zlib[>=1.0.8] - cups? ( net-print/cups[>=1.4] ) - glib? ( dev-libs/glib:2 ) - gtk? ( - dev-libs/atk - x11-libs/gtk+:3[>=3.6] - x11-libs/pango - ) - gui? ( - dev-libs/at-spi2-core - media-libs/fontconfig - media-libs/freetype:2[>=2.2] - media-libs/libpng:= - x11-dri/mesa - x11-libs/harfbuzz[>=0.9.42] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libxcb[>=1.10] - x11-libs/libxkbcommon[>=0.4.1][X] - x11-libs/mtdev - x11-utils/xcb-util-image - x11-utils/xcb-util-keysyms - x11-utils/xcb-util-renderutil - x11-utils/xcb-util-wm - providers:ijg-jpeg? ( media-libs/jpeg:= ) - providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) - ) - journald? ( sys-apps/systemd ) [[ note = [ wanted for journald logging ] ]] - kms? ( x11-dri/libdrm ) - libinput? ( sys-libs/libinput ) - libproxy? ( net-libs/libproxy ) - mysql? ( virtual/mysql ) - postgresql? ( dev-db/postgresql ) - providers:libressl? ( dev-libs/libressl:= ) - providers:openssl? ( dev-libs/openssl ) - sqlite? ( dev-db/sqlite:3 ) -" - -if ever at_least 5.10.0-beta4 ; then - DEPENDENCIES+=" - build+run: - gui? ( x11-libs/libXrender[>=0.6] ) - vulkan? ( sys-libs/vulkan ) - " -fi - -# Packages that need QtSQL should depend on x11-libs/qtbase:5[sql] -# option='sql' needs at least one SQL plugin, any-of mysql, postgresql, sqlite, (firebird, odbc) - -# Tests need a running X server and network access (last checked: 5.1.1) -RESTRICT="test" - -qconf5() { - local myconf=() host=$(exhost --target) - - # paths - myconf+=( - -platform $(qt_mkspecs_dir) - -prefix /usr/${host} - -bindir /usr/${host}/lib/qt5/bin - -docdir /usr/share/doc/qt-${PVR} - -headerdir /usr/${host}/include/qt5 - -libdir /usr/${host}/lib - -archdatadir /usr/${host}/lib/qt5 - -plugindir /usr/${host}/lib/qt5/plugins - -libexecdir /usr/${host}/lib/qt5/libexec - -datadir /usr/share/qt5 - -qmldir /usr/${host}/lib/qt5/qml - -translationdir /usr/share/qt5/translations - -sysconfdir /etc/qt5 - -examplesdir /usr/share/qt5/examples - -importdir /usr/${host}/lib/qt5/imports - -testsdir /usr/share/qt5/tests - ) - - edo "${ECONF_SOURCE:-.}"/configure "${myconf[@]}" "$@" -} - -qtbase_src_prepare() { - default - - # Don't prestrip. - edo sed -e "/^CONFIG +=/s:$: nostrip:" -i qmake/qmake.pro - - # With -gcc and -g++ Qt fails to recognize gcc's version, which leads to - # build failures with qtwebengine. It's safe to use -gcc and -g++ instead - # of -cc -and -cxx here, because we only modifiy gcc mkspecs files. - edo sed -e "s:gcc:$(exhost --target)-gcc:" \ - -e "s:g++:$(exhost --target)-g++:" \ - -i "${WORK}"/mkspecs/common/g++-base.conf - - edo sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ - -i "${WORK}"/mkspecs/common/gcc-base.conf - - edo sed -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - -i "${WORK}"/mkspecs/common/g++-unix.conf - - # Workaround to allow other projects to find Qt's private headers via CMake - # https://bugreports.qt-project.org/browse/QTBUG-37417 - edo sed -e "/CMAKE_NO_PRIVATE_INCLUDES = true/d" \ - -i mkspecs/features/create_cmake.prf - - # Fix the names of some unprefixed executables - edo sed -e "s:\(PKG_CONFIG.*=.\)\(pkg-config\):\1${PKG_CONFIG}:" \ - -i mkspecs/features/qt_functions.prf - - edo sed -e "s:^\(QMAKE_AR.*=.\)\(ar.*\):\1$(exhost --tool-prefix)\2:" \ - -i mkspecs/common/linux.conf - - # Fix a non-fatal "sh: readelf: command not found" during src_compile - edo sed -e "s:\(readelf\).*-l.*/bin/ls:$(exhost --tool-prefix)\1 -l /usr/$(exhost --target)/bin/ls:" \ - -i src/corelib/global/global.pri - - # Work around https://bugreports.qt.io/browse/QTBUG-47240 which prevents - # knewstuff to build successfully if attica:0 and attica:5 are installed - # at the same time. - edo sed -e "/\!isEmpty(QMAKE_INCDIR_OPENGL)/d" \ - -i src/gui/gui.pro -} - -qtbase_src_configure() { - local myconf=( - -confirm-license - -opensource - -release - -verbose - - -accessibility - -dbus-linked - $(option debug && echo "-debug") - -icu - -no-ccache - -no-eglfs # EGL Full Screen/Single Surface, probably only useful on embedded devices - -no-directfb - -no-imf - -no-lgmon # Both are only useful on QNX - -no-linuxfb - -no-mirclient # No need for stuff which is only used by Canonical - -no-optimize-size - -no-rpath - -no-separate-debug-info - -no-tslib # Touchscreen access library - unwritten - -no-use-gold-linker # let eclectic ld choose this - -openssl-linked - -pch - -pkg-config - $(if [[ $(exhost --target) =~ (i686-*|x86_64-*) ]] ; then - echo '-reduce-relocations' - fi) - -syslog - -system-doubleconversion - -system-pcre - -system-proxies - -system-xcb - -system-xkbcommon-x11 - -system-zlib - $(qt_enable cups) - $(qt_enable glib) - $(qt_enable gtk) - $(qt_enable gui) - $(option gui && echo '-system-freetype') - $(option gui && echo '-system-harfbuzz' || echo -no-harfbuzz) - $(option gui && echo '-system-libjpeg') - $(option gui && echo '-system-libpng') - $(qt_enable journald) - $(qt_enable kms) - $(qt_enable libinput) - $(qt_enable libproxy) - $(qt_enable vulkan) - ) - - # Avoid auto detection of CPU features: - # sse2, sse3, ssse3, sse4.1, sse4.2, avx, avx2, avx512 neon - # Always enable sse2 on amd64 - # FIXME: needs to be handled on cross (heirecka) - if option !platform:amd64 && option !x86_cpu_features:sse2 ; then - myconf+=( -no-sse2 ) - fi - for feature in sse3 ssse3 sse4.1 sse4.2 avx avx2 avx512 ; do - if option !amd64_cpu_features:${feature} && option !x86_cpu_features:${feature} ; then - myconf+=( -no-${feature} ) - fi - done - - # X - local o X_options="fontconfig sm xkb" - for o in ${X_options}; do - myconf+=( $(qt_enable gui ${o}) ) - done - - # Other GUI options - local g GUI_options="egl evdev gbm mtdev widgets xcb xcb-xlib xinput2 xkbcommon-evdev" - for g in ${GUI_options}; do - myconf+=( $(qt_enable gui ${g}) ) - done - - if option gui ; then - myconf+=( $(option opengles && echo -opengl es2 || echo -opengl desktop) ) - else - myconf+=( -no-opengl ) - fi - - myconf+=( - -no-sql-db2 # IBM DB2 (version 7.1 and above) - -no-sql-ibase # Borland InterBase - -no-sql-oci # Open Database Connectivity (ODBC) (e.g. MS SQL Server) - -no-sql-odbc # Oracle Call Interface Driver - -no-sql-sqlite2 # SQLite version 2 - -no-sql-tds # Sybase Adaptive Server - $(qt_enable mysql sql-mysql plugin "") - $(option mysql && echo "-I/usr/$(exhost --target)/include/mysql -L/usr/$(exhost --target)/lib/mysql/") - $(qt_enable postgresql sql-psql plugin "") - $(option postgresql && echo "-I/usr/$(exhost --target)/include/postgresql/server/") - $(qt_enable sqlite sql-sqlite plugin "" -system-sqlite) - ) - - # optional parts - myconf+=( - -make libs - -make tools - $(qt_build examples) - $(expecting_tests && echo "-make tests" || echo "-nomake tests") - ) - - # Set {C,CXX,LD}FLAGS. - # Do not link with -rpath (Gentoo bug #75181). - edo sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - -e "/CONFIG/s:$: nostrip:" \ - -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \ - -e "s:X11R6/::" \ - -i "${WORK}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf - - # use gcc for linking - unset LD - - qconf5 "${myconf[@]}" - - edo sed -e "s:^CXXFLAGS.*=:CXXFLAGS = ${CXXFLAGS} $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS):" \ - -e "s:^LFLAGS.*=:LFLAGS = ${LDFLAGS} $(EXTRA_LFLAGS) $(CONFIG_LFLAGS):" \ - -i "${WORK}"/qmake/Makefile -} - -qtbase_src_compile() { - default - - if option doc; then - # qt expects qhelpgenerator from qttools in workdir/bin, so symlink it to there - edo ln -s /usr/$(exhost --target)/lib/qt5/bin/qhelpgenerator \ - "${WORK}"/bin/qhelpgenerator - # html_docs target builds html docs, qch_docs QCH files (assistant), docs both - option doc && emake docs - fi -} - -qtbase_src_install() { - default - local host=$(exhost --target) -# PATH="${IMAGE}/usr/${host}/lib/qt5:${PATH}" QTDIR="${IMAGE}/usr/${host}" emake INSTALL_ROOT="${IMAGE}" install - - - # remove build dir from libraries - edo sed -i -e "s:${WORK}/lib:/usr/${host}/lib/qt5:g" "${IMAGE}"/usr/${host}/lib/{*.la,*.prl,pkgconfig/*.pc} - - hereenvd 44qt5 <<EOF -LDPATH=/usr/@TARGET@/lib/qt5 -QT_PLUGIN_PATH=/usr/host/lib/qt5/plugins -EOF - - if option examples ; then - # The examples might add some empty dirs. Since the examples are additional documentation, - # there shouldn't be any empty dirs we might want to keep, so we remove them all in - # one go. - edo find "${IMAGE}"/usr/share/qt5/examples -type d -empty -delete - fi - - # install documentation - if option doc ; then - local modules - modules=( qtcore qtconcurrent qtdbus qtnetwork qttestlib qtxml ) - option gui && modules+=( qtgui qtopengl qtprintsupport qtwidgets ) - option sql && modules+=( qtsql ) - - # QCH-Files e.g. for Qt Assistant... - for i in ${modules[@]} ; do - dodoc "${WORK}"/doc/${i}.qch - done - - # ... and HTML documentation - docinto html - edo pushd "${WORK}"/doc - for i in ${modules[@]} ; do - dodoc -r ${i} - done - edo popd - fi - - # remove references to build dir - edo sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" "${IMAGE}"/usr/${host}/lib/libQt5*.prl - - # install symlinks for some binaries to /usr/bin - local binaries - edo mkdir "${IMAGE}"/usr/${host}/bin - binaries=( moc qmake rcc $(option gui && echo "uic") ) - - for i in ${binaries[@]} ; do - [[ -e "${IMAGE}"/usr/${host}/lib/qt5/bin/${i} ]] || die "/usr/${host}/lib/qt5/bin/${i} does not exist in ${IMAGE}" - dosym /usr/${host}/lib/qt5/bin/${i} /usr/${host}/bin/${i}-qt5 - done - - # disable debug output from applications by default - insinto /etc/xdg/QtProject - hereins qtlogging.ini <<EOF -[Rules] -*.debug=false -EOF -} - diff --git a/packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch b/packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch deleted file mode 100644 index 22b5629..0000000 --- a/packages/x11-themes/qtcurve/files/qtcurve-1.8.18-remove-qt_filedialog_-api.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream: yes - -From 323402d8b99502300f65e909c61153cbd5d5d997 Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Mon, 19 May 2014 10:37:37 +0200 -Subject: [PATCH] remove qt_filedialog_* api - -it has been removed and doesn't build anymore with recent Qt5 stable -branch ---- - qt5/style/qtcurve_api.cpp | 26 -------------------------- - 1 file changed, 26 deletions(-) - -diff --git a/qt5/style/qtcurve_api.cpp b/qt5/style/qtcurve_api.cpp -index a5ded22..2c794b7 100644 ---- a/qt5/style/qtcurve_api.cpp -+++ b/qt5/style/qtcurve_api.cpp -@@ -67,25 +67,6 @@ - - #include <QDebug> - --extern QString (*qt_filedialog_existing_directory_hook)( -- QWidget *parent, const QString &caption, const QString &dir, -- QFileDialog::Options options); -- --extern QString (*qt_filedialog_open_filename_hook)( -- QWidget *parent, const QString &caption, const QString &dir, -- const QString &filter, QString *selectedFilter, -- QFileDialog::Options options); -- --extern QStringList (*qt_filedialog_open_filenames_hook)( -- QWidget * parent, const QString &caption, const QString &dir, -- const QString &filter, QString *selectedFilter, -- QFileDialog::Options options); -- --extern QString (*qt_filedialog_save_filename_hook)( -- QWidget *parent, const QString &caption, const QString &dir, -- const QString &filter, QString *selectedFilter, -- QFileDialog::Options options); -- - namespace QtCurve { - - void -@@ -163,13 +144,6 @@ Style::polish(QApplication *app) - opts.menuBgndAppearance = APPEARANCE_FLAT; - } - -- if (opts.useQtFileDialogApps.contains(appName)) { -- qt_filedialog_existing_directory_hook = 0L; -- qt_filedialog_open_filename_hook = 0L; -- qt_filedialog_open_filenames_hook = 0L; -- qt_filedialog_save_filename_hook = 0L; -- } -- - QCommonStyle::polish(app); - if (opts.hideShortcutUnderline) { - app->installEventFilter(m_shortcutHandler); --- -2.4.5 - diff --git a/packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 b/packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 deleted file mode 100644 index 3442894..0000000 --- a/packages/x11-themes/qtcurve/qtcurve-scm.exheres-0 +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2014 David Heidelberger <david.heidelberger@ixit.cz> -# Distributed under the terms of the GNU General Public License v2 - -SCM_REPOSITORY="git://anongit.kde.org/qtcurve" -DOWNLOADS="" -PLATFORMS="~amd64" -require scm-git - -require cmake [ api=2 ] - -SUMMARY="QtCurve - Qt5/Qt4/GTK+2 widget styles" -DESCRIPTION="This is a set of widget styles for Qt5/Qt4 and Gtk2 based apps." - -LICENCES="LGPL-2.1" -SLOT="0" -MYOPTIONS=" - gtk2 [[ requires = X ]] - qt4 [[ requires = X ]] - qt5 - X -" - -DEPENDENCIES=" - build: - sys-devel/gettext - gtk2? ( - virtual/pkg-config - ) - X? ( - virtual/pkg-config - x11-proto/xcb-proto - ) - build+run: - x11-libs/libxcb - kde-frameworks/frameworkintegration - kde-frameworks/kdelibs4support - gtk2? ( - x11-libs/gtk+:2 - ) - qt4? ( - x11-libs/qt:4 - ) - qt5? ( - x11-libs/qtbase:5 - x11-libs/qtsvg:5 - x11-libs/qtx11extras:5 - ) - X? ( - x11-libs/libX11 - ) -" -CMAKE_SRC_CONFIGURE_PARAMS+=( - -DQTC_LOCALE_DIR:PATH=/usr/share/locale - # We don't ship kde-workspace:4 anymore - -DQTC_QT4_ENABLE_KDE:BOOL=FALSE - # Disabled by default upstream - -DQTC_QT5_ENABLE_QTQUICK2:BOOL=FALSE -) -CMAKE_SRC_CONFIGURE_OPTIONS+=( - 'X QTC_ENABLE_X11' -) -CMAKE_SRC_CONFIGURE_OPTION_ENABLES+=( - GTK2 - QT4 - QT5 -) -CMAKE_SRC_CONFIGURE_TESTS+=( '-DENABLE_TEST:BOOL=TRUE -DENABLE_TEST:BOOL=FALSE' ) - - - |