diff --git a/astro/Makefile b/astro/Makefile index 311f9e61c1f..d328fa874c5 100644 --- a/astro/Makefile +++ b/astro/Makefile @@ -48,6 +48,7 @@ SUBDIR += nightfall SUBDIR += opencpn SUBDIR += openuniverse + SUBDIR += oskar SUBDIR += osmosis SUBDIR += p5-Astro SUBDIR += p5-Astro-ADS diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile index fb0bbd34344..d6ecf5e7d1d 100644 --- a/astro/cfitsio/Makefile +++ b/astro/cfitsio/Makefile @@ -3,6 +3,7 @@ PORTNAME= cfitsio PORTVERSION= 3.430 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \ https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \ @@ -14,7 +15,8 @@ DISTNAME= ${PORTNAME}${PORTVERSION:R}${PORTVERSION:E} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for reading and writing files in FITS data format -LIB_DEPENDS= libf2c.so:lang/f2c +LIB_DEPENDS= libcurl.so:ftp/curl \ + libf2c.so:lang/f2c OPTIONS_DEFINE= DOCS diff --git a/astro/oskar/Makefile b/astro/oskar/Makefile new file mode 100644 index 00000000000..a111a43cf52 --- /dev/null +++ b/astro/oskar/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= OSKAR +DISTVERSION= 2.7.0 +CATEGORIES= astro + +MAINTAINER= yuri@FreeBSD.org +COMMENT= SKA Radio telescope simulator + +LICENSE= GPLv2 +xLICENSE_FILES= ${WRKSRC}/../COPYING + +LIB_DEPENDS= libcfitsio.so:astro/cfitsio + +USES= cmake:outsource localbase:ldflags python qt:5 shebangfix +SHEBANG_FILES= apps/oskar_convert_cst_to_scalar.py +USE_GITHUB= yes +GH_ACCOUNT= OxfordSKA +USE_QT= core gui network widgets buildtools_build qmake_build +USE_LDCONFIG= yes + +CMAKE_ARGS= -DFREEBSD_FILESDIR:STRING=${FILESDIR} + +.include diff --git a/astro/oskar/distinfo b/astro/oskar/distinfo new file mode 100644 index 00000000000..b8ccf57aa84 --- /dev/null +++ b/astro/oskar/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1532320268 +SHA256 (OxfordSKA-OSKAR-2.7.0_GH0.tar.gz) = 91bf49437bbfaae2e7e846799a32db990de0b569fbe185446ac0e9a2b54c84c7 +SIZE (OxfordSKA-OSKAR-2.7.0_GH0.tar.gz) = 4523221 diff --git a/astro/oskar/files/fcvt.h b/astro/oskar/files/fcvt.h new file mode 100644 index 00000000000..d7a1e8a58ef --- /dev/null +++ b/astro/oskar/files/fcvt.h @@ -0,0 +1,125 @@ +// +// fcvt.c +// +// Floating point to string conversion routines +// +// Copyright (C) 2002 Michael Ringgaard. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// 3. Neither the name of the project nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. +// + +#include +#define CVTBUFSIZE 64 + +// +// cvt.c - IEEE floating point formatting routines for FreeBSD +// from GNU libc-4.6.27 +// + +static char *cvt(double arg, int ndigits, int *decpt, int *sign, char *buf, int eflag) { + int r2; + double fi, fj; + char *p, *p1; + + if (ndigits < 0) ndigits = 0; + if (ndigits >= CVTBUFSIZE - 1) ndigits = CVTBUFSIZE - 2; + r2 = 0; + *sign = 0; + p = &buf[0]; + if (arg < 0) { + *sign = 1; + arg = -arg; + } + arg = modf(arg, &fi); + p1 = &buf[CVTBUFSIZE]; + + if (fi != 0) { + p1 = &buf[CVTBUFSIZE]; + while (fi != 0) { + fj = modf(fi / 10, &fi); + *--p1 = (int)((fj + .03) * 10) + '0'; + r2++; + } + while (p1 < &buf[CVTBUFSIZE]) *p++ = *p1++; + } else if (arg > 0) { + while ((fj = arg * 10) < 1) { + arg = fj; + r2--; + } + } + p1 = &buf[ndigits]; + if (eflag == 0) p1 += r2; + *decpt = r2; + if (p1 < &buf[0]) { + buf[0] = '\0'; + return buf; + } + while (p <= p1 && p < &buf[CVTBUFSIZE]) { + arg *= 10; + arg = modf(arg, &fj); + *p++ = (int) fj + '0'; + } + if (p1 >= &buf[CVTBUFSIZE]) { + buf[CVTBUFSIZE - 1] = '\0'; + return buf; + } + p = p1; + *p1 += 5; + while (*p1 > '9') { + *p1 = '0'; + if (p1 > buf) { + ++*--p1; + } else { + *p1 = '1'; + (*decpt)++; + if (eflag == 0) { + if (p > buf) *p = '0'; + p++; + } + } + } + *p = '\0'; + return buf; +} + +inline char *ecvt(double arg, int ndigits, int *decpt, int *sign) { + char cvtbuf[CVTBUFSIZE]; + return cvt(arg, ndigits, decpt, sign, cvtbuf, 1); +} + +inline char *ecvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf) { + return cvt(arg, ndigits, decpt, sign, buf, 1); +} + +inline char *fcvt(double arg, int ndigits, int *decpt, int *sign) { + char cvtbuf[CVTBUFSIZE]; + return cvt(arg, ndigits, decpt, sign, cvtbuf, 0); +} + +inline char *fcvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf) { + return cvt(arg, ndigits, decpt, sign, buf, 0); +} + diff --git a/astro/oskar/files/patch-CMakeLists.txt b/astro/oskar/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..006ac48aed1 --- /dev/null +++ b/astro/oskar/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2018-07-23 04:35:44 UTC ++++ CMakeLists.txt +@@ -54,6 +54,7 @@ include_directories( + ${PROJECT_SOURCE_DIR}/extern/cfitsio-3.41 + ${PROJECT_SOURCE_DIR}/extern/Random123 + ${PROJECT_SOURCE_DIR}/extern/Random123/features ++ ${FREEBSD_FILESDIR} + ) + set(GTEST_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extern/gtest-1.7.0/include/gtest) + diff --git a/astro/oskar/files/patch-extern_CMakeLists.txt b/astro/oskar/files/patch-extern_CMakeLists.txt new file mode 100644 index 00000000000..9639c6f9153 --- /dev/null +++ b/astro/oskar/files/patch-extern_CMakeLists.txt @@ -0,0 +1,8 @@ +--- extern/CMakeLists.txt.orig 2018-07-23 04:41:52 UTC ++++ extern/CMakeLists.txt +@@ -1,4 +1,4 @@ + # src/extern/CMakeLists.txt + + add_subdirectory(gtest-1.7.0) +-add_subdirectory(cfitsio-3.41) ++#add_subdirectory(cfitsio-3.41) diff --git a/astro/oskar/files/patch-oskar_settings_src_oskar__settings__utility__string.cpp b/astro/oskar/files/patch-oskar_settings_src_oskar__settings__utility__string.cpp new file mode 100644 index 00000000000..cb0f816c0f7 --- /dev/null +++ b/astro/oskar/files/patch-oskar_settings_src_oskar__settings__utility__string.cpp @@ -0,0 +1,10 @@ +--- oskar/settings/src/oskar_settings_utility_string.cpp.orig 2018-07-23 04:34:42 UTC ++++ oskar/settings/src/oskar_settings_utility_string.cpp +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include "fcvt.h" + + std::string oskar_settings_utility_string_reduce(const std::string& str, + const std::string& fill, diff --git a/astro/oskar/pkg-descr b/astro/oskar/pkg-descr new file mode 100644 index 00000000000..78810613f4f --- /dev/null +++ b/astro/oskar/pkg-descr @@ -0,0 +1,5 @@ +OSKAR has been designed to produce simulated visibility data from radio +telescopes containing aperture arrays, such as those envisaged for the +Square Kilometre Array. + +WWW: https://github.com/OxfordSKA/OSKAR diff --git a/astro/oskar/pkg-plist b/astro/oskar/pkg-plist new file mode 100644 index 00000000000..2e5478788ba --- /dev/null +++ b/astro/oskar/pkg-plist @@ -0,0 +1,539 @@ +bin/oskar +bin/oskar_binary_file_query +bin/oskar_convert_cst_to_scalar.py +bin/oskar_convert_ecef_to_enu +bin/oskar_convert_geodetic_to_ecef +bin/oskar_filter_sky_model_clusters +bin/oskar_fit_element_data +bin/oskar_fits_image_to_sky_model +bin/oskar_imager +bin/oskar_sim_beam_pattern +bin/oskar_sim_interferometer +bin/oskar_vis_add +bin/oskar_vis_add_noise +bin/oskar_vis_summary +bin/oskar_vis_to_ascii_table +bin/oskar_vis_to_ms +bin/oskar_vis_upgrade_format +include/oskar/apps/oskar_app_registrar.h +include/oskar/apps/oskar_app_settings.h +include/oskar/apps/oskar_apps.h +include/oskar/apps/oskar_settings_log.h +include/oskar/apps/oskar_settings_to_beam_pattern.h +include/oskar/apps/oskar_settings_to_imager.h +include/oskar/apps/oskar_settings_to_interferometer.h +include/oskar/apps/oskar_settings_to_sky.h +include/oskar/apps/oskar_settings_to_telescope.h +include/oskar/apps/oskar_sim_tec_screen.h +include/oskar/beam_pattern/oskar_beam_pattern.h +include/oskar/beam_pattern/oskar_beam_pattern_accessors.h +include/oskar/beam_pattern/oskar_beam_pattern_check_init.h +include/oskar/beam_pattern/oskar_beam_pattern_create.h +include/oskar/beam_pattern/oskar_beam_pattern_free.h +include/oskar/beam_pattern/oskar_beam_pattern_reset_cache.h +include/oskar/beam_pattern/oskar_beam_pattern_run.h +include/oskar/binary/oskar_binary.h +include/oskar/binary/oskar_binary_create.h +include/oskar/binary/oskar_binary_data_types.h +include/oskar/binary/oskar_binary_free.h +include/oskar/binary/oskar_binary_macros.h +include/oskar/binary/oskar_binary_query.h +include/oskar/binary/oskar_binary_read.h +include/oskar/binary/oskar_binary_write.h +include/oskar/binary/oskar_crc.h +include/oskar/binary/oskar_endian.h +include/oskar/convert/oskar_convert_apparent_ha_dec_to_enu_directions.h +include/oskar/convert/oskar_convert_apparent_ra_dec_to_az_el.h +include/oskar/convert/oskar_convert_apparent_ra_dec_to_enu_directions.h +include/oskar/convert/oskar_convert_brightness_to_jy.h +include/oskar/convert/oskar_convert_cellsize_to_fov.h +include/oskar/convert/oskar_convert_cirs_ra_dec_to_enu_directions.h +include/oskar/convert/oskar_convert_cirs_relative_directions_to_enu_directions.h +include/oskar/convert/oskar_convert_cirs_relative_directions_to_enu_directions_cuda.h +include/oskar/convert/oskar_convert_date_time_to_mjd.h +include/oskar/convert/oskar_convert_ecef_to_baseline_uvw.h +include/oskar/convert/oskar_convert_ecef_to_enu.h +include/oskar/convert/oskar_convert_ecef_to_geodetic_spherical.h +include/oskar/convert/oskar_convert_ecef_to_station_uvw.h +include/oskar/convert/oskar_convert_ecef_to_station_uvw_cuda.h +include/oskar/convert/oskar_convert_enu_directions_to_az_el.h +include/oskar/convert/oskar_convert_enu_directions_to_cirs_relative_directions.h +include/oskar/convert/oskar_convert_enu_directions_to_cirs_relative_directions_cuda.h +include/oskar/convert/oskar_convert_enu_directions_to_relative_directions.h +include/oskar/convert/oskar_convert_enu_directions_to_relative_directions_cuda.h +include/oskar/convert/oskar_convert_enu_directions_to_relative_directions_inline.h +include/oskar/convert/oskar_convert_enu_directions_to_theta_phi.h +include/oskar/convert/oskar_convert_enu_directions_to_theta_phi_cuda.h +include/oskar/convert/oskar_convert_enu_to_ecef.h +include/oskar/convert/oskar_convert_enu_to_offset_ecef.h +include/oskar/convert/oskar_convert_fov_to_cellsize.h +include/oskar/convert/oskar_convert_galactic_to_fk5.h +include/oskar/convert/oskar_convert_geodetic_spherical_to_ecef.h +include/oskar/convert/oskar_convert_healpix_ring_to_theta_phi.h +include/oskar/convert/oskar_convert_lon_lat_to_relative_directions.h +include/oskar/convert/oskar_convert_lon_lat_to_relative_directions_cuda.h +include/oskar/convert/oskar_convert_lon_lat_to_xyz.h +include/oskar/convert/oskar_convert_ludwig3_to_theta_phi_components.h +include/oskar/convert/oskar_convert_ludwig3_to_theta_phi_components_cuda.h +include/oskar/convert/oskar_convert_mjd_to_gast_fast.h +include/oskar/convert/oskar_convert_mjd_to_gmst.h +include/oskar/convert/oskar_convert_mjd_ut1_to_era.h +include/oskar/convert/oskar_convert_mjd_utc_to_mjd_tt.h +include/oskar/convert/oskar_convert_offset_ecef_to_ecef.h +include/oskar/convert/oskar_convert_relative_directions_to_enu_directions.h +include/oskar/convert/oskar_convert_relative_directions_to_enu_directions_cuda.h +include/oskar/convert/oskar_convert_relative_directions_to_enu_directions_inline.h +include/oskar/convert/oskar_convert_relative_directions_to_lon_lat.h +include/oskar/convert/oskar_convert_station_uvw_to_baseline_uvw.h +include/oskar/convert/oskar_convert_station_uvw_to_baseline_uvw_cuda.h +include/oskar/convert/oskar_convert_theta_phi_to_enu_directions.h +include/oskar/convert/oskar_convert_theta_phi_to_healpix_ring.h +include/oskar/convert/oskar_convert_xyz_to_lon_lat.h +include/oskar/convert/oskar_equation_of_equinoxes_fast.h +include/oskar/convert/oskar_evaluate_diurnal_aberration.h +include/oskar/correlate/oskar_auto_correlate.h +include/oskar/correlate/oskar_auto_correlate_cuda.h +include/oskar/correlate/oskar_auto_correlate_omp.h +include/oskar/correlate/oskar_auto_correlate_scalar_cuda.h +include/oskar/correlate/oskar_auto_correlate_scalar_omp.h +include/oskar/correlate/oskar_cross_correlate.h +include/oskar/correlate/oskar_cross_correlate_gaussian_cuda.h +include/oskar/correlate/oskar_cross_correlate_gaussian_omp.h +include/oskar/correlate/oskar_cross_correlate_gaussian_scalar_cuda.h +include/oskar/correlate/oskar_cross_correlate_gaussian_scalar_omp.h +include/oskar/correlate/oskar_cross_correlate_gaussian_time_smearing_cuda.h +include/oskar/correlate/oskar_cross_correlate_gaussian_time_smearing_omp.h +include/oskar/correlate/oskar_cross_correlate_gaussian_time_smearing_scalar_cuda.h +include/oskar/correlate/oskar_cross_correlate_gaussian_time_smearing_scalar_omp.h +include/oskar/correlate/oskar_cross_correlate_point_cuda.h +include/oskar/correlate/oskar_cross_correlate_point_omp.h +include/oskar/correlate/oskar_cross_correlate_point_scalar_cuda.h +include/oskar/correlate/oskar_cross_correlate_point_scalar_omp.h +include/oskar/correlate/oskar_cross_correlate_point_time_smearing_cuda.h +include/oskar/correlate/oskar_cross_correlate_point_time_smearing_omp.h +include/oskar/correlate/oskar_cross_correlate_point_time_smearing_scalar_cuda.h +include/oskar/correlate/oskar_cross_correlate_point_time_smearing_scalar_omp.h +include/oskar/correlate/oskar_evaluate_auto_power.h +include/oskar/correlate/oskar_evaluate_auto_power_c.h +include/oskar/correlate/oskar_evaluate_auto_power_cuda.h +include/oskar/correlate/oskar_evaluate_cross_power.h +include/oskar/correlate/oskar_evaluate_cross_power_cuda.h +include/oskar/correlate/oskar_evaluate_cross_power_omp.h +include/oskar/imager/oskar_grid_correction.h +include/oskar/imager/oskar_grid_functions_pillbox.h +include/oskar/imager/oskar_grid_functions_spheroidal.h +include/oskar/imager/oskar_grid_simple.h +include/oskar/imager/oskar_grid_weights.h +include/oskar/imager/oskar_grid_wproj.h +include/oskar/imager/oskar_imager.h +include/oskar/imager/oskar_imager_accessors.h +include/oskar/imager/oskar_imager_check_init.h +include/oskar/imager/oskar_imager_create.h +include/oskar/imager/oskar_imager_finalise.h +include/oskar/imager/oskar_imager_free.h +include/oskar/imager/oskar_imager_linear_to_stokes.h +include/oskar/imager/oskar_imager_reset_cache.h +include/oskar/imager/oskar_imager_rotate_coords.h +include/oskar/imager/oskar_imager_rotate_vis.h +include/oskar/imager/oskar_imager_run.h +include/oskar/imager/oskar_imager_update.h +include/oskar/interferometer/oskar_WorkJonesZ.h +include/oskar/interferometer/oskar_evaluate_jones_E.h +include/oskar/interferometer/oskar_evaluate_jones_K.h +include/oskar/interferometer/oskar_evaluate_jones_K_cuda.h +include/oskar/interferometer/oskar_evaluate_jones_R.h +include/oskar/interferometer/oskar_evaluate_jones_R_cuda.h +include/oskar/interferometer/oskar_evaluate_jones_Z.h +include/oskar/interferometer/oskar_interferometer.h +include/oskar/interferometer/oskar_jones.h +include/oskar/interferometer/oskar_jones_accessors.h +include/oskar/interferometer/oskar_jones_create.h +include/oskar/interferometer/oskar_jones_create_copy.h +include/oskar/interferometer/oskar_jones_free.h +include/oskar/interferometer/oskar_jones_get_station_pointer.h +include/oskar/interferometer/oskar_jones_join.h +include/oskar/interferometer/oskar_jones_set_real_scalar.h +include/oskar/interferometer/oskar_jones_set_size.h +include/oskar/log/oskar_log.h +include/oskar/log/oskar_log_accessors.h +include/oskar/log/oskar_log_create.h +include/oskar/log/oskar_log_error.h +include/oskar/log/oskar_log_file_data.h +include/oskar/log/oskar_log_file_exists.h +include/oskar/log/oskar_log_free.h +include/oskar/log/oskar_log_line.h +include/oskar/log/oskar_log_message.h +include/oskar/log/oskar_log_section.h +include/oskar/log/oskar_log_system_clock_data.h +include/oskar/log/oskar_log_system_clock_string.h +include/oskar/log/oskar_log_value.h +include/oskar/log/oskar_log_warning.h +include/oskar/log/oskar_log_write.h +include/oskar/math/CMakeLists.txt +include/oskar/math/oskar_add_inline.h +include/oskar/math/oskar_angular_distance.h +include/oskar/math/oskar_bearing_angle.h +include/oskar/math/oskar_cmath.h +include/oskar/math/oskar_dft_c2r.h +include/oskar/math/oskar_dft_c2r_2d_cuda.h +include/oskar/math/oskar_dft_c2r_2d_omp.h +include/oskar/math/oskar_dft_c2r_3d_cuda.h +include/oskar/math/oskar_dft_c2r_3d_omp.h +include/oskar/math/oskar_dftw.h +include/oskar/math/oskar_dftw_c2c_2d_cuda.h +include/oskar/math/oskar_dftw_c2c_2d_omp.h +include/oskar/math/oskar_dftw_c2c_3d_cuda.h +include/oskar/math/oskar_dftw_c2c_3d_omp.h +include/oskar/math/oskar_dftw_m2m_2d_cuda.h +include/oskar/math/oskar_dftw_m2m_2d_omp.h +include/oskar/math/oskar_dftw_m2m_3d_cuda.h +include/oskar/math/oskar_dftw_m2m_3d_indexed_input_cuda.h +include/oskar/math/oskar_dftw_m2m_3d_omp.h +include/oskar/math/oskar_dftw_o2c_2d_cuda.h +include/oskar/math/oskar_dftw_o2c_2d_omp.h +include/oskar/math/oskar_dftw_o2c_3d_cuda.h +include/oskar/math/oskar_dftw_o2c_3d_omp.h +include/oskar/math/oskar_ellipse_radius.h +include/oskar/math/oskar_evaluate_image_lm_grid.h +include/oskar/math/oskar_evaluate_image_lmn_grid.h +include/oskar/math/oskar_evaluate_image_lon_lat_grid.h +include/oskar/math/oskar_fftpack_cfft.h +include/oskar/math/oskar_fftpack_cfft_f.h +include/oskar/math/oskar_fftphase.h +include/oskar/math/oskar_find_closest_match.h +include/oskar/math/oskar_fit_ellipse.h +include/oskar/math/oskar_floating_point_compare.h +include/oskar/math/oskar_gaussian_circular.h +include/oskar/math/oskar_gaussian_circular_cuda.h +include/oskar/math/oskar_healpix_npix_to_nside.h +include/oskar/math/oskar_kahan_sum.h +include/oskar/math/oskar_lapack_subset.h +include/oskar/math/oskar_linspace.h +include/oskar/math/oskar_matrix_multiply.h +include/oskar/math/oskar_meshgrid.h +include/oskar/math/oskar_multiply_inline.h +include/oskar/math/oskar_prefix_sum.h +include/oskar/math/oskar_prefix_sum_cuda.h +include/oskar/math/oskar_random_broken_power_law.h +include/oskar/math/oskar_random_gaussian.h +include/oskar/math/oskar_random_power_law.h +include/oskar/math/oskar_rotate.h +include/oskar/math/oskar_round_robin.h +include/oskar/math/oskar_sph_rotate_to_position.h +include/oskar/mem/oskar_binary_read_mem.h +include/oskar/mem/oskar_binary_write_mem.h +include/oskar/mem/oskar_mem.h +include/oskar/mem/oskar_mem_accessors.h +include/oskar/mem/oskar_mem_add.h +include/oskar/mem/oskar_mem_add_cuda.h +include/oskar/mem/oskar_mem_add_real.h +include/oskar/mem/oskar_mem_append_raw.h +include/oskar/mem/oskar_mem_clear_contents.h +include/oskar/mem/oskar_mem_convert_precision.h +include/oskar/mem/oskar_mem_copy.h +include/oskar/mem/oskar_mem_copy_contents.h +include/oskar/mem/oskar_mem_create.h +include/oskar/mem/oskar_mem_create_alias.h +include/oskar/mem/oskar_mem_create_alias_from_raw.h +include/oskar/mem/oskar_mem_create_copy.h +include/oskar/mem/oskar_mem_data_type_string.h +include/oskar/mem/oskar_mem_different.h +include/oskar/mem/oskar_mem_element_size.h +include/oskar/mem/oskar_mem_evaluate_relative_error.h +include/oskar/mem/oskar_mem_free.h +include/oskar/mem/oskar_mem_get_element.h +include/oskar/mem/oskar_mem_load_ascii.h +include/oskar/mem/oskar_mem_multiply.h +include/oskar/mem/oskar_mem_multiply_cuda.h +include/oskar/mem/oskar_mem_random_gaussian.h +include/oskar/mem/oskar_mem_random_gaussian_cuda.h +include/oskar/mem/oskar_mem_random_range.h +include/oskar/mem/oskar_mem_random_uniform.h +include/oskar/mem/oskar_mem_random_uniform_cuda.h +include/oskar/mem/oskar_mem_read_binary_raw.h +include/oskar/mem/oskar_mem_read_fits_image_plane.h +include/oskar/mem/oskar_mem_read_healpix_fits.h +include/oskar/mem/oskar_mem_realloc.h +include/oskar/mem/oskar_mem_save_ascii.h +include/oskar/mem/oskar_mem_scale_real.h +include/oskar/mem/oskar_mem_scale_real_cuda.h +include/oskar/mem/oskar_mem_set_alias.h +include/oskar/mem/oskar_mem_set_element.h +include/oskar/mem/oskar_mem_set_value_real.h +include/oskar/mem/oskar_mem_set_value_real_cuda.h +include/oskar/mem/oskar_mem_stats.h +include/oskar/mem/oskar_mem_write_fits_cube.h +include/oskar/mem/oskar_mem_write_healpix_fits.h +include/oskar/ms/oskar_measurement_set.h +include/oskar/ms/oskar_ms_accessors.h +include/oskar/ms/oskar_ms_add_history.h +include/oskar/ms/oskar_ms_add_scratch_columns.h +include/oskar/ms/oskar_ms_close.h +include/oskar/ms/oskar_ms_copy_data_column.h +include/oskar/ms/oskar_ms_create.h +include/oskar/ms/oskar_ms_open.h +include/oskar/ms/oskar_ms_read.h +include/oskar/ms/oskar_ms_write.h +include/oskar/oskar.h +include/oskar/oskar_global.h +include/oskar/oskar_version.h +include/oskar/settings/extern/ttl/config.hpp +include/oskar/settings/extern/ttl/data_holder.hpp +include/oskar/settings/extern/ttl/detail/macro_counter.hpp +include/oskar/settings/extern/ttl/equivalent_types.hpp +include/oskar/settings/extern/ttl/exception.hpp +include/oskar/settings/extern/ttl/macro_misc.hpp +include/oskar/settings/extern/ttl/macro_params.hpp +include/oskar/settings/extern/ttl/macro_repeat.hpp +include/oskar/settings/extern/ttl/meta/is_pointer.hpp +include/oskar/settings/extern/ttl/meta/is_reference.hpp +include/oskar/settings/extern/ttl/meta/is_same.hpp +include/oskar/settings/extern/ttl/meta/typelist.hpp +include/oskar/settings/extern/ttl/selector.hpp +include/oskar/settings/extern/ttl/var/variant.hpp +include/oskar/settings/old/oskar_Settings_old.h +include/oskar/settings/old/oskar_settings_load.h +include/oskar/settings/old/oskar_settings_load_ionosphere.h +include/oskar/settings/old/oskar_settings_load_observation.h +include/oskar/settings/old/oskar_settings_load_tid_parameter_file.h +include/oskar/settings/oskar_SettingsDeclareXml.h +include/oskar/settings/oskar_SettingsDependency.h +include/oskar/settings/oskar_SettingsDependencyGroup.h +include/oskar/settings/oskar_SettingsFileHandler.h +include/oskar/settings/oskar_SettingsFileHandlerIni.h +include/oskar/settings/oskar_SettingsItem.h +include/oskar/settings/oskar_SettingsKey.h +include/oskar/settings/oskar_SettingsNode.h +include/oskar/settings/oskar_SettingsTree.h +include/oskar/settings/oskar_SettingsValue.h +include/oskar/settings/oskar_settings_macros.h +include/oskar/settings/oskar_settings_types.h +include/oskar/settings/oskar_settings_utility_string.h +include/oskar/settings/types/oskar_AbstractSettingsType.h +include/oskar/settings/types/oskar_Bool.h +include/oskar/settings/types/oskar_DateTime.h +include/oskar/settings/types/oskar_Double.h +include/oskar/settings/types/oskar_DoubleList.h +include/oskar/settings/types/oskar_DoubleRange.h +include/oskar/settings/types/oskar_DoubleRangeExt.h +include/oskar/settings/types/oskar_InputDirectory.h +include/oskar/settings/types/oskar_InputFile.h +include/oskar/settings/types/oskar_InputFileList.h +include/oskar/settings/types/oskar_Int.h +include/oskar/settings/types/oskar_IntList.h +include/oskar/settings/types/oskar_IntListExt.h +include/oskar/settings/types/oskar_IntPositive.h +include/oskar/settings/types/oskar_IntRange.h +include/oskar/settings/types/oskar_IntRangeExt.h +include/oskar/settings/types/oskar_OptionList.h +include/oskar/settings/types/oskar_OutputFile.h +include/oskar/settings/types/oskar_RandomSeed.h +include/oskar/settings/types/oskar_String.h +include/oskar/settings/types/oskar_StringList.h +include/oskar/settings/types/oskar_Time.h +include/oskar/settings/types/oskar_UnsignedDouble.h +include/oskar/settings/types/oskar_UnsignedInt.h +include/oskar/sky/oskar_evaluate_tec_tid.h +include/oskar/sky/oskar_generate_random_coordinate.h +include/oskar/sky/oskar_parallactic_angle.h +include/oskar/sky/oskar_rebin_sky_cuda.h +include/oskar/sky/oskar_scale_flux_with_frequency.h +include/oskar/sky/oskar_scale_flux_with_frequency_cuda.h +include/oskar/sky/oskar_scale_flux_with_frequency_inline.h +include/oskar/sky/oskar_sky.h +include/oskar/sky/oskar_sky_accessors.h +include/oskar/sky/oskar_sky_append.h +include/oskar/sky/oskar_sky_append_to_set.h +include/oskar/sky/oskar_sky_copy.h +include/oskar/sky/oskar_sky_copy_contents.h +include/oskar/sky/oskar_sky_copy_source_data.h +include/oskar/sky/oskar_sky_copy_source_data_cuda.h +include/oskar/sky/oskar_sky_create.h +include/oskar/sky/oskar_sky_create_copy.h +include/oskar/sky/oskar_sky_evaluate_gaussian_source_parameters.h +include/oskar/sky/oskar_sky_evaluate_relative_directions.h +include/oskar/sky/oskar_sky_filter_by_flux.h +include/oskar/sky/oskar_sky_filter_by_flux_cuda.h +include/oskar/sky/oskar_sky_filter_by_radius.h +include/oskar/sky/oskar_sky_free.h +include/oskar/sky/oskar_sky_from_fits_file.h +include/oskar/sky/oskar_sky_from_healpix_ring.h +include/oskar/sky/oskar_sky_from_image.h +include/oskar/sky/oskar_sky_generate_grid.h +include/oskar/sky/oskar_sky_generate_random_power_law.h +include/oskar/sky/oskar_sky_horizon_clip.h +include/oskar/sky/oskar_sky_load.h +include/oskar/sky/oskar_sky_override_polarisation.h +include/oskar/sky/oskar_sky_read.h +include/oskar/sky/oskar_sky_resize.h +include/oskar/sky/oskar_sky_rotate_to_position.h +include/oskar/sky/oskar_sky_save.h +include/oskar/sky/oskar_sky_scale_flux_with_frequency.h +include/oskar/sky/oskar_sky_set_gaussian_parameters.h +include/oskar/sky/oskar_sky_set_source.h +include/oskar/sky/oskar_sky_set_spectral_index.h +include/oskar/sky/oskar_sky_write.h +include/oskar/sky/oskar_update_horizon_mask.h +include/oskar/sky/oskar_update_horizon_mask_cuda.h +include/oskar/splines/oskar_splines.h +include/oskar/splines/oskar_splines_accessors.h +include/oskar/splines/oskar_splines_copy.h +include/oskar/splines/oskar_splines_create.h +include/oskar/splines/oskar_splines_evaluate.h +include/oskar/splines/oskar_splines_fit.h +include/oskar/splines/oskar_splines_free.h +include/oskar/telescope/oskar_TelescopeLoadAbstract.h +include/oskar/telescope/oskar_telescope.h +include/oskar/telescope/oskar_telescope_accessors.h +include/oskar/telescope/oskar_telescope_analyse.h +include/oskar/telescope/oskar_telescope_create.h +include/oskar/telescope/oskar_telescope_create_copy.h +include/oskar/telescope/oskar_telescope_duplicate_first_station.h +include/oskar/telescope/oskar_telescope_free.h +include/oskar/telescope/oskar_telescope_load.h +include/oskar/telescope/oskar_telescope_load_pointing_file.h +include/oskar/telescope/oskar_telescope_load_position.h +include/oskar/telescope/oskar_telescope_load_station_coords_ecef.h +include/oskar/telescope/oskar_telescope_load_station_coords_enu.h +include/oskar/telescope/oskar_telescope_load_station_coords_wgs84.h +include/oskar/telescope/oskar_telescope_log_summary.h +include/oskar/telescope/oskar_telescope_resize.h +include/oskar/telescope/oskar_telescope_save.h +include/oskar/telescope/oskar_telescope_save_layout.h +include/oskar/telescope/oskar_telescope_set_station_coords.h +include/oskar/telescope/oskar_telescope_set_station_coords_ecef.h +include/oskar/telescope/oskar_telescope_set_station_coords_enu.h +include/oskar/telescope/oskar_telescope_set_station_coords_wgs84.h +include/oskar/telescope/station/element/oskar_apply_element_taper_cosine.h +include/oskar/telescope/station/element/oskar_apply_element_taper_cosine_cuda.h +include/oskar/telescope/station/element/oskar_apply_element_taper_gaussian.h +include/oskar/telescope/station/element/oskar_apply_element_taper_gaussian_cuda.h +include/oskar/telescope/station/element/oskar_element.h +include/oskar/telescope/station/element/oskar_element_accessors.h +include/oskar/telescope/station/element/oskar_element_copy.h +include/oskar/telescope/station/element/oskar_element_create.h +include/oskar/telescope/station/element/oskar_element_different.h +include/oskar/telescope/station/element/oskar_element_evaluate.h +include/oskar/telescope/station/element/oskar_element_free.h +include/oskar/telescope/station/element/oskar_element_load.h +include/oskar/telescope/station/element/oskar_element_load_cst.h +include/oskar/telescope/station/element/oskar_element_load_scalar.h +include/oskar/telescope/station/element/oskar_element_read.h +include/oskar/telescope/station/element/oskar_element_resize_freq_data.h +include/oskar/telescope/station/element/oskar_element_save.h +include/oskar/telescope/station/element/oskar_element_write.h +include/oskar/telescope/station/element/oskar_evaluate_dipole_pattern.h +include/oskar/telescope/station/element/oskar_evaluate_dipole_pattern_cuda.h +include/oskar/telescope/station/element/oskar_evaluate_dipole_pattern_inline.h +include/oskar/telescope/station/element/oskar_evaluate_geometric_dipole_pattern.h +include/oskar/telescope/station/element/oskar_evaluate_geometric_dipole_pattern_cuda.h +include/oskar/telescope/station/element/oskar_evaluate_geometric_dipole_pattern_inline.h +include/oskar/telescope/station/oskar_blank_below_horizon.h +include/oskar/telescope/station/oskar_blank_below_horizon_cuda.h +include/oskar/telescope/station/oskar_evaluate_beam_horizon_direction.h +include/oskar/telescope/station/oskar_evaluate_element_weights.h +include/oskar/telescope/station/oskar_evaluate_element_weights_dft.h +include/oskar/telescope/station/oskar_evaluate_element_weights_dft_cuda.h +include/oskar/telescope/station/oskar_evaluate_element_weights_errors.h +include/oskar/telescope/station/oskar_evaluate_element_weights_errors_cuda.h +include/oskar/telescope/station/oskar_evaluate_pierce_points.h +include/oskar/telescope/station/oskar_evaluate_station_beam.h +include/oskar/telescope/station/oskar_evaluate_station_beam_aperture_array.h +include/oskar/telescope/station/oskar_evaluate_station_beam_gaussian.h +include/oskar/telescope/station/oskar_evaluate_station_from_telescope_dipole_azimuth.h +include/oskar/telescope/station/oskar_evaluate_vla_beam_pbcor.h +include/oskar/telescope/station/oskar_evaluate_vla_beam_pbcor_cuda.h +include/oskar/telescope/station/oskar_station.h +include/oskar/telescope/station/oskar_station_accessors.h +include/oskar/telescope/station/oskar_station_analyse.h +include/oskar/telescope/station/oskar_station_create.h +include/oskar/telescope/station/oskar_station_create_child_stations.h +include/oskar/telescope/station/oskar_station_create_copy.h +include/oskar/telescope/station/oskar_station_different.h +include/oskar/telescope/station/oskar_station_duplicate_first_child.h +include/oskar/telescope/station/oskar_station_free.h +include/oskar/telescope/station/oskar_station_load_apodisation.h +include/oskar/telescope/station/oskar_station_load_element_types.h +include/oskar/telescope/station/oskar_station_load_feed_angle.h +include/oskar/telescope/station/oskar_station_load_gain_phase.h +include/oskar/telescope/station/oskar_station_load_layout.h +include/oskar/telescope/station/oskar_station_load_mount_types.h +include/oskar/telescope/station/oskar_station_load_permitted_beams.h +include/oskar/telescope/station/oskar_station_override_element_feed_angle.h +include/oskar/telescope/station/oskar_station_override_element_gains.h +include/oskar/telescope/station/oskar_station_override_element_phases.h +include/oskar/telescope/station/oskar_station_override_element_time_variable_gains.h +include/oskar/telescope/station/oskar_station_override_element_time_variable_phases.h +include/oskar/telescope/station/oskar_station_override_element_xy_position_errors.h +include/oskar/telescope/station/oskar_station_resize.h +include/oskar/telescope/station/oskar_station_resize_element_types.h +include/oskar/telescope/station/oskar_station_save_apodisation.h +include/oskar/telescope/station/oskar_station_save_element_types.h +include/oskar/telescope/station/oskar_station_save_feed_angle.h +include/oskar/telescope/station/oskar_station_save_gain_phase.h +include/oskar/telescope/station/oskar_station_save_layout.h +include/oskar/telescope/station/oskar_station_save_mount_types.h +include/oskar/telescope/station/oskar_station_save_permitted_beams.h +include/oskar/telescope/station/oskar_station_set_element_coords.h +include/oskar/telescope/station/oskar_station_set_element_errors.h +include/oskar/telescope/station/oskar_station_set_element_feed_angle.h +include/oskar/telescope/station/oskar_station_set_element_mount_type.h +include/oskar/telescope/station/oskar_station_set_element_type.h +include/oskar/telescope/station/oskar_station_set_element_weight.h +include/oskar/telescope/station/oskar_station_work.h +include/oskar/telescope/station/oskar_vla_pbcor_inline.h +include/oskar/utility/oskar_binary_write_metadata.h +include/oskar/utility/oskar_cl_registrar.h +include/oskar/utility/oskar_cl_utils.h +include/oskar/utility/oskar_cuda_info.h +include/oskar/utility/oskar_cuda_info_create.h +include/oskar/utility/oskar_cuda_info_free.h +include/oskar/utility/oskar_cuda_info_log.h +include/oskar/utility/oskar_cuda_mem_log.h +include/oskar/utility/oskar_device_utils.h +include/oskar/utility/oskar_dir.h +include/oskar/utility/oskar_file_exists.h +include/oskar/utility/oskar_get_error_string.h +include/oskar/utility/oskar_get_memory_usage.h +include/oskar/utility/oskar_get_num_procs.h +include/oskar/utility/oskar_getline.h +include/oskar/utility/oskar_scan_binary_file.h +include/oskar/utility/oskar_string_to_array.h +include/oskar/utility/oskar_thread.h +include/oskar/utility/oskar_timer.h +include/oskar/utility/oskar_vector_types.h +include/oskar/utility/oskar_version_string.h +include/oskar/vis/oskar_vis.h +include/oskar/vis/oskar_vis_accessors.h +include/oskar/vis/oskar_vis_block.h +include/oskar/vis/oskar_vis_block_accessors.h +include/oskar/vis/oskar_vis_block_add_system_noise.h +include/oskar/vis/oskar_vis_block_clear.h +include/oskar/vis/oskar_vis_block_copy.h +include/oskar/vis/oskar_vis_block_create.h +include/oskar/vis/oskar_vis_block_create_from_header.h +include/oskar/vis/oskar_vis_block_free.h +include/oskar/vis/oskar_vis_block_read.h +include/oskar/vis/oskar_vis_block_resize.h +include/oskar/vis/oskar_vis_block_write.h +include/oskar/vis/oskar_vis_block_write_ms.h +include/oskar/vis/oskar_vis_create.h +include/oskar/vis/oskar_vis_free.h +include/oskar/vis/oskar_vis_header.h +include/oskar/vis/oskar_vis_header_accessors.h +include/oskar/vis/oskar_vis_header_create.h +include/oskar/vis/oskar_vis_header_create_copy.h +include/oskar/vis/oskar_vis_header_free.h +include/oskar/vis/oskar_vis_header_read.h +include/oskar/vis/oskar_vis_header_write.h +include/oskar/vis/oskar_vis_header_write_ms.h +include/oskar/vis/oskar_vis_read.h +include/oskar/vis/oskar_vis_write.h +lib/liboskar.so +lib/liboskar.so.%%PYTHON_VER%%.0 +lib/liboskar_apps.so +lib/liboskar_apps.so.%%PYTHON_VER%%.0 +lib/liboskar_binary.so +lib/liboskar_binary.so.2 +lib/liboskar_settings.so +lib/liboskar_settings.so.%%PYTHON_VER%%.0 diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile index 2056f054090..b2aa20ba5f5 100644 --- a/audio/lollypop/Makefile +++ b/audio/lollypop/Makefile @@ -2,33 +2,36 @@ # $FreeBSD$ PORTNAME= lollypop -PORTVERSION= 0.9.15 -PORTREVISION= 2 +DISTVERSION= 0.9.521 CATEGORIES= audio -MASTER_SITES= https://github.com/gnumdk/${PORTNAME}/releases/download/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= greg@unrelenting.technology COMMENT= Play and organize your music collection LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3@${PY_FLAVOR} \ itstool:textproc/itstool \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylast>=1.4.0:audio/py-pylast@${PY_FLAVOR} LIB_DEPENDS= libnotify.so:devel/libnotify \ - libtotem-plparser.so:multimedia/totem-pl-parser + libappstream-glib.so:devel/appstream-glib \ + libtotem-plparser.so:multimedia/totem-pl-parser -USES= python:3.4+ pkgconfig gettext gmake shebangfix sqlite tar:xz -GNU_CONFIGURE= yes +USES= python:3.4+ pkgconfig gettext meson shebangfix sqlite desktop-file-utils +USE_GITLAB= yes +GL_SITE= https://gitlab.gnome.org +GL_ACCOUNT= World +GL_COMMIT= 86ff0eac3231802b5dc49c50f6d89eec1aa08a7e +GL_TUPLE= gnumdk:lollypop-po:1a41364ef42a2040292ec5c002cd2c8d93674c5e:po/subprojects/po USE_GNOME= glib20 gtk30 pygobject3 introspection:build intltool intlhack USE_GSTREAMER1= yes mpg123 ogg flac opus libav faad good speex -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist noflavors INSTALLS_ICONS= yes -SHEBANG_FILES= lollypop.in \ - src/*.py +SHEBANG_FILES= lollypop/*.py meson_post_install.py GLIB_SCHEMAS= org.gnome.Lollypop.gschema.xml diff --git a/audio/lollypop/distinfo b/audio/lollypop/distinfo index 2a4ad74b241..677fee7170e 100644 --- a/audio/lollypop/distinfo +++ b/audio/lollypop/distinfo @@ -1,2 +1,5 @@ -SHA256 (lollypop-0.9.15.tar.xz) = 7d86463fe229cecc779db3db98f720dbb1b8ee97144fb7f7e242650c510bc960 -SIZE (lollypop-0.9.15.tar.xz) = 397220 +TIMESTAMP = 1532293860 +SHA256 (World-lollypop-86ff0eac3231802b5dc49c50f6d89eec1aa08a7e_GL0.tar.gz) = fb60ecc4b38ca7b7cee19ae76e5b04a4510e0c875eafdfca98031db37d06dfd6 +SIZE (World-lollypop-86ff0eac3231802b5dc49c50f6d89eec1aa08a7e_GL0.tar.gz) = 330391 +SHA256 (World-lollypop-po-1a41364ef42a2040292ec5c002cd2c8d93674c5e_GL0.tar.gz) = 6002f148fe2d57de2105216fc09b518bdf394d3d4119c7f06138bc95c1109bc7 +SIZE (World-lollypop-po-1a41364ef42a2040292ec5c002cd2c8d93674c5e_GL0.tar.gz) = 280226 diff --git a/audio/lollypop/files/patch-src_application.py b/audio/lollypop/files/patch-src_application.py deleted file mode 100644 index 48fcb535883..00000000000 --- a/audio/lollypop/files/patch-src_application.py +++ /dev/null @@ -1,10 +0,0 @@ ---- src/application.py.orig 2015-04-30 06:37:18 UTC -+++ src/application.py -@@ -326,6 +326,7 @@ class Application(Gtk.Application): - - helpAction = Gio.SimpleAction.new('help', None) - helpAction.connect('activate', self._help) -+ helpAction.set_enabled(False) - self.set_accels_for_action('app.help', ["h"]) - self.add_action(helpAction) - diff --git a/audio/lollypop/pkg-plist b/audio/lollypop/pkg-plist index b83510164c9..7bc12bd19f8 100644 --- a/audio/lollypop/pkg-plist +++ b/audio/lollypop/pkg-plist @@ -1,197 +1,152 @@ bin/lollypop -%%PYTHON_SITELIBDIR%%/lollypop/albumart.py -%%PYTHON_SITELIBDIR%%/lollypop/albumart.pyc -%%PYTHON_SITELIBDIR%%/lollypop/albumart.pyo +bin/lollypop-cli +%%PYTHON_SITELIBDIR%%/lollypop/app_notification.py %%PYTHON_SITELIBDIR%%/lollypop/application.py -%%PYTHON_SITELIBDIR%%/lollypop/application.pyc -%%PYTHON_SITELIBDIR%%/lollypop/application.pyo +%%PYTHON_SITELIBDIR%%/lollypop/art.py +%%PYTHON_SITELIBDIR%%/lollypop/art_album.py +%%PYTHON_SITELIBDIR%%/lollypop/art_base.py +%%PYTHON_SITELIBDIR%%/lollypop/art_radio.py +%%PYTHON_SITELIBDIR%%/lollypop/art_widgets.py +%%PYTHON_SITELIBDIR%%/lollypop/cellrenderer.py +%%PYTHON_SITELIBDIR%%/lollypop/codecs.py +%%PYTHON_SITELIBDIR%%/lollypop/collectionimporter.py %%PYTHON_SITELIBDIR%%/lollypop/collectionscanner.py -%%PYTHON_SITELIBDIR%%/lollypop/collectionscanner.pyc -%%PYTHON_SITELIBDIR%%/lollypop/collectionscanner.pyo %%PYTHON_SITELIBDIR%%/lollypop/container.py -%%PYTHON_SITELIBDIR%%/lollypop/container.pyc -%%PYTHON_SITELIBDIR%%/lollypop/container.pyo +%%PYTHON_SITELIBDIR%%/lollypop/controllers.py %%PYTHON_SITELIBDIR%%/lollypop/database.py -%%PYTHON_SITELIBDIR%%/lollypop/database.pyc -%%PYTHON_SITELIBDIR%%/lollypop/database.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_albums.py -%%PYTHON_SITELIBDIR%%/lollypop/database_albums.pyc -%%PYTHON_SITELIBDIR%%/lollypop/database_albums.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_artists.py -%%PYTHON_SITELIBDIR%%/lollypop/database_artists.pyc -%%PYTHON_SITELIBDIR%%/lollypop/database_artists.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_genres.py -%%PYTHON_SITELIBDIR%%/lollypop/database_genres.pyc -%%PYTHON_SITELIBDIR%%/lollypop/database_genres.pyo +%%PYTHON_SITELIBDIR%%/lollypop/database_history.py %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.py -%%PYTHON_SITELIBDIR%%/lollypop/database_tracks.pyc -%%PYTHON_SITELIBDIR%%/lollypop/database_tracks.pyo +%%PYTHON_SITELIBDIR%%/lollypop/database_upgrade.py %%PYTHON_SITELIBDIR%%/lollypop/define.py -%%PYTHON_SITELIBDIR%%/lollypop/define.pyc -%%PYTHON_SITELIBDIR%%/lollypop/define.pyo +%%PYTHON_SITELIBDIR%%/lollypop/downloader.py +%%PYTHON_SITELIBDIR%%/lollypop/fastscroll.py %%PYTHON_SITELIBDIR%%/lollypop/fullscreen.py -%%PYTHON_SITELIBDIR%%/lollypop/fullscreen.pyc -%%PYTHON_SITELIBDIR%%/lollypop/fullscreen.pyo +%%PYTHON_SITELIBDIR%%/lollypop/goa.py +%%PYTHON_SITELIBDIR%%/lollypop/helper_dbus.py +%%PYTHON_SITELIBDIR%%/lollypop/helper_passwords.py +%%PYTHON_SITELIBDIR%%/lollypop/helper_task.py +%%PYTHON_SITELIBDIR%%/lollypop/information_store.py +%%PYTHON_SITELIBDIR%%/lollypop/inhibitor.py +%%PYTHON_SITELIBDIR%%/lollypop/inotify.py +%%PYTHON_SITELIBDIR%%/lollypop/lastfm.py +%%PYTHON_SITELIBDIR%%/lollypop/list.py +%%PYTHON_SITELIBDIR%%/lollypop/listenbrainz.py +%%PYTHON_SITELIBDIR%%/lollypop/loader.py +%%PYTHON_SITELIBDIR%%/lollypop/locales/__init__.py +%%PYTHON_SITELIBDIR%%/lollypop/locales/zh_cn.py +%%PYTHON_SITELIBDIR%%/lollypop/localized.py +%%PYTHON_SITELIBDIR%%/lollypop/logger.py +%%PYTHON_SITELIBDIR%%/lollypop/miniplayer.py %%PYTHON_SITELIBDIR%%/lollypop/mpris.py -%%PYTHON_SITELIBDIR%%/lollypop/mpris.pyc -%%PYTHON_SITELIBDIR%%/lollypop/mpris.pyo %%PYTHON_SITELIBDIR%%/lollypop/notification.py -%%PYTHON_SITELIBDIR%%/lollypop/notification.pyc -%%PYTHON_SITELIBDIR%%/lollypop/notification.pyo +%%PYTHON_SITELIBDIR%%/lollypop/objects.py %%PYTHON_SITELIBDIR%%/lollypop/player.py -%%PYTHON_SITELIBDIR%%/lollypop/player.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player.pyo %%PYTHON_SITELIBDIR%%/lollypop/player_base.py -%%PYTHON_SITELIBDIR%%/lollypop/player_base.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_base.pyo %%PYTHON_SITELIBDIR%%/lollypop/player_bin.py -%%PYTHON_SITELIBDIR%%/lollypop/player_bin.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_bin.pyo %%PYTHON_SITELIBDIR%%/lollypop/player_linear.py -%%PYTHON_SITELIBDIR%%/lollypop/player_linear.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_linear.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_playlist.py +%%PYTHON_SITELIBDIR%%/lollypop/player_plugins.py %%PYTHON_SITELIBDIR%%/lollypop/player_queue.py -%%PYTHON_SITELIBDIR%%/lollypop/player_queue.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_queue.pyo -%%PYTHON_SITELIBDIR%%/lollypop/player_rg.py -%%PYTHON_SITELIBDIR%%/lollypop/player_rg.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_rg.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_radio.py %%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.py -%%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.pyo -%%PYTHON_SITELIBDIR%%/lollypop/player_userplaylist.py -%%PYTHON_SITELIBDIR%%/lollypop/player_userplaylist.pyc -%%PYTHON_SITELIBDIR%%/lollypop/player_userplaylist.pyo %%PYTHON_SITELIBDIR%%/lollypop/playlists.py -%%PYTHON_SITELIBDIR%%/lollypop/playlists.pyc -%%PYTHON_SITELIBDIR%%/lollypop/playlists.pyo -%%PYTHON_SITELIBDIR%%/lollypop/popalbums.py -%%PYTHON_SITELIBDIR%%/lollypop/popalbums.pyc -%%PYTHON_SITELIBDIR%%/lollypop/popalbums.pyo -%%PYTHON_SITELIBDIR%%/lollypop/popimages.py -%%PYTHON_SITELIBDIR%%/lollypop/popimages.pyc -%%PYTHON_SITELIBDIR%%/lollypop/popimages.pyo -%%PYTHON_SITELIBDIR%%/lollypop/popmenu.py -%%PYTHON_SITELIBDIR%%/lollypop/popmenu.pyc -%%PYTHON_SITELIBDIR%%/lollypop/popmenu.pyo -%%PYTHON_SITELIBDIR%%/lollypop/queue.py -%%PYTHON_SITELIBDIR%%/lollypop/queue.pyc -%%PYTHON_SITELIBDIR%%/lollypop/queue.pyo +%%PYTHON_SITELIBDIR%%/lollypop/pop_album.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_albums.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_artwork.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_information.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_lastfm.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_menu.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_next.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_playlists.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_queue.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_radio.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_search.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_slider.py +%%PYTHON_SITELIBDIR%%/lollypop/pop_tunein.py +%%PYTHON_SITELIBDIR%%/lollypop/progressbar.py +%%PYTHON_SITELIBDIR%%/lollypop/radios.py %%PYTHON_SITELIBDIR%%/lollypop/search.py -%%PYTHON_SITELIBDIR%%/lollypop/search.pyc -%%PYTHON_SITELIBDIR%%/lollypop/search.pyo %%PYTHON_SITELIBDIR%%/lollypop/selectionlist.py -%%PYTHON_SITELIBDIR%%/lollypop/selectionlist.pyc -%%PYTHON_SITELIBDIR%%/lollypop/selectionlist.pyo %%PYTHON_SITELIBDIR%%/lollypop/settings.py -%%PYTHON_SITELIBDIR%%/lollypop/settings.pyc -%%PYTHON_SITELIBDIR%%/lollypop/settings.pyo +%%PYTHON_SITELIBDIR%%/lollypop/sqlcursor.py +%%PYTHON_SITELIBDIR%%/lollypop/sync_mtp.py %%PYTHON_SITELIBDIR%%/lollypop/tagreader.py -%%PYTHON_SITELIBDIR%%/lollypop/tagreader.pyc -%%PYTHON_SITELIBDIR%%/lollypop/tagreader.pyo %%PYTHON_SITELIBDIR%%/lollypop/toolbar.py -%%PYTHON_SITELIBDIR%%/lollypop/toolbar.pyc -%%PYTHON_SITELIBDIR%%/lollypop/toolbar.pyo +%%PYTHON_SITELIBDIR%%/lollypop/toolbar_end.py +%%PYTHON_SITELIBDIR%%/lollypop/toolbar_info.py +%%PYTHON_SITELIBDIR%%/lollypop/toolbar_playback.py +%%PYTHON_SITELIBDIR%%/lollypop/toolbar_title.py %%PYTHON_SITELIBDIR%%/lollypop/utils.py -%%PYTHON_SITELIBDIR%%/lollypop/utils.pyc -%%PYTHON_SITELIBDIR%%/lollypop/utils.pyo %%PYTHON_SITELIBDIR%%/lollypop/view.py -%%PYTHON_SITELIBDIR%%/lollypop/view.pyc -%%PYTHON_SITELIBDIR%%/lollypop/view.pyo -%%PYTHON_SITELIBDIR%%/lollypop/view_album.py -%%PYTHON_SITELIBDIR%%/lollypop/view_album.pyc -%%PYTHON_SITELIBDIR%%/lollypop/view_album.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_albums_box.py +%%PYTHON_SITELIBDIR%%/lollypop/view_albums_list.py +%%PYTHON_SITELIBDIR%%/lollypop/view_artist.py +%%PYTHON_SITELIBDIR%%/lollypop/view_artist_albums.py %%PYTHON_SITELIBDIR%%/lollypop/view_container.py -%%PYTHON_SITELIBDIR%%/lollypop/view_container.pyc -%%PYTHON_SITELIBDIR%%/lollypop/view_container.pyo %%PYTHON_SITELIBDIR%%/lollypop/view_device.py -%%PYTHON_SITELIBDIR%%/lollypop/view_device.pyc -%%PYTHON_SITELIBDIR%%/lollypop/view_device.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_lyrics.py %%PYTHON_SITELIBDIR%%/lollypop/view_playlists.py -%%PYTHON_SITELIBDIR%%/lollypop/view_playlists.pyc -%%PYTHON_SITELIBDIR%%/lollypop/view_playlists.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_radios.py +%%PYTHON_SITELIBDIR%%/lollypop/view_tracks.py %%PYTHON_SITELIBDIR%%/lollypop/widgets_album.py -%%PYTHON_SITELIBDIR%%/lollypop/widgets_album.pyc -%%PYTHON_SITELIBDIR%%/lollypop/widgets_album.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_album_detailed.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_album_simple.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_context.py %%PYTHON_SITELIBDIR%%/lollypop/widgets_device.py -%%PYTHON_SITELIBDIR%%/lollypop/widgets_device.pyc -%%PYTHON_SITELIBDIR%%/lollypop/widgets_device.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_indicator.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_loved.py %%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.py -%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.pyc -%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_radio.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_rating.py %%PYTHON_SITELIBDIR%%/lollypop/widgets_track.py -%%PYTHON_SITELIBDIR%%/lollypop/widgets_track.pyc -%%PYTHON_SITELIBDIR%%/lollypop/widgets_track.pyo %%PYTHON_SITELIBDIR%%/lollypop/window.py -%%PYTHON_SITELIBDIR%%/lollypop/window.pyc -%%PYTHON_SITELIBDIR%%/lollypop/window.pyo -share/appdata/lollypop.appdata.xml -share/applications/lollypop.desktop -share/help/C/lollypop/figures/lollypop-logo.png -share/help/C/lollypop/index.page -share/help/C/lollypop/legal.xml -share/help/ca/lollypop/figures/lollypop-logo.png -share/help/ca/lollypop/index.page -share/help/ca/lollypop/legal.xml -share/help/cs/lollypop/figures/lollypop-logo.png -share/help/cs/lollypop/index.page -share/help/cs/lollypop/legal.xml -share/help/de/lollypop/figures/lollypop-logo.png -share/help/de/lollypop/index.page -share/help/de/lollypop/legal.xml -share/help/es/lollypop/figures/lollypop-logo.png -share/help/es/lollypop/index.page -share/help/es/lollypop/legal.xml -share/help/fi/lollypop/figures/lollypop-logo.png -share/help/fi/lollypop/index.page -share/help/fi/lollypop/legal.xml -share/help/fr/lollypop/figures/lollypop-logo.png -share/help/fr/lollypop/index.page -share/help/fr/lollypop/legal.xml -share/help/he/lollypop/figures/lollypop-logo.png -share/help/he/lollypop/index.page -share/help/he/lollypop/legal.xml -share/help/it/lollypop/figures/lollypop-logo.png -share/help/it/lollypop/index.page -share/help/it/lollypop/legal.xml -share/help/nl/lollypop/figures/lollypop-logo.png -share/help/nl/lollypop/index.page -share/help/nl/lollypop/legal.xml -share/help/pl/lollypop/figures/lollypop-logo.png -share/help/pl/lollypop/index.page -share/help/pl/lollypop/legal.xml -share/help/pt_BR/lollypop/figures/lollypop-logo.png -share/help/pt_BR/lollypop/index.page -share/help/pt_BR/lollypop/legal.xml -share/help/ru/lollypop/figures/lollypop-logo.png -share/help/ru/lollypop/index.page -share/help/ru/lollypop/legal.xml -share/help/sk/lollypop/figures/lollypop-logo.png -share/help/sk/lollypop/index.page -share/help/sk/lollypop/legal.xml -share/help/sr/lollypop/figures/lollypop-logo.png -share/help/sr/lollypop/index.page -share/help/sr/lollypop/legal.xml -share/help/uk/lollypop/figures/lollypop-logo.png -share/help/uk/lollypop/index.page -share/help/uk/lollypop/legal.xml -share/icons/hicolor/16x16/apps/lollypop.png -share/icons/hicolor/22x22/apps/lollypop.png -share/icons/hicolor/256x256/apps/lollypop.png -share/icons/hicolor/32x32/apps/lollypop.png -share/icons/hicolor/48x48/apps/lollypop.png +libexec/lollypop-sp +share/applications/org.gnome.Lollypop.desktop +share/dbus-1/services/org.gnome.Lollypop.SearchProvider.service +share/gnome-shell/search-providers/lollypop-search-provider.ini +share/icons/hicolor/16x16/apps/org.gnome.Lollypop.png +share/icons/hicolor/22x22/apps/org.gnome.Lollypop.png +share/icons/hicolor/256x256/apps/org.gnome.Lollypop.png +share/icons/hicolor/32x32/apps/org.gnome.Lollypop.png +share/icons/hicolor/48x48/apps/org.gnome.Lollypop.png +share/icons/hicolor/scalable/apps/org.gnome.Lollypop-symbolic.svg share/locale/ca/LC_MESSAGES/lollypop.mo share/locale/cs/LC_MESSAGES/lollypop.mo +share/locale/da/LC_MESSAGES/lollypop.mo share/locale/de/LC_MESSAGES/lollypop.mo +share/locale/el/LC_MESSAGES/lollypop.mo +share/locale/en_IE/LC_MESSAGES/lollypop.mo +share/locale/eo/LC_MESSAGES/lollypop.mo share/locale/es/LC_MESSAGES/lollypop.mo +share/locale/es_EC/LC_MESSAGES/lollypop.mo share/locale/fi/LC_MESSAGES/lollypop.mo share/locale/fr/LC_MESSAGES/lollypop.mo +share/locale/ga/LC_MESSAGES/lollypop.mo share/locale/he/LC_MESSAGES/lollypop.mo +share/locale/hu/LC_MESSAGES/lollypop.mo +share/locale/id/LC_MESSAGES/lollypop.mo share/locale/it/LC_MESSAGES/lollypop.mo +share/locale/ja/LC_MESSAGES/lollypop.mo +share/locale/ka/LC_MESSAGES/lollypop.mo +share/locale/lt/LC_MESSAGES/lollypop.mo +share/locale/nb_NO/LC_MESSAGES/lollypop.mo share/locale/nl/LC_MESSAGES/lollypop.mo +share/locale/nl_BE/LC_MESSAGES/lollypop.mo share/locale/pl/LC_MESSAGES/lollypop.mo share/locale/pt_BR/LC_MESSAGES/lollypop.mo +share/locale/pt_PT/LC_MESSAGES/lollypop.mo +share/locale/ro/LC_MESSAGES/lollypop.mo +share/locale/ru/LC_MESSAGES/lollypop.mo share/locale/sk/LC_MESSAGES/lollypop.mo share/locale/sr/LC_MESSAGES/lollypop.mo +share/locale/sr@latin/LC_MESSAGES/lollypop.mo +share/locale/sv/LC_MESSAGES/lollypop.mo +share/locale/tr/LC_MESSAGES/lollypop.mo share/locale/uk/LC_MESSAGES/lollypop.mo +share/locale/zh_CN/LC_MESSAGES/lollypop.mo %%DATADIR%%/lollypop.gresource +share/metainfo/org.gnome.Lollypop.appdata.xml +@dir %%PYTHON_SITELIBDIR%%/lollypop/thirdparty diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile index 676182ec0a3..b1122eec110 100644 --- a/audio/qjackctl/Makefile +++ b/audio/qjackctl/Makefile @@ -3,7 +3,7 @@ PORTNAME= qjackctl DISTVERSIONPREFIX= qjackctl_ -DISTVERSION= 0_5_2 +DISTVERSION= 0_5_3 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org diff --git a/audio/qjackctl/distinfo b/audio/qjackctl/distinfo index 2a5bb14e433..52aa7d8910d 100644 --- a/audio/qjackctl/distinfo +++ b/audio/qjackctl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527531912 -SHA256 (rncbc-qjackctl-qjackctl_0_5_2_GH0.tar.gz) = c896bf4b4ed45c788753e7575d23eadd98280a04ef997bf82c324b21cfe80c92 -SIZE (rncbc-qjackctl-qjackctl_0_5_2_GH0.tar.gz) = 816781 +TIMESTAMP = 1532278889 +SHA256 (rncbc-qjackctl-qjackctl_0_5_3_GH0.tar.gz) = c388f4ebeee2928982b87d417785dbbe2e2b7d382fd55e5738ab15f11aea522f +SIZE (rncbc-qjackctl-qjackctl_0_5_3_GH0.tar.gz) = 840259 diff --git a/audio/qjackctl/pkg-plist b/audio/qjackctl/pkg-plist index 0552e6b9ecd..cba64c6507d 100644 --- a/audio/qjackctl/pkg-plist +++ b/audio/qjackctl/pkg-plist @@ -11,4 +11,5 @@ share/metainfo/qjackctl.appdata.xml %%DATADIR%%/translations/qjackctl_it.qm %%DATADIR%%/translations/qjackctl_ja.qm %%DATADIR%%/translations/qjackctl_nl.qm +%%DATADIR%%/translations/qjackctl_pt.qm %%DATADIR%%/translations/qjackctl_ru.qm diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile index eff22916bda..111d162ae81 100644 --- a/audio/qsynth/Makefile +++ b/audio/qsynth/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qsynth -PORTVERSION= 0.5.1 +PORTVERSION= 0.5.2 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/qsynth/distinfo b/audio/qsynth/distinfo index c724dd66ee1..22471b5542a 100644 --- a/audio/qsynth/distinfo +++ b/audio/qsynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530081200 -SHA256 (qsynth-0.5.1.tar.gz) = 579144c47813cf8426026fe3028abbe84c3d490311f1dd49ddcbc5056d0ef34e -SIZE (qsynth-0.5.1.tar.gz) = 262803 +TIMESTAMP = 1532335879 +SHA256 (qsynth-0.5.2.tar.gz) = bb85a6e393544bd24a4c708e7279a88b2dab228bdc4440c78684f91b7057d3e5 +SIZE (qsynth-0.5.2.tar.gz) = 264878 diff --git a/converters/ytnef/Makefile b/converters/ytnef/Makefile index 8e0cd9dcdeb..bed0c26bff0 100644 --- a/converters/ytnef/Makefile +++ b/converters/ytnef/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ytnef -PORTVERSION= 1.9.2 +PORTVERSION= 1.9.3 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= converters mail @@ -15,12 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= p5-MIME-Tools>=0:mail/p5-MIME-Tools +USES= autoreconf libtool pathfix perl5 shebangfix + USE_GITHUB= yes GH_ACCOUNT= Yeraze -USES= autoreconf libtool pathfix perl5 shebangfix -SHEBANG_FILES= ytnef/ytnefprocess USE_PERL5= run + +SHEBANG_FILES= ytnef/ytnefprocess GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes diff --git a/converters/ytnef/distinfo b/converters/ytnef/distinfo index fd773d5913a..9f92863ab65 100644 --- a/converters/ytnef/distinfo +++ b/converters/ytnef/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490808908 -SHA256 (Yeraze-ytnef-v1.9.2_GH0.tar.gz) = 48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad -SIZE (Yeraze-ytnef-v1.9.2_GH0.tar.gz) = 300945 +TIMESTAMP = 1532200202 +SHA256 (Yeraze-ytnef-v1.9.3_GH0.tar.gz) = 41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f +SIZE (Yeraze-ytnef-v1.9.3_GH0.tar.gz) = 301338 diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 90bac50d645..e7c608d0a6b 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -70,7 +70,8 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ XDG_CONFIG_HOME=${WRKDIR}/xdg-config \ XDG_UTILS_INSTALL_MODE=system \ - QMAKE=${QMAKE} + QMAKE=${QMAKE} \ + SIP_BIN=sip-${PYTHON_VER} post-patch: @${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \ diff --git a/devel/R-cran-evaluate/Makefile b/devel/R-cran-evaluate/Makefile index dfa08ef7f3b..1da3f28e218 100644 --- a/devel/R-cran-evaluate/Makefile +++ b/devel/R-cran-evaluate/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= evaluate -PORTVERSION= 0.10.1 -PORTREVISION= 1 +PORTVERSION= 0.11 CATEGORIES= devel DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/R-cran-evaluate/distinfo b/devel/R-cran-evaluate/distinfo index d824a4497d0..09c891bb954 100644 --- a/devel/R-cran-evaluate/distinfo +++ b/devel/R-cran-evaluate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498635608 -SHA256 (evaluate_0.10.1.tar.gz) = c9a763895d3f460dbf87c43a6469e4b41a251a74477df8c5d7e7d2b66cdd1b1c -SIZE (evaluate_0.10.1.tar.gz) = 22177 +TIMESTAMP = 1532170228 +SHA256 (evaluate_0.11.tar.gz) = b04805ffb56d82e2d5b044aa32de7e9ef4162ea619fd368f83e03dbd49631bcd +SIZE (evaluate_0.11.tar.gz) = 22565 diff --git a/devel/R-cran-glue/Makefile b/devel/R-cran-glue/Makefile index 581b0d4e8e4..d124b378201 100644 --- a/devel/R-cran-glue/Makefile +++ b/devel/R-cran-glue/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= glue -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.0 CATEGORIES= devel DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/R-cran-glue/distinfo b/devel/R-cran-glue/distinfo index 0a210bf1be6..b2a7626ec95 100644 --- a/devel/R-cran-glue/distinfo +++ b/devel/R-cran-glue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520818168 -SHA256 (glue_1.2.0.tar.gz) = 19275b34ee6a1bcad05360b7eb996cebaa1402f189a5dfb084e695d423f2296e -SIZE (glue_1.2.0.tar.gz) = 28193 +TIMESTAMP = 1532307261 +SHA256 (glue_1.3.0.tar.gz) = 789e5a44c3635c3d3db26666e635e88adcf61cd02b75465125d95d7a12291cee +SIZE (glue_1.3.0.tar.gz) = 56368 diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile index 87884461acb..1fab39d9b92 100644 --- a/devel/pear-HTML_QuickForm/Makefile +++ b/devel/pear-HTML_QuickForm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= HTML_QuickForm -PORTVERSION= 3.2.14 +PORTVERSION= 3.2.16 CATEGORIES= devel www pear MAINTAINER= joneum@FreeBSD.org diff --git a/devel/pear-HTML_QuickForm/distinfo b/devel/pear-HTML_QuickForm/distinfo index fc607502b08..ca7f3e666e9 100644 --- a/devel/pear-HTML_QuickForm/distinfo +++ b/devel/pear-HTML_QuickForm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497163093 -SHA256 (PEAR/HTML_QuickForm-3.2.14.tgz) = 16b2f9065cc2f77642388bee82007bdd74e8dcede502d297abcfedb0a6625d0c -SIZE (PEAR/HTML_QuickForm-3.2.14.tgz) = 103993 +TIMESTAMP = 1532282520 +SHA256 (PEAR/HTML_QuickForm-3.2.16.tgz) = 6da5cf48333678c2db3e6c29b0da5a37bfe6d3187e7943f4848d3496f8f47c5a +SIZE (PEAR/HTML_QuickForm-3.2.16.tgz) = 103788 diff --git a/devel/py-pika/Makefile b/devel/py-pika/Makefile index d2cc26fc176..b4e33595521 100644 --- a/devel/py-pika/Makefile +++ b/devel/py-pika/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= pika -PORTVERSION= 0.10.0 +PORTVERSION= 0.12.0 CATEGORIES= devel net -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org @@ -13,7 +12,18 @@ COMMENT= Python AMQP Client Library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} + +# 2.7,3.4+ USES= python +USE_GITHUB= yes USE_PYTHON= autoplist distutils +NO_ARCH= yes + +do-test: + @cd ${TEST_WRKSRC} && ${PYTHON_CMD} -m nose + .include diff --git a/devel/py-pika/distinfo b/devel/py-pika/distinfo index 88ac1920acc..642e11f6bb5 100644 --- a/devel/py-pika/distinfo +++ b/devel/py-pika/distinfo @@ -1,2 +1,3 @@ -SHA256 (pika-0.10.0.tar.gz) = 7277b4d12a99efa4058782614d84138983f9f89d690bdfcea66290d810806459 -SIZE (pika-0.10.0.tar.gz) = 82642 +TIMESTAMP = 1532256461 +SHA256 (pika-pika-0.12.0_GH0.tar.gz) = 3b1bd9025b63ad6fdd183dd79010620fa168966adda6154a23a7d5ed4f88cf9d +SIZE (pika-pika-0.12.0_GH0.tar.gz) = 243292 diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile index 69c8018e18e..a00f84164a1 100644 --- a/devel/py-simpy/Makefile +++ b/devel/py-simpy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= simpy -PORTVERSION= 3.0.10 +PORTVERSION= 3.0.11 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-simpy/distinfo b/devel/py-simpy/distinfo index 4d9818a3831..bb0a082c5b3 100644 --- a/devel/py-simpy/distinfo +++ b/devel/py-simpy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473148462 -SHA256 (simpy-3.0.10.tar.gz) = 0d8a79de3dc8b83102dc51090a6bf10d3e3a2944f0cf294fe72ed998f2a0aca1 -SIZE (simpy-3.0.10.tar.gz) = 386850 +TIMESTAMP = 1532301998 +SHA256 (simpy-3.0.11.tar.gz) = d09625b9b01f34242ae100fe6bdb6c9508da181a08419ab00cc2bd47c7ec0f43 +SIZE (simpy-3.0.11.tar.gz) = 388624 diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index c1cbaba16f0..cceef2b1b90 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -3,7 +3,7 @@ PORTNAME= focuswriter DISTVERSIONPREFIX= v -DISTVERSION= 1.6.14 +DISTVERSION= 1.6.15 CATEGORIES= editors MAINTAINER= lightside@gmx.com diff --git a/editors/focuswriter/distinfo b/editors/focuswriter/distinfo index 48a767c1862..b07c4c88fd6 100644 --- a/editors/focuswriter/distinfo +++ b/editors/focuswriter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530904276 -SHA256 (gottcode-focuswriter-v1.6.14_GH0.tar.gz) = b8478adbf329f9bcffe20855dbf91300347a50637539f34c08c75229e89e590b -SIZE (gottcode-focuswriter-v1.6.14_GH0.tar.gz) = 10489376 +TIMESTAMP = 1532100936 +SHA256 (gottcode-focuswriter-v1.6.15_GH0.tar.gz) = 167be0b4e58b4015f74c50d5cc0362cd286fd21fb972d8f74de7c683ae5cb381 +SIZE (gottcode-focuswriter-v1.6.15_GH0.tar.gz) = 10497092 diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 229e8cbe09d..f592b06a241 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ https://dev-www.libreoffice.org/src/:src \ https://dev-www.libreoffice.org/extern/:ext diff --git a/finance/prestashop/Makefile b/finance/prestashop/Makefile index 45e3ceca78a..98e4d4c370f 100644 --- a/finance/prestashop/Makefile +++ b/finance/prestashop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= prestashop -PORTVERSION= 1.7.4.0 +PORTVERSION= 1.7.4.1 CATEGORIES= finance www MASTER_SITES= http://www.prestashop.com/download/old/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/finance/prestashop/distinfo b/finance/prestashop/distinfo index 684afa0a8b2..2636e4ea9d0 100644 --- a/finance/prestashop/distinfo +++ b/finance/prestashop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530809700 -SHA256 (prestashop_1.7.4.0.zip) = 7d906d9ab694b745e83e78af8c3a5f2b4570333b3bcc817eb6f600871068e15e -SIZE (prestashop_1.7.4.0.zip) = 67823425 +TIMESTAMP = 1532304276 +SHA256 (prestashop_1.7.4.1.zip) = f449e6875b9a2345479e37359401c7c4010fdffca89dd1c4d626639e7eca37ab +SIZE (prestashop_1.7.4.1.zip) = 67840046 diff --git a/games/Makefile b/games/Makefile index edf26224bf9..a5972efb06c 100644 --- a/games/Makefile +++ b/games/Makefile @@ -727,6 +727,7 @@ SUBDIR += oolite SUBDIR += oonsoo SUBDIR += open-adventure + SUBDIR += openage SUBDIR += openalchemist SUBDIR += openarena SUBDIR += openarena-data diff --git a/games/chessx/Makefile b/games/chessx/Makefile index dbe5d8e957f..28f4f53b7db 100644 --- a/games/chessx/Makefile +++ b/games/chessx/Makefile @@ -1,21 +1,19 @@ # $FreeBSD$ PORTNAME= chessx -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.4.6 CATEGORIES= games MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= Qt 4 chess database application +COMMENT= Qt 5 chess database application LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= desktop-file-utils qmake qt:4 shared-mime-info tar:tgz -USE_QT= corelib gui svg network linguisttools_build \ - moc_build qmake_build rcc_build uic_build -QMAKE_ARGS+= QMAKE_LRELEASE=${LRELEASE} +USES= desktop-file-utils qmake:outsource qt:5 shared-mime-info tar:tgz +USE_QT= buildtools_build concurrent core gui linguisttools_build multimedia \ + network opengl printsupport svg widgets xml PLIST_FILES= bin/chessx \ share/applications/chessx.desktop \ @@ -23,10 +21,10 @@ PLIST_FILES= bin/chessx \ OPTIONS_DEFINE= STOCKFISH CRAFTY -STOCKFISH_DESC= Install Stockfish Chess Engine -STOCKFISH_RUN_DEPENDS= stockfish:games/stockfish - CRAFTY_DESC= Install Crafty Chess Application CRAFTY_RUN_DEPENDS= crafty:games/crafty +STOCKFISH_DESC= Install Stockfish Chess Engine +STOCKFISH_RUN_DEPENDS= stockfish:games/stockfish + .include diff --git a/games/chessx/distinfo b/games/chessx/distinfo index 51ddd7d2594..b82442b6ec4 100644 --- a/games/chessx/distinfo +++ b/games/chessx/distinfo @@ -1,2 +1,3 @@ -SHA256 (chessx-1.3.2.tgz) = b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff -SIZE (chessx-1.3.2.tgz) = 4107133 +TIMESTAMP = 1532163987 +SHA256 (chessx-1.4.6.tgz) = ad951910a3bd53f5655f9e85101e7969b536078473e09a2a7dded6ef171a68ed +SIZE (chessx-1.4.6.tgz) = 4223076 diff --git a/games/chessx/files/patch-chessx.pro b/games/chessx/files/patch-chessx.pro index abdfd853a6d..8966d94c12a 100644 --- a/games/chessx/files/patch-chessx.pro +++ b/games/chessx/files/patch-chessx.pro @@ -1,6 +1,6 @@ ---- chessx.pro.orig 2015-05-05 13:46:26 UTC +--- chessx.pro.orig 2018-07-21 09:39:34 UTC +++ chessx.pro -@@ -393,6 +393,15 @@ macx { +@@ -445,6 +445,16 @@ macx { QMAKE_INFO_PLIST = mac_osx/Info.plist } @@ -13,6 +13,7 @@ + INSTALLS += target desktop pixmaps +} + - RESOURCES = resources.qrc ++ + RESOURCES = \ + resources.qrc - TRANSLATIONS = i18n/chessx_de.ts \ diff --git a/games/chessx/files/patch-src__database__threadedguess.cpp b/games/chessx/files/patch-src__database__threadedguess.cpp deleted file mode 100644 index cfa9b816da2..00000000000 --- a/games/chessx/files/patch-src__database__threadedguess.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/database/threadedguess.cpp.orig 2015-04-28 18:00:47 UTC -+++ src/database/threadedguess.cpp -@@ -2,6 +2,7 @@ - * Copyright (C) 2014 by Jens Nissen jens-chessx@gmx.net * - ****************************************************************************/ - -+#include - #include "threadedguess.h" - #include "guess.h" - diff --git a/games/chessx/pkg-descr b/games/chessx/pkg-descr index 54e295484c1..bf97d2d4de5 100644 --- a/games/chessx/pkg-descr +++ b/games/chessx/pkg-descr @@ -1,4 +1,4 @@ -ChessX is an open source chess database based on Qt4. With ChessX you +ChessX is an open source chess database based on Qt5. With ChessX you can operate on your collection of chess games in many ways: browse, edit, add, organize, analyze, etc. Additionally ChessX can interface with chess engines via UCI and Winboard protocol. diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile index 8fe7b659e33..28b797e13f5 100644 --- a/games/corsix-th/Makefile +++ b/games/corsix-th/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= corsixth -PORTVERSION= 0.61 +PORTVERSION= 0.62 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= games MAINTAINER= madpilot@FreeBSD.org @@ -16,13 +15,21 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \ ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg -USES= cmake compiler:c++11-lib dos2unix iconv lua pkgconfig +USES= cmake compiler:c++11-lib desktop-file-utils dos2unix iconv \ + lua pkgconfig USE_SDL= mixer2 DOS2UNIX_FILES= CMake/FindFFmpeg.cmake \ CorsixTH/CMakeLists.txt \ CorsixTH/Src/iso_fs.cpp CMAKE_ARGS= -DWITH_LUAJIT=OFF CFLAGS+= -I${ICONV_PREFIX}/include +DATADIR= ${PREFIX}/share/corsix-th +DESKTOP_ENTRIES= "CorsixTH" \ + "${COMMENT}" \ + "${PREFIX}/share/pixmaps/corsix-th.png" \ + "${PREFIX}/bin/corsix-th" \ + "Game;" \ + "" USE_GITHUB= yes GH_ACCOUNT= CorsixTH @@ -36,17 +43,13 @@ MOVIES_CMAKE_ON= -DWITH_MOVIES=ON MOVIES_CMAKE_OFF= -DWITH_MOVIES=OFF MOVIES_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg -post-patch: -# Allow the game to find its resources without wrapper scripts - @${REINPLACE_CMD} -e \ - '/return loadfile/s,name,\\"${DATADIR}/\\" .. &,' \ - ${WRKSRC}/CorsixTH/Src/main.cpp - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/CorsixTH/CorsixTH ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/CorsixTH/corsix-th ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/CorsixTH/CorsixTH.lua ${STAGEDIR}${DATADIR} cd ${WRKSRC}/CorsixTH && ${COPYTREE_SHARE} "Bitmap Levels Lua" \ ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/LDocGen/output/logo.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/corsix-th.png .include diff --git a/games/corsix-th/distinfo b/games/corsix-th/distinfo index 93be59fe8c0..278d0c9cf70 100644 --- a/games/corsix-th/distinfo +++ b/games/corsix-th/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513866855 -SHA256 (CorsixTH-CorsixTH-v0.61_GH0.tar.gz) = b8e19743cd499436dce58af67479997e621fe50e21e31f08f440d2303e11f5d6 -SIZE (CorsixTH-CorsixTH-v0.61_GH0.tar.gz) = 3513104 +TIMESTAMP = 1532275328 +SHA256 (CorsixTH-CorsixTH-v0.62_GH0.tar.gz) = b219270310255493c881a09bb4a5569f34a72cdaf3c3be920c1036a2450317ce +SIZE (CorsixTH-CorsixTH-v0.62_GH0.tar.gz) = 3461932 diff --git a/games/corsix-th/pkg-plist b/games/corsix-th/pkg-plist index 621512103a2..f9981d2602a 100644 --- a/games/corsix-th/pkg-plist +++ b/games/corsix-th/pkg-plist @@ -1,4 +1,5 @@ -bin/CorsixTH +bin/corsix-th +share/pixmaps/corsix-th.png %%DATADIR%%/Bitmap/aux_ui.dat %%DATADIR%%/Bitmap/aux_ui.spec %%DATADIR%%/Bitmap/aux_ui.tab @@ -69,6 +70,7 @@ bin/CorsixTH %%DATADIR%%/Lua/calls_dispatcher.lua %%DATADIR%%/Lua/class.lua %%DATADIR%%/Lua/config_finder.lua +%%DATADIR%%/Lua/date.lua %%DATADIR%%/Lua/debug_script.lua %%DATADIR%%/Lua/diagnosis/diag_blood_machine.lua %%DATADIR%%/Lua/diagnosis/diag_cardiogram.lua diff --git a/games/openage/Makefile b/games/openage/Makefile new file mode 100644 index 00000000000..31546d10e2b --- /dev/null +++ b/games/openage/Makefile @@ -0,0 +1,53 @@ +# $FreeBSD$ + +PORTNAME= openage +DISTVERSIONPREFIX= v +DISTVERSION= 0.3.0-1262 +DISTVERSIONSUFFIX= -ga554ab49 +CATEGORIES= games + +MAINTAINER= martinfilla@post.cz +COMMENT= Free engine clone of the Genie Engine + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/legal/GPLv3 + +BUILD_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} +LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ + libogg.so:audio/libogg \ + libopus.so:audio/opus \ + libopusfile.so:audio/opusfile \ + libpng16.so:graphics/png \ + libnyan.so:lang/nyan +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} + +USES= cmake:outsource compiler:c++17-lang python:3.4+ qt:5 shebangfix +SHEBANG_FILES= configure run.py buildsystem/cythonize.py +USE_GITHUB= yes +GH_ACCOUNT= SFTtech +USE_SDL= image2 sdl2 +USE_GL= gl glu +USE_QT= core gui network qml quick buildtools_build qmake_build +USE_PYTHON= cython +USE_LDCONFIG= yes + +CMAKE_OFF= WANT_BACKTRACE WANT_GPERFTOOLS_PROFILER WANT_INOTIFY +CMAKE_ARGS= -DGLOBAL_CONFIG_DIR:STRING=${ETCDIR} + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|' ${WRKSRC}/buildsystem/modules/FindPython.cmake + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg + +.include diff --git a/games/openage/distinfo b/games/openage/distinfo new file mode 100644 index 00000000000..b14c233681a --- /dev/null +++ b/games/openage/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1531677826 +SHA256 (SFTtech-openage-v0.3.0-1262-ga554ab49_GH0.tar.gz) = a0c7de5b4a187fb991c4f3e560d80f1a7afc411812ab4d7ab49a63c61b446e29 +SIZE (SFTtech-openage-v0.3.0-1262-ga554ab49_GH0.tar.gz) = 2081730 diff --git a/games/openage/files/patch-libopenage_CMakeLists.txt b/games/openage/files/patch-libopenage_CMakeLists.txt new file mode 100644 index 00000000000..a3e4cc3db31 --- /dev/null +++ b/games/openage/files/patch-libopenage_CMakeLists.txt @@ -0,0 +1,178 @@ +--- libopenage/CMakeLists.txt.orig 2018-07-14 15:12:15 UTC ++++ libopenage/CMakeLists.txt +@@ -86,13 +86,21 @@ if(MSVC) + endif() + if(NOT APPLE AND NOT MSVC) + find_library(RT_LIB rt) +- if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") +- find_library(EXECINFO_LIB execinfo) +- endif() + endif() + +-find_library(FONTCONFIG_LIB fontconfig) ++if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Free|Net|Open)BSD") ++ find_library(EXECINFO_LIB execinfo) ++ find_path(NYAN_INCLUDE_DIR "nyan.h" PATHS /usr/local/include/nyan ) ++ find_library(NYAN_LIBRARY NAMES "nyan" PATHS /usr/local/lib ) ++ list(APPEND CMAKE_REQUIRED_INCLUDES ${NYAN_INCLUDE_DIR}) ++ list(APPEND CMAKE_REQUIRED_LIBRARIES ${NYAN_LIBRARY}) ++ ++# message(STATUS ${NYAN_INCLUDE_DIR}) ++# message(STATUS ${NYAN_LIBRARY}) ++endif() ++ + ++find_library(FONTCONFIG_LIB fontconfig) + find_package(Freetype REQUIRED) + find_package(OpenGL REQUIRED) + find_package(PNG REQUIRED) +@@ -115,74 +123,74 @@ endif() + + # first, try to locate nyan directly + # this discovers the system package or the user-registry package +-find_package(nyan CONFIG) ++#find_package(nyan CONFIG) + + # if this didn't work, we can download nyan like a git submodule. + # this is the treeish to be checked out. +-set(nyan_clone_version origin/master) ++#set(nyan_clone_version origin/master) + +-option( +- DOWNLOAD_NYAN +- "whether to clone the nyan project in case it is not found" +- OFF +-) ++#option( ++# DOWNLOAD_NYAN ++# "whether to clone the nyan project in case it is not found" ++# OFF ++#) + +-option( +- FORCE_DOWNLOAD_NYAN +- "Force the download and usage of the nyan project" +- OFF +-) ++#option( ++# FORCE_DOWNLOAD_NYAN ++# "Force the download and usage of the nyan project" ++# OFF ++#) + +-option( +- DISABLE_SUBPROJECT_UPDATES +- "Disable the automatic update of subprojects over the internet" +- OFF +-) ++#option( ++# DISABLE_SUBPROJECT_UPDATES ++# "Disable the automatic update of subprojects over the internet" ++# OFF ++#) + + # if nyan was not found, consider downloading it as subproject + # only use the subproject mode if it was requested + # or if it was used before. +-if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN) +- message(STATUS "Downloading nyan as submodule project...") +- +- if(DISABLE_SUBPROJECT_UPDATES) +- set(DISABLE_NYAN_UPDATES "DISABLE_UPDATES") +- endif() +- +- fetch_project( +- NAME nyan +- ${DISABLE_NYAN_UPDATES} +- GIT_REPOSITORY https://github.com/SFTtech/nyan +- GIT_TAG ${nyan_clone_version} +- ) +- +- # don't register nyan to the userpackage-repo! +- set(REGISTER_USERPACKAGE OFF) +- # don't generate the `doc` target again (name conflict!) +- set(DOXYGEN_ENABLE OFF) +- +- # register the targets +- add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR}) +- +- message(STATUS "nyan processed successfully!") +- +-elseif(NOT nyan_FOUND) +- message(FATAL_ERROR " +- Could not find the cmake package configuration file \"nyanConfig.cmake\". +- To find it, you have several options: +- * If your distribution provides it, install \"nyan\" through the package manager. +- * If you want openage to automatically download \"nyan\", append `-DDOWNLOAD_NYAN=YES` to the cmake invocation or use `./configure --download-nyan`. +- * If you want to build nyan manually, follow the build instructions: +- [[ doc/building.md#nyan-installation ]] +- * If you already built nyan but it still can't be found (cmake package repo fails): +- * Try to set \"nyan_DIR\" to the nyan build directory (it contains nyanConfig.cmake) +- either through: \"./configure $youroptions -- -Dnyan_DIR=/home/dev/nyan/build\" +- or: \"cmake $yourotheroptions -Dnyan_DIR=/home/dev/nyan/build ..\" ++#if((NOT nyan_FOUND AND DOWNLOAD_NYAN) OR FORCE_DOWNLOAD_NYAN) ++# message(STATUS "Downloading nyan as submodule project...") ++# ++# if(DISABLE_SUBPROJECT_UPDATES) ++# set(DISABLE_NYAN_UPDATES "DISABLE_UPDATES") ++# endif() ++# ++# fetch_project( ++# NAME nyan ++# ${DISABLE_NYAN_UPDATES} ++# GIT_REPOSITORY https://github.com/SFTtech/nyan ++# GIT_TAG ${nyan_clone_version} ++# ) ++# ++# # don't register nyan to the userpackage-repo! ++# set(REGISTER_USERPACKAGE OFF) ++# # don't generate the `doc` target again (name conflict!) ++# set(DOXYGEN_ENABLE OFF) ++# ++# # register the targets ++# add_subdirectory(${nyan_SOURCE_DIR} ${nyan_BINARY_DIR}) ++# ++# message(STATUS "nyan processed successfully!") + +- In case of other problems, please try to figure them out (and tell us what you did). +- Contact information is in README.md. +-") +-endif() ++#elseif(NOT nyan_FOUND) ++# message(FATAL_ERROR " ++# Could not find the cmake package configuration file \"nyanConfig.cmake\". ++# To find it, you have several options: ++# * If your distribution provides it, install \"nyan\" through the package manager. ++# * If you want openage to automatically download \"nyan\", append `-DDOWNLOAD_NYAN=YES` to the cmake invocation or use `./configure --download-nyan`. ++# * If you want to build nyan manually, follow the build instructions: ++# [[ doc/building.md#nyan-installation ]] ++# * If you already built nyan but it still can't be found (cmake package repo fails): ++# * Try to set \"nyan_DIR\" to the nyan build directory (it contains nyanConfig.cmake) ++# either through: \"./configure $youroptions -- -Dnyan_DIR=/home/dev/nyan/build\" ++# or: \"cmake $yourotheroptions -Dnyan_DIR=/home/dev/nyan/build ..\" ++# ++# In case of other problems, please try to figure them out (and tell us what you did). ++# Contact information is in README.md. ++#") ++#endif() + + + if(GCCBacktrace_FOUND) +@@ -245,6 +253,7 @@ include_directories( + ${SDL2IMAGE_INCLUDE_DIRS} + ${HarfBuzz_INCLUDE_DIRS} + ${QTPLATFORM_INCLUDE_DIRS} ++ ${NYAN_INCLUDE_DIRS} + ) + + # link the executable to those libraries +@@ -265,7 +274,8 @@ target_link_libraries(libopenage + ${RT_LIB} + ${OGG_LIB} + ${EXECINFO_LIB} +- nyan::nyan ++ ${NYAN_LIBRARY} ++# nyan::nyan + + # TODO: change to PUBLIC (or, alternatively, remove all keywords + # of this type) when qt cmake scripts change declarations of the diff --git a/games/openage/files/patch-openage_default__dirs.py b/games/openage/files/patch-openage_default__dirs.py new file mode 100644 index 00000000000..c854e99323d --- /dev/null +++ b/games/openage/files/patch-openage_default__dirs.py @@ -0,0 +1,27 @@ +--- openage/default_dirs.py.orig 2018-07-15 14:29:49 UTC ++++ openage/default_dirs.py +@@ -33,6 +33,14 @@ LINUX_DIRS = { + "runtime_dir": ("XDG_RUNTIME_DIR", ("/run/user/$UID")), + } + ++FREEBSD_DIRS = { ++ "config_home": ("XDG_CONFIG_HOME", ("{HOME}/.config", {"HOME"})), ++ "data_home": ("XDG_DATA_HOME", ("{HOME}/.local/share", {"HOME"})), ++ "data_dirs": ("XDG_DATA_DIRS", ("/usr/local/share/", {})), ++ "config_dirs": ("XDG_CONFIG_DIRS", ("/etc/xdg", {})), ++ "cache_home": ("XDG_CACHE_HOME", ("{HOME}/.cache", {"HOME"})), ++ "runtime_dir": ("XDG_RUNTIME_DIR", ("/run/user/$UID")), ++} + + # Windows-specific paths + WINDOWS_DIRS = { +@@ -60,6 +68,9 @@ def get_dir(which): + elif sys.platform.startswith("win32"): + platform_table = WINDOWS_DIRS + ++ elif sys.platform.startswith("freebsd"): ++ platform_table = FREEBSD_DIRS ++ + else: + raise Exception("unsupported platform: '%s'" % sys.platform) + diff --git a/games/openage/pkg-descr b/games/openage/pkg-descr new file mode 100644 index 00000000000..f99822111da --- /dev/null +++ b/games/openage/pkg-descr @@ -0,0 +1,8 @@ +Openage: a volunteer project to create a free engine clone of the Genie Engine +used by Age of Empires, Age of Empires II (HD) and Star Wars: Galactic +Battlegrounds, comparable to projects like OpenMW, OpenRA, OpenTTD and +OpenRCT2. Openage uses the original game assets (such as sounds and graphics), +but (for obvious reasons) doesn't ship them. To play, you require an original +AoE II : TC installation or AoE II: HD (installation via Wine). + +WWW: https://openage.sft.mx/ diff --git a/games/openage/pkg-plist b/games/openage/pkg-plist new file mode 100644 index 00000000000..5677726160f --- /dev/null +++ b/games/openage/pkg-plist @@ -0,0 +1,280 @@ +%%ETCDIR%%/keybinds.oac +bin/openage +lib/libopenage.so +lib/libopenage.so.0 +%%PYTHON_SITELIBDIR%%/openage/__init__.py +%%PYTHON_SITELIBDIR%%/openage/__main__.py +%%PYTHON_SITELIBDIR%%/openage/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/__pycache__/__main__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/__pycache__/assets.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/__pycache__/config.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/__pycache__/default_dirs.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/assets.py +%%PYTHON_SITELIBDIR%%/openage/cabextract/__init__.py +%%PYTHON_SITELIBDIR%%/openage/cabextract/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cabextract/__pycache__/cab.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cabextract/__pycache__/lzxdstream.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cabextract/__pycache__/test.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cabextract/cab.py +%%PYTHON_SITELIBDIR%%/openage/cabextract/cabchecksum.so +%%PYTHON_SITELIBDIR%%/openage/cabextract/lzxd.so +%%PYTHON_SITELIBDIR%%/openage/cabextract/lzxdstream.py +%%PYTHON_SITELIBDIR%%/openage/cabextract/test.py +%%PYTHON_SITELIBDIR%%/openage/codegen/__init__.py +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/codegen.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/coord.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/cpp_testlist.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/gamespec_structs.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/listing.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/__pycache__/main.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/codegen/codegen.py +%%PYTHON_SITELIBDIR%%/openage/codegen/coord.py +%%PYTHON_SITELIBDIR%%/openage/codegen/cpp_testlist.py +%%PYTHON_SITELIBDIR%%/openage/codegen/gamespec_structs.py +%%PYTHON_SITELIBDIR%%/openage/codegen/listing.py +%%PYTHON_SITELIBDIR%%/openage/codegen/main.py +%%PYTHON_SITELIBDIR%%/openage/config.py +%%PYTHON_SITELIBDIR%%/openage/convert/__init__.py +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/binpack.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/blendomatic.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/changelog.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/colortable.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/driver.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/drs.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/fix_data.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/game_versions.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/hdlanguagefile.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/main.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/pefile.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/peresource.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/singlefile.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/slp_converter_pool.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/stringresource.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/__pycache__/texture.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/binpack.py +%%PYTHON_SITELIBDIR%%/openage/convert/blendomatic.py +%%PYTHON_SITELIBDIR%%/openage/convert/changelog.py +%%PYTHON_SITELIBDIR%%/openage/convert/colortable.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__init__.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/content_snippet.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/data_definition.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/data_formatter.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/entry_parser.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/exportable.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/generated_file.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/header_snippet.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/member_access.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/members.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/multisubtype_base.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/struct_definition.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/struct_snippet.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/__pycache__/util.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/content_snippet.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/data_definition.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/data_formatter.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/entry_parser.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/exportable.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/generated_file.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/header_snippet.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/member_access.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/members.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/multisubtype_base.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/struct_definition.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/struct_snippet.py +%%PYTHON_SITELIBDIR%%/openage/convert/dataformat/util.py +%%PYTHON_SITELIBDIR%%/openage/convert/driver.py +%%PYTHON_SITELIBDIR%%/openage/convert/drs.py +%%PYTHON_SITELIBDIR%%/openage/convert/fix_data.py +%%PYTHON_SITELIBDIR%%/openage/convert/game_versions.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__init__.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/civ.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/empiresdat.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/graphic.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/maps.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/playercolor.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/research.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/sound.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/tech.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/terrain.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/__pycache__/unit.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/civ.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/empiresdat.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/graphic.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/maps.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/playercolor.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/research.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/sound.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/tech.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/terrain.py +%%PYTHON_SITELIBDIR%%/openage/convert/gamedata/unit.py +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__init__.py +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__pycache__/langcodes.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__pycache__/langcodes_hd.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__pycache__/termcolors.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__pycache__/terrain_tile_size.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/__pycache__/texture.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/langcodes.py +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/langcodes_hd.py +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/termcolors.py +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/terrain_tile_size.py +%%PYTHON_SITELIBDIR%%/openage/convert/hardcoded/texture.py +%%PYTHON_SITELIBDIR%%/openage/convert/hdlanguagefile.py +%%PYTHON_SITELIBDIR%%/openage/convert/interface/__init__.py +%%PYTHON_SITELIBDIR%%/openage/convert/interface/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/interface/__pycache__/cutter.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/interface/__pycache__/hardcoded.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/interface/__pycache__/rename.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/interface/cutter.py +%%PYTHON_SITELIBDIR%%/openage/convert/interface/hardcoded.py +%%PYTHON_SITELIBDIR%%/openage/convert/interface/rename.py +%%PYTHON_SITELIBDIR%%/openage/convert/interface/visgrep.so +%%PYTHON_SITELIBDIR%%/openage/convert/main.py +%%PYTHON_SITELIBDIR%%/openage/convert/opus/__init__.py +%%PYTHON_SITELIBDIR%%/openage/convert/opus/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/opus/__pycache__/demo.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/convert/opus/demo.py +%%PYTHON_SITELIBDIR%%/openage/convert/opus/opusenc.so +%%PYTHON_SITELIBDIR%%/openage/convert/pefile.py +%%PYTHON_SITELIBDIR%%/openage/convert/peresource.py +%%PYTHON_SITELIBDIR%%/openage/convert/singlefile.py +%%PYTHON_SITELIBDIR%%/openage/convert/slp.so +%%PYTHON_SITELIBDIR%%/openage/convert/slp_converter_pool.py +%%PYTHON_SITELIBDIR%%/openage/convert/stringresource.py +%%PYTHON_SITELIBDIR%%/openage/convert/texture.py +%%PYTHON_SITELIBDIR%%/openage/cppinterface/__init__.py +%%PYTHON_SITELIBDIR%%/openage/cppinterface/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cppinterface/__pycache__/setup.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cppinterface/exctranslate.so +%%PYTHON_SITELIBDIR%%/openage/cppinterface/exctranslate_tests.so +%%PYTHON_SITELIBDIR%%/openage/cppinterface/pyobject.so +%%PYTHON_SITELIBDIR%%/openage/cppinterface/setup.py +%%PYTHON_SITELIBDIR%%/openage/cppinterface/setup_checker.so +%%PYTHON_SITELIBDIR%%/openage/cvar/__init__.py +%%PYTHON_SITELIBDIR%%/openage/cvar/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cvar/__pycache__/config_file.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cvar/__pycache__/location.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/cvar/config_file.py +%%PYTHON_SITELIBDIR%%/openage/cvar/cvar.so +%%PYTHON_SITELIBDIR%%/openage/cvar/location.py +%%PYTHON_SITELIBDIR%%/openage/default_dirs.py +%%PYTHON_SITELIBDIR%%/openage/game/__init__.py +%%PYTHON_SITELIBDIR%%/openage/game/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/game/__pycache__/main.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/game/main.py +%%PYTHON_SITELIBDIR%%/openage/game/main_cpp.so +%%PYTHON_SITELIBDIR%%/openage/log/__init__.py +%%PYTHON_SITELIBDIR%%/openage/log/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/log/__pycache__/tests.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/log/log_cpp.so +%%PYTHON_SITELIBDIR%%/openage/log/tests.py +%%PYTHON_SITELIBDIR%%/openage/testing/__init__.py +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/benchmark.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/doctest.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/list_processor.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/main.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/testing.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/__pycache__/testlist.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/testing/benchmark.py +%%PYTHON_SITELIBDIR%%/openage/testing/cpp_testing.so +%%PYTHON_SITELIBDIR%%/openage/testing/doctest.py +%%PYTHON_SITELIBDIR%%/openage/testing/list_processor.py +%%PYTHON_SITELIBDIR%%/openage/testing/main.py +%%PYTHON_SITELIBDIR%%/openage/testing/misc_cpp.so +%%PYTHON_SITELIBDIR%%/openage/testing/testing.py +%%PYTHON_SITELIBDIR%%/openage/testing/testlist.py +%%PYTHON_SITELIBDIR%%/openage/util/__init__.py +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/bytequeue.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/context.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/decorators.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/files.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/fsprinting.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/iterators.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/math.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/profiler.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/strings.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/struct.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/system.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/__pycache__/threading.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/bytequeue.py +%%PYTHON_SITELIBDIR%%/openage/util/context.py +%%PYTHON_SITELIBDIR%%/openage/util/decorators.py +%%PYTHON_SITELIBDIR%%/openage/util/filelike/__init__.py +%%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/abstract.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/fifo.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/readonly.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/filelike/__pycache__/stream.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/filelike/abstract.py +%%PYTHON_SITELIBDIR%%/openage/util/filelike/cpp.so +%%PYTHON_SITELIBDIR%%/openage/util/filelike/fifo.py +%%PYTHON_SITELIBDIR%%/openage/util/filelike/readonly.py +%%PYTHON_SITELIBDIR%%/openage/util/filelike/stream.py +%%PYTHON_SITELIBDIR%%/openage/util/files.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__init__.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/__init__.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/abstract.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/directory.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/filecollection.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/path.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/test.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/union.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/__pycache__/wrapper.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/openage/util/fslike/abstract.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/cpp.so +%%PYTHON_SITELIBDIR%%/openage/util/fslike/directory.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/filecollection.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/path.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/test.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/union.py +%%PYTHON_SITELIBDIR%%/openage/util/fslike/wrapper.py +%%PYTHON_SITELIBDIR%%/openage/util/fsprinting.py +%%PYTHON_SITELIBDIR%%/openage/util/iterators.py +%%PYTHON_SITELIBDIR%%/openage/util/math.py +%%PYTHON_SITELIBDIR%%/openage/util/profiler.py +%%PYTHON_SITELIBDIR%%/openage/util/strings.py +%%PYTHON_SITELIBDIR%%/openage/util/struct.py +%%PYTHON_SITELIBDIR%%/openage/util/system.py +%%PYTHON_SITELIBDIR%%/openage/util/threading.py +share/applications/openage.desktop +%%DATADIR%%/banner.svg +%%DATADIR%%/gaben.png +%%DATADIR%%/missing.png +%%DATADIR%%/qml/.gitignore +%%DATADIR%%/qml/Actions.qml +%%DATADIR%%/qml/ActionsGrid.qml +%%DATADIR%%/qml/BindsHelp.qml +%%DATADIR%%/qml/ButtonExtruded.qml +%%DATADIR%%/qml/ButtonExtrudedStyle.qml +%%DATADIR%%/qml/ButtonFlat.qml +%%DATADIR%%/qml/ButtonFlatStyle.qml +%%DATADIR%%/qml/CheckBoxFlat.qml +%%DATADIR%%/qml/CheckBoxFlatStyle.qml +%%DATADIR%%/qml/CreateGameWhenReady.qml +%%DATADIR%%/qml/GeneratorControl.qml +%%DATADIR%%/qml/GeneratorParametersConfiguration.qml +%%DATADIR%%/qml/IngameHud.qml +%%DATADIR%%/qml/Paper.qml +%%DATADIR%%/qml/TextFieldFlat.qml +%%DATADIR%%/qml/TextFieldFlatStyle.qml +%%DATADIR%%/qml/TypePicker.qml +%%DATADIR%%/qml/main.qml +%%DATADIR%%/shaders/alphamask.frag.glsl +%%DATADIR%%/shaders/alphamask.vert.glsl +%%DATADIR%%/shaders/equalsEpsilon.glsl +%%DATADIR%%/shaders/identity.vert.glsl +%%DATADIR%%/shaders/maptexture.frag.glsl +%%DATADIR%%/shaders/maptexture.vert.glsl +%%DATADIR%%/shaders/teamcolors.frag.glsl +%%DATADIR%%/shaders/texturefont.frag.glsl +%%DATADIR%%/shaders/texturefont.vert.glsl +%%DATADIR%%/textures/torn_paper_edge.docx +%%DATADIR%%/textures/torn_paper_edge.png +share/pixmaps/openage.svg +@dir etc/xdg diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index ec6aa9a7321..7b9e1cb87c7 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -3,7 +3,7 @@ PORTNAME= blender PORTVERSION= 2.79b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 44e2cc902fe..c5ab9da70f8 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/} EXTRACT_SUFX= .src.tar.gz -MAINTAINER= c47g@gmx.at +MAINTAINER= ports@FreeBSD.org COMMENT= SGI's Open Inventor (TM) LICENSE= LGPL21 diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 0e55e4ce8ca..07e257600b2 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mypaint -PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTVERSION= 1.2.1 CATEGORIES= graphics MASTER_SITES= https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/ diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo index ab2cc833aeb..528683a9e37 100644 --- a/graphics/mypaint/distinfo +++ b/graphics/mypaint/distinfo @@ -1,2 +1,3 @@ -SHA256 (mypaint-1.2.0.tar.xz) = cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2 -SIZE (mypaint-1.2.0.tar.xz) = 37895196 +TIMESTAMP = 1532315716 +SHA256 (mypaint-1.2.1.tar.xz) = ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7 +SIZE (mypaint-1.2.1.tar.xz) = 37897196 diff --git a/graphics/mypaint/files/patch-lib_glib.py b/graphics/mypaint/files/patch-lib_glib.py deleted file mode 100644 index ba74c72adfb..00000000000 --- a/graphics/mypaint/files/patch-lib_glib.py +++ /dev/null @@ -1,46 +0,0 @@ ---- lib/glib.py.orig 2016-01-15 19:42:55 UTC -+++ lib/glib.py -@@ -1,5 +1,5 @@ - # This file is part of MyPaint. --# Copyright (C) 2015 by Andrew Chadwick -+# Copyright (C) 2015-2016 by the MyPaint Development Team. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -19,11 +19,12 @@ unicode, and may not even be UTF-8). Thi - ## Imports - - import sys --from logging import getLogger --logger = getLogger(__name__) -+import logging - - from gi.repository import GLib - -+logger = logging.getLogger(__name__) -+ - - ## File path getter functions - -@@ -35,7 +36,6 @@ def filename_to_unicode(opsysstring): - :returns: the converted filename - :rtype: unicode - -- >>> from gi.repository import GLib - >>> filename_to_unicode('/ascii/only/path') - u'/ascii/only/path' - >>> filename_to_unicode(None) is None -@@ -54,7 +54,12 @@ def filename_to_unicode(opsysstring): - # Other systems are dependent in opaque ways on the environment. - if not isinstance(opsysstring, str): - raise TypeError("Argument must be bytes") -- ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0) -+ # This function's annotation seems to vary quite a bit. -+ # See https://github.com/mypaint/mypaint/issues/634 -+ try: -+ ustring, _, _ = GLib.filename_to_utf8(opsysstring, -1) -+ except TypeError: -+ ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0) - if ustring is None: - raise UnicodeDecodeError( - "GLib failed to convert %r to a UTF-8 string. " diff --git a/graphics/opencollada/Makefile b/graphics/opencollada/Makefile index 14e10db3f66..898bb5f5699 100644 --- a/graphics/opencollada/Makefile +++ b/graphics/opencollada/Makefile @@ -2,8 +2,7 @@ PORTNAME= opencollada DISTVERSIONPREFIX= v -DISTVERSION= 1.6.47 -PORTREVISION= 2 +DISTVERSION= 1.6.63 CATEGORIES= graphics devel MAINTAINER= ports@FreeBSD.org @@ -24,11 +23,8 @@ GH_PROJECT= OpenCOLLADA USE_GNOME= libxml2 USE_LDCONFIG= ${PREFIX}/lib/opencollada CFLAGS+= -I/${LOCALBASE}/include -Wno-narrowing -CMAKE_ARGS+= -DUSE_SHARED:BOOL=ON -DUSE_STATIC:BOOL=OFF - -# for files/patch-2d66943 -DOS2UNIX_FILES= COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h \ - COLLADABaseUtils/src/COLLADABUURI.cpp +CMAKE_ON= USE_SHARED +CMAKE_OFF= USE_STATIC post-patch: @${REINPLACE_CMD} -e 's|$${OPENCOLLADA_INST_LIBRARY}/cmake|${PREFIX}/share/cmake/Modules|' \ diff --git a/graphics/opencollada/distinfo b/graphics/opencollada/distinfo index eeac399023a..b94828562b9 100644 --- a/graphics/opencollada/distinfo +++ b/graphics/opencollada/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494445478 -SHA256 (KhronosGroup-OpenCOLLADA-v1.6.47_GH0.tar.gz) = cba45eb0894e4eb8351f98cf699e51174817a2fdfb95e73b5f0942833e68f46c -SIZE (KhronosGroup-OpenCOLLADA-v1.6.47_GH0.tar.gz) = 11947753 +TIMESTAMP = 1532007964 +SHA256 (KhronosGroup-OpenCOLLADA-v1.6.63_GH0.tar.gz) = 3a0e25f38262d872c393bbf14ff0ce2ef6a7d66bb0d57e080cfd9e37be7ee076 +SIZE (KhronosGroup-OpenCOLLADA-v1.6.63_GH0.tar.gz) = 12094044 diff --git a/graphics/opencollada/files/patch-2d66943 b/graphics/opencollada/files/patch-2d66943 deleted file mode 100644 index 7a650a2fc23..00000000000 --- a/graphics/opencollada/files/patch-2d66943 +++ /dev/null @@ -1,40 +0,0 @@ -From 2d66943f7ce1ba92b3cc39ad11b5c82e6d3a538f Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs -Date: Wed, 10 Jan 2018 14:06:48 +0000 -Subject: [PATCH] Add signed char keyword - -On PowerPC and PowerPC64 systems, 'char' is unsigned by default. -Can be reproduced by using the -funsigned-char flag for gcc. -Adding the signed keyword adds compatibility on these systems. - -Signed-off by: Jonathan Scruggs ---- - COLLADABaseUtils/src/COLLADABUURI.cpp | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/COLLADABaseUtils/src/COLLADABUURI.cpp b/COLLADABaseUtils/src/COLLADABUURI.cpp -index 1d03561a..ae403d8a 100644 ---- COLLADABaseUtils/src/COLLADABUURI.cpp.orig 2018-02-05 10:56:11 UTC -+++ COLLADABaseUtils/src/COLLADABUURI.cpp -@@ -32,7 +32,7 @@ namespace COLLADABU - - - -- const char HEX2DEC[256] = -+ const signed char HEX2DEC[256] = - { - /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - /* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -@@ -107,9 +107,9 @@ namespace COLLADABU - { - if (*pSrc == '%') - { -- char dec1, dec2; -- if ( (char)(-1) != (dec1 = HEX2DEC[*(pSrc + 1)]) -- && (char)(-1) != (dec2 = HEX2DEC[*(pSrc + 2)])) -+ signed char dec1, dec2; -+ if ( (signed char)(-1) != (dec1 = HEX2DEC[*(pSrc + 1)]) -+ && (signed char)(-1) != (dec2 = HEX2DEC[*(pSrc + 2)])) - { - *pEnd++ = (dec1 << 4) + dec2; - pSrc += 3; diff --git a/graphics/py-plotly/Makefile b/graphics/py-plotly/Makefile index c8ff001b160..9684319bae8 100644 --- a/graphics/py-plotly/Makefile +++ b/graphics/py-plotly/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= plotly -PORTVERSION= 2.2.3 +PORTVERSION= 3.0.2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,6 +14,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>0:devel/py-retrying@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} diff --git a/graphics/py-plotly/distinfo b/graphics/py-plotly/distinfo index f6d3535cded..87480114538 100644 --- a/graphics/py-plotly/distinfo +++ b/graphics/py-plotly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513467523 -SHA256 (plotly-2.2.3.tar.gz) = dadd2263f1c0449b248fd3742a077d9594935921a9597529be76d6a841237ab0 -SIZE (plotly-2.2.3.tar.gz) = 1082575 +TIMESTAMP = 1532334751 +SHA256 (plotly-3.0.2.tar.gz) = 5bd04a0991512fe9008ab986429ff4b4f1448cceda56ed344e0dc709f42e067a +SIZE (plotly-3.0.2.tar.gz) = 30146113 diff --git a/graphics/tumble/Makefile b/graphics/tumble/Makefile index 3ad99cb3c0e..19236fd3a7e 100644 --- a/graphics/tumble/Makefile +++ b/graphics/tumble/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= tumble -PORTVERSION= 0.33 -PORTREVISION= 6 +PORTVERSION= 0.36 +DISTVERSIONPREFIX= v CATEGORIES= graphics print -MASTER_SITES= http://tumble.brouhaha.com/download/ \ - http://www.sourcefiles.org/Graphics/Tools/Conversion/ MAINTAINER= ports@FreeBSD.org COMMENT= Creates a PDF file from image files @@ -14,15 +12,18 @@ COMMENT= Creates a PDF file from image files LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +NOT_FOR_ARCHS= powerpc sparc64 +NOT_FOR_ARCHS_REASON= Only works on little endian systems + LIB_DEPENDS= libtiff.so:graphics/tiff \ libnetpbm.so:graphics/netpbm USES= bison gmake jpeg localbase:ldflags -CFLAGS+= -I${LOCALBASE}/include/netpbm +USE_GITHUB= yes +GH_ACCOUNT= brouhaha -NOT_FOR_ARCHS= powerpc sparc64 -NOT_FOR_ARCHS_REASON= Only works on little endian systems +CFLAGS+= -I${LOCALBASE}/include/netpbm PORTDOCS= README PLIST_FILES= bin/tumble diff --git a/graphics/tumble/distinfo b/graphics/tumble/distinfo index fee9915ef84..2f5cfef7a8c 100644 --- a/graphics/tumble/distinfo +++ b/graphics/tumble/distinfo @@ -1,2 +1,3 @@ -SHA256 (tumble-0.33.tar.gz) = d579d572b4335d8c4008695fee9f32051194499987c340b14f17b294ece7643e -SIZE (tumble-0.33.tar.gz) = 42983 +TIMESTAMP = 1532266375 +SHA256 (brouhaha-tumble-v0.36_GH0.tar.gz) = 7b9e0788416b8129203831da7eef5310b671325503e79aa22fd91e822b54b978 +SIZE (brouhaha-tumble-v0.36_GH0.tar.gz) = 51945 diff --git a/graphics/tumble/files/patch-parser.y b/graphics/tumble/files/patch-parser.y deleted file mode 100644 index 499b51c0e3a..00000000000 --- a/graphics/tumble/files/patch-parser.y +++ /dev/null @@ -1,20 +0,0 @@ ---- parser.y.orig 2003-12-09 16:45:41 UTC -+++ parser.y -@@ -110,7 +110,7 @@ image_ranges: - - - input_file_clause: -- FILE_KEYWORD STRING ';' { input_set_file ($2) } ; -+ FILE_KEYWORD STRING ';' { input_set_file ($2); } ; - - image_clause: - IMAGE INTEGER ';' { range_t range = { $2, $2 }; input_images (range); } ; -@@ -119,7 +119,7 @@ images_clause: - IMAGES image_ranges ';' ; - - rotate_clause: -- ROTATE INTEGER ';' { input_set_rotation ($2) } ; -+ ROTATE INTEGER ';' { input_set_rotation ($2); } ; - - unit: - /* empty */ /* default to INCH */ { $$ = 1.0; } diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile index a4095d8a484..42324f3805a 100644 --- a/graphics/xmedcon/Makefile +++ b/graphics/xmedcon/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xmedcon -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.15.0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/XMedCon-Source/${PORTVERSION} @@ -14,6 +13,11 @@ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi USES= libtool pkgconfig tar:bzip2 +USE_GNOME= cairo gdkpixbuf2 + +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/xmedcon \ --enable-llcheck diff --git a/graphics/xmedcon/distinfo b/graphics/xmedcon/distinfo index 6ff8f48d245..46eb2a0fef3 100644 --- a/graphics/xmedcon/distinfo +++ b/graphics/xmedcon/distinfo @@ -1,2 +1,3 @@ -SHA256 (xmedcon-0.14.1.tar.bz2) = a6d194bf44d3d6c96cd8d6e1ad586b5d5e20de1c09dbbb51c76f9e5fd4ae6949 -SIZE (xmedcon-0.14.1.tar.bz2) = 806103 +TIMESTAMP = 1532310236 +SHA256 (xmedcon-0.15.0.tar.bz2) = 8b5efdbcb73f915386bac08e0e1facbe7c8ed4160ef4725a488aa9c74292784a +SIZE (xmedcon-0.15.0.tar.bz2) = 826296 diff --git a/graphics/xmedcon/pkg-plist b/graphics/xmedcon/pkg-plist index e1011f7b8bb..3bf64d35edf 100644 --- a/graphics/xmedcon/pkg-plist +++ b/graphics/xmedcon/pkg-plist @@ -42,8 +42,8 @@ include/xmedcon/m-xtract.h include/xmedcon/medcon.h lib/libmdc.a lib/libmdc.so -lib/libmdc.so.2 -lib/libmdc.so.2.0.1 +lib/libmdc.so.%%GTK3_VERSION%% +lib/libmdc.so.3 man/man1/medcon.1.gz %%X11%%man/man1/xmedcon.1.gz man/man1/xmedcon-config.1.gz diff --git a/graphics/zathura-ps/Makefile b/graphics/zathura-ps/Makefile index db48cca4404..bc85233592c 100644 --- a/graphics/zathura-ps/Makefile +++ b/graphics/zathura-ps/Makefile @@ -12,8 +12,6 @@ COMMENT= PostScript support for Zathura PDF viewer LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to stage - LIB_DEPENDS= libspectre.so:print/libspectre BUILD_DEPENDS= zathura:graphics/zathura RUN_DEPENDS= zathura:graphics/zathura @@ -25,7 +23,10 @@ PLIST_FILES= lib/zathura/libps.so \ share/applications/org.pwmt.zathura-ps.desktop \ share/appdata/org.pwmt.zathura-ps.metainfo.xml +pre-configure: + ${REINPLACE_CMD} "s:join_paths(datadir, 'metainfo'):join_paths(datadir, 'appdata'):" ${WRKSRC}/meson.build + post-install: - @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/zathura/ps.so + @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/zathura/libps.so .include diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index 1bd57c66388..1e6834ea4b7 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 6.4.1.s20180711 +PORTVERSION= 6.4.1.s20180718 CATEGORIES= lang java MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo index ffa567131aa..1b1a5876044 100644 --- a/lang/gcc6-devel/distinfo +++ b/lang/gcc6-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531583954 -SHA256 (gcc-6-20180711.tar.xz) = f634ad6c731071247ed18e1d043072272121ea876604a73b17060e9be858a570 -SIZE (gcc-6-20180711.tar.xz) = 72676520 +TIMESTAMP = 1532257500 +SHA256 (gcc-6-20180718.tar.xz) = b65e05ecae9295c4ddf23969b91b9b32ca19f1e7dce7b5781a742c8b1268aee1 +SIZE (gcc-6-20180718.tar.xz) = 72681032 diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile index 1b5bdcf2314..adf1c651218 100644 --- a/lang/gcc8/Makefile +++ b/lang/gcc8/Makefile @@ -35,6 +35,8 @@ USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes +CFLAGS:= ${CFLAGS:N-mretpoline} +CXXFLAGS:= ${CXXFLAGS:N-mretpoline} OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFAULT= BOOTSTRAP diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile index 3b85973346d..0f0001e1430 100644 --- a/lang/gnatdroid-armv7/Makefile +++ b/lang/gnatdroid-armv7/Makefile @@ -15,8 +15,6 @@ COMMENT?= C/Ada cross-compiler, target: Android ARMv7 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -BROKEN= fails to package - BUILD_DEPENDS= ${SYSROOT}>=0:lang/${SYSROOT} \ ${GDBINUTILS}>=2.21:lang/${GDBINUTILS} RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -49,7 +47,7 @@ ARG_TARGET_SPECIFIC?= --enable-target-optspace \ ALL_TARGET= all GARCH= ${ARCH:S/amd64/x86_64/} BITS= ${GARCH:S/x86_64/64/:S/i386/32/} -LABEL_TARGET?= Android ${CPUVERSION} +LABEL_TARGET?= Android ${CPUVERSION} OS_LABEL4VERS= [${OPSYS}${BITS} x ${LABEL_TARGET}] WRKSRC= ${WRKDIR}/${IDENTIFICATION} BUILD_WRKSRC= ${WRKDIR}/build diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 387920e91ff..24321431c88 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ # Created by: Jyun-Yan You -# $FreeBSD: head/lang/rust/Makefile 470016 2018-05-15 13:43:34Z dumbbell $ +# $FreeBSD$ PORTNAME= rust PORTVERSION?= 1.27.1 @@ -156,7 +156,10 @@ post-patch: ${WRKSRC}/src/stage0.txt # After patching crates, we need to update their corresponding # `.cargo-checksum.json` to reflect the new checksums verified by Cargo. - @for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/libgit2-sys" "${WRKSRC}/src/vendor/openssl" "${WRKSRC}/src/vendor/openssl-sys"; do \ + @for dir in "${WRKSRC}/src/vendor/libc" \ + "${WRKSRC}/src/vendor/libgit2-sys" \ + "${WRKSRC}/src/vendor/openssl" \ + "${WRKSRC}/src/vendor/openssl-sys"; do \ if ! test -d "$$dir"; then \ continue; \ fi; \ diff --git a/mail/rubygem-actionmailer5/Makefile b/mail/rubygem-actionmailer5/Makefile index ac3839d54f6..8e32d735528 100644 --- a/mail/rubygem-actionmailer5/Makefile +++ b/mail/rubygem-actionmailer5/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS= rubygem-actionpack5>=${PORTVERSION}:www/rubygem-actionpack5 \ PORTSCOUT= limit:^5\.1\. +USES= gem NO_ARCH= yes USE_RUBY= yes -USES= gem .include diff --git a/mail/rubygem-actionmailer5/pkg-descr b/mail/rubygem-actionmailer5/pkg-descr index a770f38ddf9..2311aa82d9e 100644 --- a/mail/rubygem-actionmailer5/pkg-descr +++ b/mail/rubygem-actionmailer5/pkg-descr @@ -7,4 +7,4 @@ Additionally, an Action Mailer class can be used to process incoming email, such as allowing a weblog to accept new posts from an email (which could even have been sent from a phone) -WWW: http://rubyonrails.org/ +WWW: https://rubyonrails.org/ diff --git a/math/R-cran-robustbase/Makefile b/math/R-cran-robustbase/Makefile index 063a2fdf172..514621deee6 100644 --- a/math/R-cran-robustbase/Makefile +++ b/math/R-cran-robustbase/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= robustbase -DISTVERSION= 0.93-1 +DISTVERSION= 0.93-1.1 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/math/R-cran-robustbase/distinfo b/math/R-cran-robustbase/distinfo index e0778b5c10d..3d96caeadd9 100644 --- a/math/R-cran-robustbase/distinfo +++ b/math/R-cran-robustbase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530437555 -SHA256 (robustbase_0.93-1.tar.gz) = 646603b8d670124b321a1c4ff464012b13ccd44a293e678412f159bc4161da81 -SIZE (robustbase_0.93-1.tar.gz) = 2957641 +TIMESTAMP = 1532337200 +SHA256 (robustbase_0.93-1.1.tar.gz) = 9aece16e0087ebdcba2c60afb3bb50d32c1f9a54666dc5c9b56436fb3a70cd7b +SIZE (robustbase_0.93-1.1.tar.gz) = 2955963 diff --git a/math/R-cran-zoo/Makefile b/math/R-cran-zoo/Makefile index 3daf52ec792..9953b616788 100644 --- a/math/R-cran-zoo/Makefile +++ b/math/R-cran-zoo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zoo -DISTVERSION= 1.8-2 +DISTVERSION= 1.8-3 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/math/R-cran-zoo/distinfo b/math/R-cran-zoo/distinfo index 0f9a2a65a9a..122b962e6cc 100644 --- a/math/R-cran-zoo/distinfo +++ b/math/R-cran-zoo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529461617 -SHA256 (zoo_1.8-2.tar.gz) = 7dd315290def0ea6b6f127290d9e769e54cd98668f2898fb104c9758fb8bfcd2 -SIZE (zoo_1.8-2.tar.gz) = 856091 +TIMESTAMP = 1532321745 +SHA256 (zoo_1.8-3.tar.gz) = 20b681c20531f12d26e4ac590712fcfa22e7f4e94fc69d804bb50abcf99b5596 +SIZE (zoo_1.8-3.tar.gz) = 856176 diff --git a/math/cvc4/Makefile b/math/cvc4/Makefile index 426e951f4c7..1ecc3536275 100644 --- a/math/cvc4/Makefile +++ b/math/cvc4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cvc4 -PORTVERSION= 1.5 +DISTVERSION= 1.6 CATEGORIES= math java MASTER_SITES= https://cvc4.cs.stanford.edu/downloads/builds/src/ @@ -13,11 +13,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libboost_system.so:devel/boost-libs -BUILD_DEPENDS= gexpr:sysutils/coreutils \ - bash:shells/bash \ +BUILD_DEPENDS= bash:shells/bash \ antlr3:devel/antlr3 -USES= compiler:c++11-lang pkgconfig gmake libtool shebangfix localbase +USES= autoreconf compiler:c++11-lang gmake python:3.5+,build libtool localbase pkgconfig shebangfix USE_JAVA= yes JAVA_BUILD= yes @@ -27,17 +26,21 @@ CONFIGURE_ARGS+= --disable-dependency-tracking \ ANTLR=${LOCALBASE}/bin/antlr3 CONFIGURE_SHELL= ${LOCALBASE}/bin/bash USE_LDCONFIG= yes -SHEBANG_FILES= src/mk* src/theory/mk* src/base/mk* src/expr/mk* src/options/mk* test/regress/run_regression +SHEBANG_FILES= src/mk* src/theory/mk* src/base/mk* src/expr/mk* src/options/mk* test/regress/run_regression.py -OPTIONS_DEFINE= JAVA READLINE DEBUG +OPTIONS_DEFINE= CRYPTOMINISAT JAVA READLINE DEBUG OPTIONS_RADIO= NUMLIB OPTIONS_RADIO_NUMLIB= GMP CLN -OPTIONS_DEFAULT= READLINE GMP +OPTIONS_DEFAULT= CRYPTOMINISAT READLINE GMP OPTIONS_SUB= yes +CRYPTOMINISAT_DESC= Use CryptoMiniSat as the SAT solver GMP_DESC= Use GMP numeric library CLN_DESC= Use CLN numeric library (disables portfolio mode) +CRYPTOMINISAT_CONFIGURE_ON= --with-cryptominisat --with-cryptominisat-dir=${LOCALBASE} +CRYPTOMINISAT_LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat + JAVA_CONFIGURE_ON= --enable-language-bindings=c,c++,java \ JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" \ JAVAC=${JAVAC} JAVAH=${JAVAH} JAR=${JAR} @@ -61,9 +64,6 @@ DEBUG_CONFIGURE_ON= --with-build=debug DEBUG_CONFIGURE_OFF= --with-build=production DEBUG_INSTALL_TARGET_OFF= install-strip -post-patch: - ${REINPLACE_CMD} -e 's|expr |gexpr |g' ${WRKSRC}/src/options/mkoptions - .include .if ${PORT_OPTIONS:MREADLINE} || ${PORT_OPTIONS:MCLN} @@ -71,4 +71,10 @@ LICENSE= GPLv3 CONFIGURE_ARGS+= --enable-gpl .endif +# use the fixed compiler version from ports to prevent failures on FreeBSD_10 +LLVM_VERSION= 60 +BUILD_DEPENDS+= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} +CC= clang${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} + .include diff --git a/math/cvc4/distinfo b/math/cvc4/distinfo index 579934f7d6c..a251931aa15 100644 --- a/math/cvc4/distinfo +++ b/math/cvc4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524235369 -SHA256 (cvc4-1.5.tar.gz) = 5d6b4f8ee8420f85e3f804181341cedf6ea32342c48f355a5be87754152b14e9 -SIZE (cvc4-1.5.tar.gz) = 8059968 +TIMESTAMP = 1531429558 +SHA256 (cvc4-1.6.tar.gz) = 5c18bd5ea893fba9723a4d35c889d412ec6d29a21db9db69481891a8ff4887c7 +SIZE (cvc4-1.6.tar.gz) = 7815893 diff --git a/math/cvc4/files/patch-config_cryptominisat.m4 b/math/cvc4/files/patch-config_cryptominisat.m4 new file mode 100644 index 00000000000..96985b4b41d --- /dev/null +++ b/math/cvc4/files/patch-config_cryptominisat.m4 @@ -0,0 +1,31 @@ +--- config/cryptominisat.m4.orig 2018-07-12 21:34:02 UTC ++++ config/cryptominisat.m4 +@@ -36,7 +36,7 @@ elif test -n "$with_cryptominisat"; then + AC_MSG_RESULT([no]) + fi + +- if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/install/bin/cryptominisat5_simple" ; then ++ if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/bin/cryptominisat5_simple" ; then + AC_MSG_FAILURE([either $CRYPTOMINISAT_HOME is not an cryptominisat install tree or it's not yet built]) + fi + +@@ -54,7 +54,7 @@ elif test -n "$with_cryptominisat"; then + have_libcryptominisat=1 + fi + +- CRYPTOMINISAT_LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" ++ CRYPTOMINISAT_LDFLAGS="-L$CRYPTOMINISAT_HOME/lib" + + else + AC_MSG_RESULT([no, user didn't request cryptominisat]) +@@ -74,8 +74,8 @@ if test -z "$CRYPTOMINISAT_LIBS"; then + cvc4_save_LDFLAGS="$LDFLAGS" + cvc4_save_CPPFLAGS="$CPPFLAGS" + +- LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" +- CPPFLAGS="$CPPFLAGS -I$CRYPTOMINISAT_HOME/install/include" ++ LDFLAGS="-L$CRYPTOMINISAT_HOME/lib" ++ CPPFLAGS="$CPPFLAGS -I$CRYPTOMINISAT_HOME/include" + LIBS="-lcryptominisat5 $1" + + AC_LINK_IFELSE( diff --git a/math/cvc4/files/patch-configure.ac b/math/cvc4/files/patch-configure.ac new file mode 100644 index 00000000000..b4177f36639 --- /dev/null +++ b/math/cvc4/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2018-07-12 21:33:27 UTC ++++ configure.ac +@@ -913,7 +913,7 @@ AC_ARG_WITH([cryptominisat], + CVC4_CHECK_FOR_CRYPTOMINISAT + if test $have_libcryptominisat -eq 1; then + CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_CRYPTOMINISAT" +- CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$CRYPTOMINISAT_HOME/install/include" ++ CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$CRYPTOMINISAT_HOME/include" + fi + AM_CONDITIONAL([CVC4_USE_CRYPTOMINISAT], [test $have_libcryptominisat -eq 1]) + AC_SUBST([CRYPTOMINISAT_LDFLAGS]) diff --git a/math/cvc4/files/patch-src_base_configuration.cpp b/math/cvc4/files/patch-src_base_configuration.cpp index 6e48c9e5c56..4206b023799 100644 --- a/math/cvc4/files/patch-src_base_configuration.cpp +++ b/math/cvc4/files/patch-src_base_configuration.cpp @@ -1,6 +1,6 @@ ---- src/base/configuration.cpp.orig 2018-04-22 17:53:43 UTC +--- src/base/configuration.cpp.orig 2018-06-25 21:13:17 UTC +++ src/base/configuration.cpp -@@ -291,7 +291,7 @@ std::string Configuration::getCompiler() { +@@ -405,7 +405,7 @@ std::string Configuration::getCompiler() { } std::string Configuration::getCompiledDateTime() { diff --git a/math/cvc4/pkg-plist b/math/cvc4/pkg-plist index a7758f76b67..4c8bb1c64da 100644 --- a/math/cvc4/pkg-plist +++ b/math/cvc4/pkg-plist @@ -1,11 +1,9 @@ bin/cvc4 -bin/lfsc-checker %%GMP%%bin/pcvc4 include/cvc4/base/configuration.h include/cvc4/base/exception.h include/cvc4/base/listener.h include/cvc4/base/modal_exception.h -include/cvc4/base/ptr_closer.h include/cvc4/base/tls.h include/cvc4/bindings/compat/c/c_interface.h include/cvc4/bindings/compat/c/c_interface_defs.h @@ -36,7 +34,6 @@ include/cvc4/expr/expr_template.h include/cvc4/expr/kind.h include/cvc4/expr/kind_template.h include/cvc4/expr/pickler.h -include/cvc4/expr/predicate.h include/cvc4/expr/record.h include/cvc4/expr/symbol_table.h include/cvc4/expr/type.h @@ -46,6 +43,7 @@ include/cvc4/options/argument_extender.h include/cvc4/options/arith_heuristic_pivot_rule.h include/cvc4/options/arith_propagation_mode.h include/cvc4/options/arith_unate_lemma_mode.h +include/cvc4/options/datatypes_modes.h include/cvc4/options/language.h include/cvc4/options/option_exception.h include/cvc4/options/options.h @@ -53,11 +51,13 @@ include/cvc4/options/printer_modes.h include/cvc4/options/quantifiers_modes.h include/cvc4/options/set_language.h include/cvc4/options/simplification_mode.h +include/cvc4/options/sygus_out_mode.h include/cvc4/options/theoryof_mode.h include/cvc4/parser/input.h include/cvc4/parser/parser.h include/cvc4/parser/parser_builder.h include/cvc4/parser/parser_exception.h +include/cvc4/printer/sygus_print_callback.h include/cvc4/proof/unsat_core.h include/cvc4/smt/command.h include/cvc4/smt/logic_exception.h @@ -79,6 +79,7 @@ include/cvc4/util/hash.h include/cvc4/util/integer.h include/cvc4/util/integer_cln_imp.h include/cvc4/util/integer_gmp_imp.h +include/cvc4/util/maybe.h include/cvc4/util/proof.h include/cvc4/util/rational.h include/cvc4/util/rational_cln_imp.h @@ -88,27 +89,26 @@ include/cvc4/util/resource_manager.h include/cvc4/util/result.h include/cvc4/util/sexpr.h include/cvc4/util/statistics.h -include/cvc4/util/subrange_bound.h include/cvc4/util/tuple.h include/cvc4/util/unsafe_interrupt_exception.h %%JAVA%%lib/jni/libcvc4compatjni.so -%%JAVA%%lib/jni/libcvc4compatjni.so.4 -%%JAVA%%lib/jni/libcvc4compatjni.so.4.0.0 +%%JAVA%%lib/jni/libcvc4compatjni.so.5 +%%JAVA%%lib/jni/libcvc4compatjni.so.5.0.0 %%JAVA%%lib/jni/libcvc4jni.so -%%JAVA%%lib/jni/libcvc4jni.so.4 -%%JAVA%%lib/jni/libcvc4jni.so.4.0.0 +%%JAVA%%lib/jni/libcvc4jni.so.5 +%%JAVA%%lib/jni/libcvc4jni.so.5.0.0 lib/libcvc4.so -lib/libcvc4.so.4 -lib/libcvc4.so.4.0.0 +lib/libcvc4.so.5 +lib/libcvc4.so.5.0.0 lib/libcvc4bindings_c_compat.so -lib/libcvc4bindings_c_compat.so.4 -lib/libcvc4bindings_c_compat.so.4.0.0 +lib/libcvc4bindings_c_compat.so.5 +lib/libcvc4bindings_c_compat.so.5.0.0 lib/libcvc4compat.so -lib/libcvc4compat.so.4 -lib/libcvc4compat.so.4.0.0 +lib/libcvc4compat.so.5 +lib/libcvc4compat.so.5.0.0 lib/libcvc4parser.so -lib/libcvc4parser.so.4 -lib/libcvc4parser.so.4.0.0 +lib/libcvc4parser.so.5 +lib/libcvc4parser.so.5.0.0 man/man1/cvc4.1.gz %%GMP%%man/man1/pcvc4.1.gz man/man3/SmtEngine.3cvc.gz diff --git a/math/lean/Makefile b/math/lean/Makefile index 1a3ef53e078..58727085d67 100644 --- a/math/lean/Makefile +++ b/math/lean/Makefile @@ -2,8 +2,7 @@ PORTNAME= lean DISTVERSIONPREFIX= v -DISTVERSION= 3.2.0-1147 -DISTVERSIONSUFFIX= -gceacfa744 +DISTVERSION= 3.4.1 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +16,7 @@ LIB_DEPENDS= libgmp.so:math/gmp USES= cmake:outsource USE_GITHUB= yes -GH_ACCOUNT= leodemoura +GH_ACCOUNT= leanprover USE_LDCONFIG= yes WRKSRC_SUBDIR= src diff --git a/math/lean/distinfo b/math/lean/distinfo index 336f2bef97e..89e6582ec32 100644 --- a/math/lean/distinfo +++ b/math/lean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532233323 -SHA256 (leodemoura-lean-v3.2.0-1147-gceacfa744_GH0.tar.gz) = cbb1fceae4b1876e135f20ec3d1c91816ffec6e84613ba4fa37fa39c96f61c86 -SIZE (leodemoura-lean-v3.2.0-1147-gceacfa744_GH0.tar.gz) = 1817180 +TIMESTAMP = 1532330618 +SHA256 (leanprover-lean-v3.4.1_GH0.tar.gz) = c146385e75ae8fbd88732d4443400123288bfea885c35c213efaba78b655d320 +SIZE (leanprover-lean-v3.4.1_GH0.tar.gz) = 1816434 diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile index d41d66c042e..76670671a4e 100644 --- a/math/py-pymc3/Makefile +++ b/math/py-pymc3/Makefile @@ -2,7 +2,7 @@ PORTNAME= pymc3 DISTVERSIONPREFIX= v -DISTVERSION= 3.4.1 +DISTVERSION= 3.5 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,8 @@ COMMENT= Probabilistic programming in Python LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=2.7.0:science/py-h5py@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}h5py>=2.7.0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=0.9:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.18.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}patsy>=0.4.0:math/py-patsy@${PY_FLAVOR} \ diff --git a/math/py-pymc3/distinfo b/math/py-pymc3/distinfo index ecc2ff5fd6e..b5e72be5271 100644 --- a/math/py-pymc3/distinfo +++ b/math/py-pymc3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524151700 -SHA256 (pymc-devs-pymc3-v3.4.1_GH0.tar.gz) = 54a3e0cfda73a96deb46fbf7b9eaf37183257d9ba3378a9d9d5dc050ac862238 -SIZE (pymc-devs-pymc3-v3.4.1_GH0.tar.gz) = 25750929 +TIMESTAMP = 1532278933 +SHA256 (pymc-devs-pymc3-v3.5_GH0.tar.gz) = fc81af86aaadbc58b68bdc1fc12e13496b0b7b7d9b8e33f99ba05bc880f4a810 +SIZE (pymc-devs-pymc3-v3.5_GH0.tar.gz) = 26355332 diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile index 2460b7a7bc6..fe0698ba9c9 100644 --- a/multimedia/kodi-devel/Makefile +++ b/multimedia/kodi-devel/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kodi -DISTVERSION= 18.0.g201806300625 -PORTREVISION= 1 +DISTVERSION= 18.0.g201807222249 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel @@ -10,9 +9,8 @@ MAINTAINER= tobik@FreeBSD.org COMMENT= Award winning media center application LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE.GPL +LICENSE_FILE= ${WRKSRC}/copying.txt -BROKEN_FreeBSD_10= does not build ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 BUILD_DEPENDS= rapidjson>=0:devel/rapidjson \ @@ -50,18 +48,18 @@ LIB_DEPENDS= libass.so:multimedia/libass \ # leads to dependency problems where libcpluff.a is not yet finished # building when it's required. USES= autoreconf:build cmake:outsource,noninja compiler:c++11-lib \ - gettext gmake iconv:wchar_t jpeg libtool pkgconfig python:-2.7 \ + gettext gmake iconv:wchar_t jpeg libtool pkgconfig python:2.7 \ ssl sqlite USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc -GH_TAGNAME= 8063088ceecc6674763c83a63356fe0296b005a8 +GH_TAGNAME= 64a79f3e8c1cc1af0b8dc4f645e60f6c889e3667 USE_GNOME= libxslt libxml2 USE_JAVA= yes JAVA_BUILD= yes USE_LDCONFIG= yes -CONFLICTS_INSTALL= kodi-[0-9]* +CONFLICTS_INSTALL= kodi CMAKE_ARGS= -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" \ -DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \ diff --git a/multimedia/kodi-devel/distinfo b/multimedia/kodi-devel/distinfo index 81743fcbf9a..56a42584405 100644 --- a/multimedia/kodi-devel/distinfo +++ b/multimedia/kodi-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530424760 -SHA256 (xbmc-xbmc-18.0.g201806300625-8063088ceecc6674763c83a63356fe0296b005a8_GH0.tar.gz) = d233357130bdcee29a7d4e6ad3c29a21cdb8d23cfdec9d80724b3c0a2690cee9 -SIZE (xbmc-xbmc-18.0.g201806300625-8063088ceecc6674763c83a63356fe0296b005a8_GH0.tar.gz) = 41119460 +TIMESTAMP = 1532314724 +SHA256 (xbmc-xbmc-18.0.g201807222249-64a79f3e8c1cc1af0b8dc4f645e60f6c889e3667_GH0.tar.gz) = 1618606b898bb475e05a3cb84976a1773cb9f44d87fdf9ac6b07d2e36296f206 +SIZE (xbmc-xbmc-18.0.g201807222249-64a79f3e8c1cc1af0b8dc4f645e60f6c889e3667_GH0.tar.gz) = 50766017 diff --git a/multimedia/kodi-devel/files/patch-xbmc_platform_linux_storage_LinuxStorageProvider.cpp b/multimedia/kodi-devel/files/patch-xbmc_platform_linux_storage_LinuxStorageProvider.cpp new file mode 100644 index 00000000000..69a78c2003e --- /dev/null +++ b/multimedia/kodi-devel/files/patch-xbmc_platform_linux_storage_LinuxStorageProvider.cpp @@ -0,0 +1,15 @@ +xbmc/platform/linux/storage/LinuxStorageProvider.cpp:73:19: error: use of undeclared identifier 'getenv' + share.strPath = getenv("HOME"); + ^ + +--- xbmc/platform/linux/storage/LinuxStorageProvider.cpp.orig 2018-07-23 03:59:13 UTC ++++ xbmc/platform/linux/storage/LinuxStorageProvider.cpp +@@ -27,6 +27,8 @@ + #endif + #include "PosixMountProvider.h" + ++#include ++ + IStorageProvider* IStorageProvider::CreateInstance() + { + return new CLinuxStorageProvider(); diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 6bc9b74f7c4..abc7f723fba 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= s3cmd -DISTVERSION= 2.0.1 +DISTVERSION= 2.0.2 CATEGORIES= net python MASTER_SITES= SF/s3tools/${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-s3cmd/distinfo b/net/py-s3cmd/distinfo index b72abfc6019..dd41f4ed8c8 100644 --- a/net/py-s3cmd/distinfo +++ b/net/py-s3cmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524528901 -SHA256 (s3cmd-2.0.1.tar.gz) = caf09f1473301c442fba6431c983c361c9af8bde503dac0953f0d2f8f2c53c8f -SIZE (s3cmd-2.0.1.tar.gz) = 121926 +TIMESTAMP = 1532344358 +SHA256 (s3cmd-2.0.2.tar.gz) = 9f244c0c10d58d0ccacbba3aa977463e32491bdd9d95109e27b67e4d46c5bd52 +SIZE (s3cmd-2.0.2.tar.gz) = 124266 diff --git a/net/radcli/Makefile b/net/radcli/Makefile index 10c8d4484b2..6122ac9188d 100644 --- a/net/radcli/Makefile +++ b/net/radcli/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= radcli -PORTVERSION= 1.2.8 +PORTVERSION= 1.2.10 CATEGORIES= net -MAINTAINER= ports@FreeBSD.org +MAINTAINER= neel@neelc.org COMMENT= Simple RADIUS client library LICENSE= BSD2CLAUSE diff --git a/net/radcli/distinfo b/net/radcli/distinfo index cba8ccb9edf..48e776ac086 100644 --- a/net/radcli/distinfo +++ b/net/radcli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498905859 -SHA256 (radcli-radcli-1.2.8_GH0.tar.gz) = d124821ff13a8070d3c0d2c9efb2f251d4561f93f1347fd84496ecd7d072757d -SIZE (radcli-radcli-1.2.8_GH0.tar.gz) = 248542 +TIMESTAMP = 1532332667 +SHA256 (radcli-radcli-1.2.10_GH0.tar.gz) = a3d6b3c97c5e221d65609ec4895436e3191b3248881482e89e5ae007f4f78d50 +SIZE (radcli-radcli-1.2.10_GH0.tar.gz) = 274721 diff --git a/net/radcli/pkg-plist b/net/radcli/pkg-plist index 1354da64eab..e8a97ca5790 100644 --- a/net/radcli/pkg-plist +++ b/net/radcli/pkg-plist @@ -3,7 +3,7 @@ include/radcli/version.h lib/libradcli.a lib/libradcli.so lib/libradcli.so.4 -lib/libradcli.so.4.1.2 +lib/libradcli.so.4.2.0 libdata/pkgconfig/radcli.pc man/man3/radcli.h.3.gz man/man3/rc_aaa.3.gz @@ -15,6 +15,7 @@ man/man3/rc_aaa_ctx_server.3.gz man/man3/rc_acct.3.gz man/man3/rc_acct_proxy.3.gz man/man3/rc_add_config.3.gz +man/man3/rc_apply_config.3.gz man/man3/rc_auth.3.gz man/man3/rc_auth_proxy.3.gz man/man3/rc_avpair_add.3.gz diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 19c6c84323f..d8e9e561c1c 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index acf8a8a3a6e..50b33eb6093 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -498,11 +498,11 @@ + flavor=$(flavor_part $portdir) + for dir in $post_clean_l; do + pm_v "===>>> Running 'make clean' for special build dependency $dir" -+ (pm_make_s -C "$pd/$dir" "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)& ++ (pm_make_s -C "$pd/$dir" ${flavor:+FLAVOR=$flavor} clean NOCLEANDEPENDS=ncd2 >/dev/null)& + done pm_v "===>>> Running 'make clean' in the background" - (pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)& -+ (pm_make_s "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)& ++ (pm_make_s ${flavor:+FLAVOR=$flavor} clean NOCLEANDEPENDS=ncd2 >/dev/null)& pm_v fi if [ -n "$ro_opd" ]; then diff --git a/security/Makefile b/security/Makefile index e4e1658c0b5..cfc71806d2f 100644 --- a/security/Makefile +++ b/security/Makefile @@ -310,6 +310,7 @@ SUBDIR += kgpg SUBDIR += kgpg-kde4 SUBDIR += kickpass + SUBDIR += klee SUBDIR += kleopatra SUBDIR += knock SUBDIR += knocker diff --git a/security/klee/Makefile b/security/klee/Makefile new file mode 100644 index 00000000000..e11f60b454b --- /dev/null +++ b/security/klee/Makefile @@ -0,0 +1,49 @@ +# $FreeBSD$ + +PORTNAME= klee +DISTVERSIONPREFIX= v +DISTVERSION= 1.4.0-191 +DISTVERSIONSUFFIX= -g79ac709 +CATEGORIES= security devel + +MAINTAINER= arrowd@FreeBSD.org +COMMENT= Symbolic virtual machine built on top of LLVM + +LICENSE= NCSA +LICENSE_FILE= ${WRKSRC}/LICENSE.TXT + +BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} \ + gmake:devel/gmake + +LLVM_VERSION= 38 # the latest llvm version that the master branch (79ac709) currently supports + +USES= cmake:outsource localbase pkgconfig python:run shebangfix +USE_GITHUB= yes +SHEBANG_FILES= tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool +USE_LDCONFIG= yes + +CMAKE_OFF= ENABLE_POSIX_RUNTIME ENABLE_UNIT_TESTS ENABLE_SYSTEM_TESTS +CMAKE_ARGS= -DLLVM_CONFIG_BINARY=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \ + -DMAKE_BINARY=${LOCALBASE}/bin/gmake + +OPTIONS_DEFINE= TCMALLOC +OPTIONS_SINGLE= SOLVER +OPTIONS_SINGLE_SOLVER= Z3 STP # TODO METASMT +OPTIONS_DEFAULT= TCMALLOC Z3 +SOLVER_DESC= Solver: Use the + +TCMALLOC_DESC= Use tcmalloc library for memory management +TCMALLOC_CMAKE_BOOL= ENABLE_TCMALLOC +TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools + +Z3_DESC= Z3 SMT solver +Z3_CMAKE_BOOL= ENABLE_SOLVER_Z3 +Z3_BUILD_DEPENDS= z3:math/z3 +Z3_RUN_DEPENDS= z3:math/z3 + +STP_DESC= STP SMT solver +STP_CMAKE_BOOL= ENABLE_SOLVER_STP +STP_CMAKE_ON= -DFREEBSD_STP_STATIC_LIBRARY:STRING=${LOCALBASE}/lib/libstp.a +STP_BUILD_DEPENDS= stp>0:math/stp + +.include diff --git a/security/klee/distinfo b/security/klee/distinfo new file mode 100644 index 00000000000..f42c6f565e2 --- /dev/null +++ b/security/klee/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1532277676 +SHA256 (klee-klee-v1.4.0-191-g79ac709_GH0.tar.gz) = 92d57d88967e5615d5c806e52a427180b3ccd95a5b018c0bfab3e895b8b13111 +SIZE (klee-klee-v1.4.0-191-g79ac709_GH0.tar.gz) = 969253 diff --git a/security/klee/files/patch-CMakeLists.txt b/security/klee/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..afb02bad8af --- /dev/null +++ b/security/klee/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-07-12 22:25:49 UTC ++++ CMakeLists.txt +@@ -412,7 +412,7 @@ endif() + ################################################################################ + # Detect libcap + ################################################################################ +-check_include_file("sys/capability.h" HAVE_SYS_CAPABILITY_H) ++#check_include_file("sys/capability.h" HAVE_SYS_CAPABILITY_H) + if (HAVE_SYS_CAPABILITY_H) + find_library(LIBCAP_LIBRARIES + NAMES cap diff --git a/security/klee/files/patch-cmake_find__stp.cmake b/security/klee/files/patch-cmake_find__stp.cmake new file mode 100644 index 00000000000..44bbac98940 --- /dev/null +++ b/security/klee/files/patch-cmake_find__stp.cmake @@ -0,0 +1,11 @@ +--- cmake/find_stp.cmake.orig 2018-07-12 22:25:49 UTC ++++ cmake/find_stp.cmake +@@ -13,6 +13,8 @@ + # is displayed in `ccmake` and `cmake-gui`. + set(STP_DIR "" CACHE PATH "Path to directory containing STPConfig.cmake") + find_package(STP CONFIG) ++SET(STP_STATIC_LIBRARY ${FREEBSD_STP_STATIC_LIBRARY}) ++MESSAGE("YURI STP_STATIC_LIBRARY=${STP_STATIC_LIBRARY}") + + # Set the default so that if the following is true: + # * STP was found diff --git a/security/klee/files/patch-lib_Core_Executor.cpp b/security/klee/files/patch-lib_Core_Executor.cpp new file mode 100644 index 00000000000..ed338202152 --- /dev/null +++ b/security/klee/files/patch-lib_Core_Executor.cpp @@ -0,0 +1,11 @@ +--- lib/Core/Executor.cpp.orig 2018-07-22 16:43:34 UTC ++++ lib/Core/Executor.cpp +@@ -3885,7 +3885,7 @@ void Executor::prepareForEarlyExit() { + + /// Returns the errno location in memory + int *Executor::getErrnoLocation(const ExecutionState &state) const { +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + /* From /usr/include/errno.h: it [errno] is a per-thread variable. */ + return __errno_location(); + #else diff --git a/security/klee/pkg-descr b/security/klee/pkg-descr new file mode 100644 index 00000000000..3bf1f21ebd5 --- /dev/null +++ b/security/klee/pkg-descr @@ -0,0 +1,19 @@ +KLEE is a symbolic virtual machine built on top of the LLVM compiler +infrastructure. + +Currently, there are two primary components: +* The core symbolic virtual machine engine; this is responsible for executing + LLVM bitcode modules with support for symbolic values. This is comprised of + the code in lib/. +* A POSIX/Linux emulation layer oriented towards supporting uClibc, with + additional support for making parts of the operating system environment + symbolic. + +Additionally, there is a simple library for replaying computed inputs on native +code (for closed programs). There is also a more complicated infrastructure for +replaying the inputs generated for the POSIX/Linux emulation layer, which +handles running native programs in an environment that matches a computed test +input, including setting up files, pipes, environment variables, and passing +command line arguments. + +WWW: https://klee.github.io/ diff --git a/security/klee/pkg-plist b/security/klee/pkg-plist new file mode 100644 index 00000000000..9b778e6146a --- /dev/null +++ b/security/klee/pkg-plist @@ -0,0 +1,11 @@ +bin/gen-random-bout +bin/kleaver +bin/klee +bin/klee-stats +bin/ktest-tool +include/klee/klee.h +lib/klee/runtime/libklee-libc.bca +lib/klee/runtime/libkleeRuntimeFreeStanding.bca +lib/klee/runtime/libkleeRuntimeIntrinsic.bca +lib/libkleeRuntest.so +lib/libkleeRuntest.so.1.0 diff --git a/sysutils/Makefile b/sysutils/Makefile index fd75407b3a1..2604ce44f2d 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1316,6 +1316,7 @@ SUBDIR += u-boot-orangepi-pc-plus SUBDIR += u-boot-orangepi-pc2 SUBDIR += u-boot-orangepi-plus-2e + SUBDIR += u-boot-orangepi-r1 SUBDIR += u-boot-orangepi-zero SUBDIR += u-boot-pandaboard SUBDIR += u-boot-pcduino3 diff --git a/sysutils/fusefs-hfsfuse/Makefile b/sysutils/fusefs-hfsfuse/Makefile index 9c2765a75aa..a499f12cf23 100644 --- a/sysutils/fusefs-hfsfuse/Makefile +++ b/sysutils/fusefs-hfsfuse/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= libublio.so:devel/libublio \ libutf8proc.so:textproc/utf8proc USES= fuse gmake +USE_CSTD= c99 USE_GITHUB= yes GH_ACCOUNT= 0x09 GH_TAGNAME= d021835629c3fb37bd5bf8d364d5196f1db53867 diff --git a/sysutils/reggae/Makefile b/sysutils/reggae/Makefile index fa671ddf153..c613a031692 100644 --- a/sysutils/reggae/Makefile +++ b/sysutils/reggae/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= reggae -PORTVERSION= 0.0.10 +PORTVERSION= 0.0.11 CATEGORIES= sysutils MAINTAINER= meka@tilda.center diff --git a/sysutils/reggae/distinfo b/sysutils/reggae/distinfo index 4ae9247bcbd..dcd2fb2e617 100644 --- a/sysutils/reggae/distinfo +++ b/sysutils/reggae/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526827158 -SHA256 (cbsd-reggae-0.0.10_GH0.tar.gz) = 2612f5beef6d6f631d9ba60450341e59293e678b60b92567a75e21a29c30840c -SIZE (cbsd-reggae-0.0.10_GH0.tar.gz) = 36537 +TIMESTAMP = 1532281271 +SHA256 (cbsd-reggae-0.0.11_GH0.tar.gz) = d6e19e31a6e4ca03fbc162840966672a01857f4cbf281335d2f3944d101e4bf8 +SIZE (cbsd-reggae-0.0.11_GH0.tar.gz) = 36405 diff --git a/sysutils/reggae/pkg-plist b/sysutils/reggae/pkg-plist index ea632037a2e..ca42c1aa462 100644 --- a/sysutils/reggae/pkg-plist +++ b/sysutils/reggae/pkg-plist @@ -9,96 +9,90 @@ man/man1/reggae-register.1.gz man/man1/reggae-salt.1.gz man/man1/reggae-service.1.gz man/man1/reggae.1.gz -share/reggae/cbsd-profile/jail-freebsd-reggae.conf -share/reggae/cbsd-profile/skel/etc/crontab -share/reggae/cbsd-profile/skel/etc/group -share/reggae/cbsd-profile/skel/etc/mail/aliases -share/reggae/cbsd-profile/skel/etc/mail/aliases.db -share/reggae/cbsd-profile/skel/etc/make.conf -share/reggae/cbsd-profile/skel/etc/master.passwd -share/reggae/cbsd-profile/skel/etc/motd -share/reggae/cbsd-profile/skel/etc/passwd -share/reggae/cbsd-profile/skel/etc/pwd.db -share/reggae/cbsd-profile/skel/etc/rc.conf -share/reggae/cbsd-profile/skel/etc/spwd.db -share/reggae/cbsd-profile/skel/root/.bashrc -share/reggae/cbsd-profile/skel/root/.cshrc -share/reggae/cbsd-profile/skel/usr/home/provision/.cshrc -share/reggae/cbsd-profile/skel/usr/home/provision/.history -share/reggae/cbsd-profile/skel/usr/home/provision/.login -share/reggae/cbsd-profile/skel/usr/home/provision/.login_conf -share/reggae/cbsd-profile/skel/usr/home/provision/.mail_aliases -share/reggae/cbsd-profile/skel/usr/home/provision/.mailrc -share/reggae/cbsd-profile/skel/usr/home/provision/.profile -share/reggae/cbsd-profile/skel/usr/home/provision/.rhosts -share/reggae/cbsd-profile/skel/usr/home/provision/.shrc -share/reggae/cbsd-profile/skel/usr/local/etc/sudoers -share/reggae/cbsd-profile/system/master_poststart.d/placeholder -share/reggae/cbsd-profile/system/master_poststop.d/deregister.sh -share/reggae/cbsd-profile/system/master_poststop.d/placeholder -share/reggae/cbsd-profile/system/master_prestart.d/placeholder -share/reggae/cbsd-profile/system/master_prestart.d/register.sh -share/reggae/cbsd-profile/system/master_prestop.d/placeholder -share/reggae/cbsd-profile/system/placeholder -share/reggae/cbsd-profile/system/remove.d/placeholder -share/reggae/cbsd-profile/system/start.d/placeholder -share/reggae/cbsd-profile/system/stop.d/placeholder -share/reggae/master/salt/Makefile -share/reggae/master/salt/playbook/provision.sh -share/reggae/mk/ansible.mk -share/reggae/mk/chef.mk -share/reggae/mk/project.mk -share/reggae/mk/puppet.mk -share/reggae/mk/salt.mk -share/reggae/mk/service.mk -share/reggae/mk/shell.mk -share/reggae/scripts/cbsd-init.sh -share/reggae/scripts/chef-provision.sh -share/reggae/scripts/default.conf -share/reggae/scripts/get-config.sh -share/reggae/scripts/init.sh -share/reggae/scripts/master-init.sh -share/reggae/scripts/master.sh -share/reggae/scripts/network-init.sh -share/reggae/scripts/project-init.sh -share/reggae/scripts/puppet-provision.sh -share/reggae/scripts/register.sh -share/reggae/scripts/salt-provision.sh -share/reggae/scripts/shell-provision.sh -share/reggae/skel/ansible/playbook/group_vars/.keep -share/reggae/skel/ansible/playbook/inventory/.keep -share/reggae/skel/ansible/playbook/roles/.keep -share/reggae/skel/ansible/requirements.yml -share/reggae/skel/ansible/templates/site.yml.tpl -share/reggae/skel/chef/playbook/cookbooks/core/recipes/default.rb -share/reggae/skel/puppet/playbook/site.pp -share/reggae/skel/salt/playbook/core.sls -share/reggae/skel/salt/playbook/top.sls -share/reggae/skel/shell/playbook/provision.sh -share/reggae/templates/Makefile.ansible -share/reggae/templates/Makefile.chef -share/reggae/templates/Makefile.default -share/reggae/templates/Makefile.project -share/reggae/templates/Makefile.puppet -share/reggae/templates/Makefile.salt -share/reggae/templates/Makefile.shell -share/reggae/templates/cbsd.conf.tpl -share/reggae/templates/dhclient-exit-hooks -share/reggae/templates/dhcp.conf -share/reggae/templates/dhcpd-hook.sh -share/reggae/templates/dhcpd.conf -share/reggae/templates/empty.jconf -share/reggae/templates/freebsd-update.conf -share/reggae/templates/gitignore -share/reggae/templates/initenv.conf -share/reggae/templates/my.domain -share/reggae/templates/my.domain.rev -share/reggae/templates/named.conf -share/reggae/templates/nsupdate-add.txt -share/reggae/templates/nsupdate-delete.txt -share/reggae/templates/pf.conf -share/reggae/templates/playbook/group_vars/all.tpl -share/reggae/templates/playbook/inventory.tpl -share/reggae/templates/resolvconf.conf -share/reggae/templates/resolver.conf -share/reggae/templates/rndc.conf +%%DATADIR%%/cbsd-profile/jail-freebsd-reggae.conf +%%DATADIR%%/cbsd-profile/skel/etc/crontab +%%DATADIR%%/cbsd-profile/skel/etc/group +%%DATADIR%%/cbsd-profile/skel/etc/mail/aliases +%%DATADIR%%/cbsd-profile/skel/etc/mail/aliases.db +%%DATADIR%%/cbsd-profile/skel/etc/make.conf +%%DATADIR%%/cbsd-profile/skel/etc/master.passwd +%%DATADIR%%/cbsd-profile/skel/etc/motd +%%DATADIR%%/cbsd-profile/skel/etc/passwd +%%DATADIR%%/cbsd-profile/skel/etc/pwd.db +%%DATADIR%%/cbsd-profile/skel/etc/rc.conf +%%DATADIR%%/cbsd-profile/skel/etc/spwd.db +%%DATADIR%%/cbsd-profile/skel/root/.bashrc +%%DATADIR%%/cbsd-profile/skel/root/.cshrc +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.cshrc +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.history +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.login +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.login_conf +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.mail_aliases +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.mailrc +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.profile +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.rhosts +%%DATADIR%%/cbsd-profile/skel/usr/home/provision/.shrc +%%DATADIR%%/cbsd-profile/skel/usr/local/etc/sudoers +%%DATADIR%%/cbsd-profile/system/master_poststart.d/placeholder +%%DATADIR%%/cbsd-profile/system/master_poststop.d/deregister.sh +%%DATADIR%%/cbsd-profile/system/master_poststop.d/placeholder +%%DATADIR%%/cbsd-profile/system/master_prestart.d/placeholder +%%DATADIR%%/cbsd-profile/system/master_prestart.d/register.sh +%%DATADIR%%/cbsd-profile/system/master_prestop.d/placeholder +%%DATADIR%%/cbsd-profile/system/placeholder +%%DATADIR%%/cbsd-profile/system/remove.d/placeholder +%%DATADIR%%/cbsd-profile/system/start.d/placeholder +%%DATADIR%%/cbsd-profile/system/stop.d/placeholder +%%DATADIR%%/mk/ansible.mk +%%DATADIR%%/mk/chef.mk +%%DATADIR%%/mk/project.mk +%%DATADIR%%/mk/puppet.mk +%%DATADIR%%/mk/salt.mk +%%DATADIR%%/mk/service.mk +%%DATADIR%%/mk/shell.mk +%%DATADIR%%/scripts/cbsd-init.sh +%%DATADIR%%/scripts/chef-provision.sh +%%DATADIR%%/scripts/default.conf +%%DATADIR%%/scripts/get-config.sh +%%DATADIR%%/scripts/import.sh +%%DATADIR%%/scripts/init.sh +%%DATADIR%%/scripts/master-init.sh +%%DATADIR%%/scripts/network-init.sh +%%DATADIR%%/scripts/project-init.sh +%%DATADIR%%/scripts/puppet-provision.sh +%%DATADIR%%/scripts/register.sh +%%DATADIR%%/scripts/salt-provision.sh +%%DATADIR%%/scripts/shell-provision.sh +%%DATADIR%%/skel/ansible/ansible/group_vars/.keep +%%DATADIR%%/skel/ansible/ansible/inventory/.keep +%%DATADIR%%/skel/ansible/ansible/roles/.keep +%%DATADIR%%/skel/ansible/requirements.yml +%%DATADIR%%/skel/ansible/templates/site.yml.tpl +%%DATADIR%%/skel/chef/chef/cookbooks/core/recipes/default.rb +%%DATADIR%%/skel/puppet/puppet/manifests/site.pp +%%DATADIR%%/skel/salt/salt/states/core.sls +%%DATADIR%%/skel/salt/salt/states/top.sls +%%DATADIR%%/skel/shell/shell/provision.sh +%%DATADIR%%/templates/Makefile.project +%%DATADIR%%/templates/Makefile.service +%%DATADIR%%/templates/ansible/group_vars/all.tpl +%%DATADIR%%/templates/ansible/inventory.local.tpl +%%DATADIR%%/templates/ansible/inventory.remote.tpl +%%DATADIR%%/templates/cbsd.conf.tpl +%%DATADIR%%/templates/dhclient-exit-hooks +%%DATADIR%%/templates/dhcp.conf +%%DATADIR%%/templates/dhcpd-hook.sh +%%DATADIR%%/templates/dhcpd.conf +%%DATADIR%%/templates/empty.jconf +%%DATADIR%%/templates/freebsd-update.conf +%%DATADIR%%/templates/gitignore +%%DATADIR%%/templates/initenv.conf +%%DATADIR%%/templates/my.domain +%%DATADIR%%/templates/my.domain.rev +%%DATADIR%%/templates/named.conf +%%DATADIR%%/templates/nsupdate-add.txt +%%DATADIR%%/templates/nsupdate-delete.txt +%%DATADIR%%/templates/pf.conf +%%DATADIR%%/templates/resolvconf.conf +%%DATADIR%%/templates/resolver.conf +%%DATADIR%%/templates/rndc.conf diff --git a/sysutils/rpi-firmware/Makefile b/sysutils/rpi-firmware/Makefile index ce3b907c394..27bd522750d 100644 --- a/sysutils/rpi-firmware/Makefile +++ b/sysutils/rpi-firmware/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= rpi-firmware -PORTVERSION= 1.20180328 +PORTVERSION= 1.20180619 CATEGORIES= sysutils -MAINTAINER= manu@freebsd.org +MAINTAINER= uboot@freebsd.org COMMENT= Firmware for RaspberryPi Single Board Computer LICENSE= BROADCOM @@ -25,9 +25,12 @@ PSCI_DIR= ${WRKDIR}/${PSCI_MONITOR} BUILD_WRKSRC= ${PSCI_DIR} INSTALL_DIR= ${PREFIX}/share/${PORTNAME} +CONFIG_TXT_FILES= config.txt config_rpi_0_w.txt config_rpi3.txt + do-patch: - ${CP} ${FILESDIR}/config.txt ${WRKSRC}/boot/ - ${CP} ${FILESDIR}/config_rpi3.txt ${WRKSRC}/boot/ +.for i in ${CONFIG_TXT_FILES} + ${CP} ${FILESDIR}/${i} ${WRKSRC}/boot/ +.endfor post-patch: ${RM} ${WRKSRC}/boot/kernel.img diff --git a/sysutils/rpi-firmware/distinfo b/sysutils/rpi-firmware/distinfo index d9630c681df..154e3173101 100644 --- a/sysutils/rpi-firmware/distinfo +++ b/sysutils/rpi-firmware/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1526136538 -SHA256 (raspberrypi-firmware-1.20180328_GH0.tar.gz) = 44731225495bb211353dd86fbead980f8bb62930a3ec6711ed7094aff2397758 -SIZE (raspberrypi-firmware-1.20180328_GH0.tar.gz) = 122075858 +TIMESTAMP = 1530704759 +SHA256 (raspberrypi-firmware-1.20180619_GH0.tar.gz) = e657478923220947321503ef980f3a6772d6f1e11b48c5c359bdb5e3d49355d9 +SIZE (raspberrypi-firmware-1.20180619_GH0.tar.gz) = 122571494 SHA256 (gonzoua-rpi3-psci-monitor-2b8890a_GH0.tar.gz) = a7b89678adea178359646a1e95a078d5c60d23821ba355f27f14ed7b28f32f4d SIZE (gonzoua-rpi3-psci-monitor-2b8890a_GH0.tar.gz) = 5115 diff --git a/sysutils/rpi-firmware/files/config.txt b/sysutils/rpi-firmware/files/config.txt index 89c66606b02..3d41741047e 100644 --- a/sysutils/rpi-firmware/files/config.txt +++ b/sysutils/rpi-firmware/files/config.txt @@ -2,3 +2,4 @@ init_uart_clock=3000000 enable_uart=1 kernel=u-boot.bin kernel7=u-boot.bin +dtoverlay=mmc diff --git a/sysutils/rpi-firmware/files/config_rpi_0_w.txt b/sysutils/rpi-firmware/files/config_rpi_0_w.txt new file mode 100644 index 00000000000..99f6e08426c --- /dev/null +++ b/sysutils/rpi-firmware/files/config_rpi_0_w.txt @@ -0,0 +1,6 @@ +init_uart_clock=3000000 +enable_uart=1 +kernel=u-boot.bin +kernel7=u-boot.bin +dtoverlay=mmc +dtoverlay=pi3-disable-bt diff --git a/sysutils/rpi-firmware/pkg-plist b/sysutils/rpi-firmware/pkg-plist index ce5bdd2b898..35bf8a79eeb 100644 --- a/sysutils/rpi-firmware/pkg-plist +++ b/sysutils/rpi-firmware/pkg-plist @@ -11,6 +11,7 @@ %%DATADIR%%/bcm2710-rpi-cm3.dtb %%DATADIR%%/bootcode.bin %%DATADIR%%/config.txt +%%DATADIR%%/config_rpi_0_w.txt %%DATADIR%%/config_rpi3.txt %%DATADIR%%/fixup.dat %%DATADIR%%/fixup_cd.dat diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index c233d88ad72..b9dafd9c1c5 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -20,8 +20,8 @@ BUILD_DEPENDS+= gsed:textproc/gsed \ mkimage:sysutils/u-boot-tools BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} -USES= tar:bz2 gmake python:2.7,build shebangfix -BINARY_ALIAS= swig=swig3.0 sed=gsed dtc=${LOCALBASE}/bin/dtc +USES= bison gmake python:2.7,build shebangfix tar:bz2 +BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0 SHEBANG_FILES= tools/binman/binman.py SSP_UNSAFE= yes @@ -29,10 +29,14 @@ UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} DESCR?= ${.CURDIR}/pkg-descr -MAKE_ARGS+= V=1 CROSS_COMPILE=${CROSS_COMPILE} DTC=${LOCALBASE}/bin/dtc PYTHON=${PYTHON_CMD} ${ARCHFLAGS} +MAKE_ARGS+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} ${ARCHFLAGS} NO_ARCH= yes +# Use upstreamed patches not yet mainlined +PATCH_DIST_STRIP= -p1 +PATCH_SITES+= http://patchwork.ozlabs.org/patch/ + # Sanity checks .if !defined(MODEL) && !defined(BOARD_CONFIG) && !defined(FAMILY) MODEL= NONE @@ -51,13 +55,23 @@ IGNORE+= FAMILY is not defined # Overrides for OMAP family UBOOT_PLIST_OMAP=u-boot.img MLO +UBOOT_METADATA_OMAP_FILES= ${UBOOT_PLIST_OMAP} +UBOOT_METADATA_OMAP_METHOD= file # Overrides for ALLWINNER family -UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin +UBOOT_PLIST_ALLWINNER=u-boot-sunxi-with-spl.bin +UBOOT_METADATA_ALLWINNER_FILES= ${UBOOT_PLIST_ALLWINNER} +UBOOT_METADATA_ALLWINNER_METHOD= raw +UBOOT_METADATA_ALLWINNER_RAW_OFFSET= 8 +UBOOT_METADATA_ALLWINNER_RAW_BS= 1k # Overrides for ALLWINNER64 family UBOOT_PLIST_ALLWINNER64=u-boot-sunxi-with-spl.bin UBOOT_ARCH_ALLWINNER64=aarch64 +UBOOT_METADATA_ALLWINNER64_FILES= ${UBOOT_PLIST_ALLWINNER} +UBOOT_METADATA_ALLWINNER64_METHOD= raw +UBOOT_METADATA_ALLWINNER64_RAW_OFFSET= 8 +UBOOT_METADATA_ALLWINNER64_RAW_BS= 1k # Overrides for Zynq 7000 family UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt @@ -65,12 +79,14 @@ UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt # Overrides for RPI family UBOOT_PLIST_RPI= u-boot.bin +UBOOT_METADATA_RPI_FILES= ${UBOOT_PLIST_RPI} +UBOOT_METADATA_RPI_METHOD= file # Uboot variables .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2018.03 +UBOOT_VERSION?= 2018.07 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu}) UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}} @@ -112,28 +128,49 @@ PLIST_FILES+= ${UBOOT_DIR}/${i} .endfor PLIST_FILES+= ${UBOOT_DIR}/README +.if defined(UBOOT_METADATA_${FAMILY:tu}_METHOD) +METADATA_METHOD=${UBOOT_METADATA_${FAMILY:tu}_METHOD} +METADATA_FILES=${UBOOT_METADATA_${FAMILY:tu}_FILES} +PLIST_FILES+= ${UBOOT_DIR}/metadata +UBOOT_PLIST+= metadata +.if ${METADATA_METHOD} == "raw" +METADATA_OFFSET=${UBOOT_METADATA_${FAMILY:tu}_RAW_OFFSET} +METADATA_BS=${UBOOT_METADATA_${FAMILY:tu}_RAW_BS} +.elif ${METADATA_METHOD} == "file" +.else +.error "Unsupported METADATA_METHOD" +.endif +.endif + post-patch: @${REINPLACE_CMD} -e "s|make|${MAKE_CMD}|" ${WRKSRC}/scripts/kconfig/merge_config.sh - ${CP} ${FILESDIR}/FreeBSD_Fragment ${WRKSRC}/configs/ ${CP} ${FILESDIR}/boot.cmd ${WRKSRC}/ +.if defined(METADATA_METHOD) + @echo "METHOD=uboot-${METADATA_METHOD}" > ${WRKSRC}/metadata + @echo "FILES=\"${METADATA_FILES}\"" >> ${WRKSRC}/metadata +.if ${METADATA_METHOD} == "raw" + @echo "OFFSET=${METADATA_OFFSET}" >> ${WRKSRC}/metadata + @echo "BS=${METADATA_BS}" >> ${WRKSRC}/metadata +.elif ${METADATA_METHOD} == "file" +.endif +.endif -.if ${UBOOT_ARCH} == arm +.if ${UBOOT_ARCH} == arm && !defined(CONFIG_FRAGMENT) # For armv6/v7 we want CONFIG_API # Use a KConfig fragment for that +FRAGMENT_NAME= FreeBSD_Fragment +CONFIG_FRAGMENT= ${FILESDIR}/${FRAGMENT_NAME} +.endif + +.if defined(CONFIG_FRAGMENT) do-configure: - (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/FreeBSD_Fragment) + ${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/ + (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME}) .else do-configure: (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG}) .endif -# U-Boot for Allwinner 64bits SoCs is splited in two parts -# Generate a single binary to ease deployement on sdcard -.if defined(FAMILY) && ${FAMILY} == allwinner64 -post-build: - ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin -.endif - .if ${UBOOT_ARCH} == arm post-build: mkimage -C none -A arm -T script -d ${FILESDIR}/boot.cmd ${WRKSRC}/boot.scr diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 066193f8ed8..f58143ae218 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1521912727 -SHA256 (u-boot-2018.03.tar.bz2) = 7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd -SIZE (u-boot-2018.03.tar.bz2) = 12304292 +TIMESTAMP = 1532285141 +SHA256 (u-boot-2018.07.tar.bz2) = 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4 +SIZE (u-boot-2018.07.tar.bz2) = 12586212 +SHA256 (937869/mbox/?) = 24fbed0558cc51d22741f72c5676eee1109af59db60c845437db19143322454d +SIZE (937869/mbox/?) = 1238 +SHA256 (939129/mbox/?) = bc389b925af88f0e49fe459eefa6de3eb950537457b333958d758c38976210d0 +SIZE (939129/mbox/?) = 1112 diff --git a/sysutils/u-boot-master/files/FreeBSD_Fragment b/sysutils/u-boot-master/files/FreeBSD_Fragment index daba07203d5..630d295cc8f 100644 --- a/sysutils/u-boot-master/files/FreeBSD_Fragment +++ b/sysutils/u-boot-master/files/FreeBSD_Fragment @@ -1 +1,3 @@ CONFIG_API=y +CONFIG_ARMV7_NONSEC=n +CONFIG_CMD_CACHE=y diff --git a/sysutils/u-boot-orangepi-r1/Makefile b/sysutils/u-boot-orangepi-r1/Makefile new file mode 100644 index 00000000000..01dd80ce456 --- /dev/null +++ b/sysutils/u-boot-orangepi-r1/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../u-boot-master + +MODEL= orangepi_r1 +BOARD_CONFIG= orangepi_r1_defconfig +FAMILY= allwinner + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-orangepi-r1/pkg-descr b/sysutils/u-boot-orangepi-r1/pkg-descr new file mode 100644 index 00000000000..ed7a36b7c4e --- /dev/null +++ b/sysutils/u-boot-orangepi-r1/pkg-descr @@ -0,0 +1,9 @@ +U-Boot loader and related files for the OrangePI R1. + +To install this bootloader on an sdcard just do: +dd if=/usr/local/share/u-boot/u-boot-orangepi-r1/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=sync + +For information about running FreeBSD on Allwinner boards, see +https://wiki.freebsd.org/FreeBSD/arm/Allwinner + +WWW: http://www.denx.de/wiki/U-Boot diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile index 0cb005991e6..da591958e53 100644 --- a/sysutils/u-boot-rpi/Makefile +++ b/sysutils/u-boot-rpi/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -MAINTAINER= manu@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= rpi @@ -9,4 +8,10 @@ FAMILY= rpi DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi_fragment +FRAGMENT_NAME= rpi_fragment + .include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-rpi/files/rpi_fragment b/sysutils/u-boot-rpi/files/rpi_fragment new file mode 100644 index 00000000000..56ca46fe5f3 --- /dev/null +++ b/sysutils/u-boot-rpi/files/rpi_fragment @@ -0,0 +1,3 @@ +CONFIG_OF_EMBED=n +CONFIG_OF_BOARD=y +CONFIG_API=y diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile index 8c64565362c..1df2881fb83 100644 --- a/sysutils/u-boot-rpi2/Makefile +++ b/sysutils/u-boot-rpi2/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -MAINTAINER= manu@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= rpi2 @@ -9,4 +8,10 @@ FAMILY= rpi DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi2_fragment +FRAGMENT_NAME= rpi2_fragment + .include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-rpi2/files/rpi2_fragment b/sysutils/u-boot-rpi2/files/rpi2_fragment new file mode 100644 index 00000000000..56ca46fe5f3 --- /dev/null +++ b/sysutils/u-boot-rpi2/files/rpi2_fragment @@ -0,0 +1,3 @@ +CONFIG_OF_EMBED=n +CONFIG_OF_BOARD=y +CONFIG_API=y diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile index 8500c025837..bfc68a18810 100644 --- a/sysutils/u-boot-rpi3/Makefile +++ b/sysutils/u-boot-rpi3/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ -MAINTAINER= uboot@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master -PORTREVISION= 1 MODEL= rpi3 BOARD_CONFIG= rpi_3_defconfig @@ -12,5 +10,10 @@ UBOOT_ARCH= aarch64 DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware EXTRA_PATCHES= ${.CURDIR}/files/ +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi3_fragment +FRAGMENT_NAME= rpi3_fragment .include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c b/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c deleted file mode 100644 index 18891f4e6b6..00000000000 --- a/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c +++ /dev/null @@ -1,13 +0,0 @@ ---- board/raspberrypi/rpi/rpi.c.orig 2018-03-13 12:02:19 UTC -+++ board/raspberrypi/rpi/rpi.c -@@ -273,6 +273,10 @@ static void set_fdt_addr(void) - return; - - env_set_hex("fdt_addr", fw_dtb_pointer); -+ /* -+ * Set fdtcontroladdr too so it can be picked up by boot script -+ */ -+ env_set_hex("fdtcontroladdr", fw_dtb_pointer); - } - - /* diff --git a/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig b/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig deleted file mode 100644 index 23982f82ab5..00000000000 --- a/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig +++ /dev/null @@ -1,14 +0,0 @@ ---- configs/rpi_3_defconfig.orig 2018-03-13 12:02:19 UTC -+++ configs/rpi_3_defconfig -@@ -13,9 +13,9 @@ CONFIG_SYS_PROMPT="U-Boot> " - CONFIG_CMD_GPIO=y - CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y --CONFIG_OF_EMBED=y -+CONFIG_OF_BOARD=y - CONFIG_ENV_FAT_INTERFACE="mmc" --CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" - CONFIG_DM_KEYBOARD=y - CONFIG_DM_MMC=y - CONFIG_MMC_SDHCI=y diff --git a/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c b/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c deleted file mode 100644 index 59467ccd954..00000000000 --- a/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c +++ /dev/null @@ -1,10 +0,0 @@ ---- drivers/usb/host/dwc2.c.orig 2018-03-13 12:02:19 UTC -+++ drivers/usb/host/dwc2.c -@@ -1283,6 +1283,7 @@ struct dm_usb_ops dwc2_usb_ops = { - - static const struct udevice_id dwc2_usb_ids[] = { - { .compatible = "brcm,bcm2835-usb" }, -+ { .compatible = "brcm,bcm2708-usb" }, - { .compatible = "snps,dwc2" }, - { } - }; diff --git a/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c b/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c deleted file mode 100644 index 9dd06527295..00000000000 --- a/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c +++ /dev/null @@ -1,10 +0,0 @@ ---- drivers/video/bcm2835.c.orig 2018-03-13 12:02:19 UTC -+++ drivers/video/bcm2835.c -@@ -49,6 +49,7 @@ static int bcm2835_video_probe(struct udevice *dev) - - static const struct udevice_id bcm2835_video_ids[] = { - { .compatible = "brcm,bcm2835-hdmi" }, -+ { .compatible = "brcm,bcm2708-fb" }, - { } - }; - diff --git a/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h b/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h deleted file mode 100644 index 97c875ebef0..00000000000 --- a/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/configs/rpi.h.orig 2018-03-13 12:02:19 UTC -+++ include/configs/rpi.h -@@ -133,6 +133,7 @@ - - #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ -+ func(MMC, mmc, 1) \ - func(USB, usb, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) diff --git a/sysutils/u-boot-rpi3/files/rpi3_fragment b/sysutils/u-boot-rpi3/files/rpi3_fragment new file mode 100644 index 00000000000..af01102588e --- /dev/null +++ b/sysutils/u-boot-rpi3/files/rpi3_fragment @@ -0,0 +1,3 @@ +CONFIG_OF_EMBED=n +CONFIG_OF_BOARD=y +CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" diff --git a/textproc/py-Chameleon/Makefile b/textproc/py-Chameleon/Makefile index 51ee0e59d76..a2b2267b449 100644 --- a/textproc/py-Chameleon/Makefile +++ b/textproc/py-Chameleon/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Chameleon -PORTVERSION= 3.3 +PORTVERSION= 3.4 CATEGORIES= textproc www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-Chameleon/distinfo b/textproc/py-Chameleon/distinfo index 0bf5f5895ae..42a104335fb 100644 --- a/textproc/py-Chameleon/distinfo +++ b/textproc/py-Chameleon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527234565 -SHA256 (Chameleon-3.3.tar.gz) = 77d1ae339caf4f8a0b2c19a4882e5cdf71367997d79c523a196dacfbfa365ec7 -SIZE (Chameleon-3.3.tar.gz) = 116743 +TIMESTAMP = 1532308812 +SHA256 (Chameleon-3.4.tar.gz) = 7750865a68b469b34cbc60b9927f7e5c609808b6b966bf75bf8556e6ed48912c +SIZE (Chameleon-3.4.tar.gz) = 116991 diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile index 80a8278854b..acffb13b1ca 100644 --- a/textproc/py-humanfriendly/Makefile +++ b/textproc/py-humanfriendly/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= humanfriendly -PORTVERSION= 4.12 +PORTVERSION= 4.16.1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-humanfriendly/distinfo b/textproc/py-humanfriendly/distinfo index 0b63697274a..e0bde0ae4b5 100644 --- a/textproc/py-humanfriendly/distinfo +++ b/textproc/py-humanfriendly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524845389 -SHA256 (humanfriendly-4.12.tar.gz) = c1d4be8881897b76fc56bf1f0b59ed03fada2da994b81a41652833b5dc641ace -SIZE (humanfriendly-4.12.tar.gz) = 329296 +TIMESTAMP = 1532301264 +SHA256 (humanfriendly-4.16.1.tar.gz) = ed1e98ae056b597f15b41bddcc32b9f21e6ab4f3445f9faad1668675de759f7b +SIZE (humanfriendly-4.16.1.tar.gz) = 343828 diff --git a/www/R-cran-httpuv/Makefile b/www/R-cran-httpuv/Makefile index bea93012a26..ff19d2eb4ff 100644 --- a/www/R-cran-httpuv/Makefile +++ b/www/R-cran-httpuv/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= httpuv -PORTVERSION= 1.4.4.2 +PORTVERSION= 1.4.5 CATEGORIES= www DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/www/R-cran-httpuv/distinfo b/www/R-cran-httpuv/distinfo index 39d93bc5204..a4b6adc596f 100644 --- a/www/R-cran-httpuv/distinfo +++ b/www/R-cran-httpuv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530767058 -SHA256 (httpuv_1.4.4.2.tar.gz) = e26478e77992a1c18c37fcc0949e849778527fc140c730c84bdd198692448c0e -SIZE (httpuv_1.4.4.2.tar.gz) = 1675603 +TIMESTAMP = 1532324596 +SHA256 (httpuv_1.4.5.tar.gz) = f19113d45ba0617ff826abd7963224db61fa0a3dbfdde21f802419f7b362b7b5 +SIZE (httpuv_1.4.5.tar.gz) = 1675895 diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 7aa3e02cb4d..e0a2d30eea0 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 65.0.3325.181 -PORTREVISION= 6 +PORTVERSION= 67.0.3396.87 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -19,7 +18,8 @@ BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) -BUILD_DEPENDS+= gperf:devel/gperf \ +BUILD_DEPENDS+= git:devel/git \ + gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ @@ -49,7 +49,6 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ - libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ @@ -121,7 +120,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ - use_system_sqlite=false \ extra_cxxflags="-I${LOCALBASE}/include" \ extra_ldflags="-L${LOCALBASE}/lib" # TODO: investigate building with these options: @@ -245,7 +243,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac freetype harfbuzz-ng libdrm libvpx libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: diff --git a/www/chromium/distinfo b/www/chromium/distinfo index e6c679a2da1..301e2d68169 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1521889794 -SHA256 (chromium-65.0.3325.181.tar.xz) = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687 -SIZE (chromium-65.0.3325.181.tar.xz) = 570386836 -SHA256 (chromium-65.0.3325.181-testdata.tar.xz) = 03018143ffe8c96ca2710e0c48bb19f1e122cf07394f15b73a814c2f6b2a3cdb -SIZE (chromium-65.0.3325.181-testdata.tar.xz) = 252462976 +TIMESTAMP = 1531563535 +SHA256 (chromium-67.0.3396.87.tar.xz) = 5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d +SIZE (chromium-67.0.3396.87.tar.xz) = 591491608 +SHA256 (chromium-67.0.3396.87-testdata.tar.xz) = 091923fca8baca0e949d1d8e490cabdec0a536c3af3d67d398c6465b67c5fb3c +SIZE (chromium-67.0.3396.87-testdata.tar.xz) = 261857908 diff --git a/www/chromium/files/audio_manager_openbsd.cc b/www/chromium/files/audio_manager_openbsd.cc index ffcd9eef94f..1b021dd0833 100644 --- a/www/chromium/files/audio_manager_openbsd.cc +++ b/www/chromium/files/audio_manager_openbsd.cc @@ -167,10 +167,10 @@ std::unique_ptr CreateAudioManager( DLOG(WARNING) << "CreateAudioManager"; #if defined(USE_SNDIO) UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1); - return base::MakeUnique(std::move(audio_thread), + return std::make_unique(std::move(audio_thread), audio_log_factory); #else - return base::MakeUnique(std::move(audio_thread), + return std::make_unique(std::move(audio_thread), audio_log_factory); #endif diff --git a/www/chromium/files/extra-patch-llvm-base b/www/chromium/files/extra-patch-llvm-base index 9a32190d6ad..434eeac7b44 100644 --- a/www/chromium/files/extra-patch-llvm-base +++ b/www/chromium/files/extra-patch-llvm-base @@ -43,3 +43,79 @@ forward_variables_from(invoker, [ +--- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2018-07-21 13:05:54.418405000 +0200 +@@ -51,7 +51,7 @@ + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -375,8 +375,6 @@ + "-Wl,-z,relro", + ] + if (!using_sanitizer) { +- ldflags += [ "-Wl,-z,defs" ] +- + # Functions interposed by the sanitizers can make ld think + # that some libraries aren't needed when they actually are, + # http://crbug.com/234010. As workaround, disable --as-needed. +@@ -467,7 +465,7 @@ + # TODO(hans): Remove this once Clang generates better optimized debug info by + # default. https://crbug.com/765793 + if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { ++ target_os != "chromeos" && !is_bsd) { + cflags += [ + "-Xclang", + "-mllvm", +@@ -708,7 +706,7 @@ + cflags += [ "-mtune=$arm_tune" ] + } + } else if (current_cpu == "arm64") { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + cflags += [ "--target=aarch64-linux-gnu" ] + ldflags += [ "--target=aarch64-linux-gnu" ] + } +@@ -1387,10 +1385,6 @@ + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + if (llvm_force_head_revision) { + cflags += [ +@@ -2096,7 +2090,7 @@ + # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f + cflags += [ "-gdwarf-3" ] + } +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] + } + if (use_debug_fission && !is_nacl) { + cflags += [ "-gsplit-dwarf" ] +@@ -2110,7 +2104,7 @@ + # DWARF info may be corrupt; offsets in a range list entry are in different + # sections" there. Maybe just a bug in nacl_switch_32.S. + if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && +- (use_gold || use_lld)) { ++ (use_gold || use_lld) && !is_bsd) { + if (is_clang) { + # This flag enables the GNU-format pubnames and pubtypes sections, + # which lld needs in order to generate a correct GDB index. +@@ -2207,7 +2201,7 @@ + if (!is_win && fatal_linker_warnings && + !(is_chromeos && current_cpu == "arm") && + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 diff --git a/www/chromium/files/extra-patch-llvm-port b/www/chromium/files/extra-patch-llvm-port index 1e59c7000b4..a1ef24de0b1 100644 --- a/www/chromium/files/extra-patch-llvm-port +++ b/www/chromium/files/extra-patch-llvm-port @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2017-06-05 19:03:01 UTC -+++ build/toolchain/gcc_toolchain.gni -@@ -19,6 +19,11 @@ analyzer_wrapper = +--- build/toolchain/gcc_toolchain.gni.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/toolchain/gcc_toolchain.gni 2018-07-21 12:38:45.107087000 +0200 +@@ -25,6 +25,11 @@ rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", root_build_dir) + " --mode=clang" @@ -12,7 +12,22 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -548,13 +553,22 @@ template("clang_toolchain") { +@@ -343,12 +348,12 @@ + # We use slightly different arflags for AIX. + extra_arflags = "-r -c -s" + } else { +- extra_arflags = "-r -c -s -D" ++ extra_arflags = "rcsD" + } + + # Almost all targets build with //build/config/compiler:thin_archive which + # adds -T to arflags. +- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\"" ++ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} $extra_arflags @\"$rspfile\"" + description = "AR {{output}}" + rspfile_content = "{{inputs}}" + outputs = [ +@@ -608,13 +613,22 @@ } gcc_toolchain(target_name) { @@ -42,3 +57,92 @@ forward_variables_from(invoker, [ +--- build/config/compiler/BUILD.gn.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2018-07-21 12:57:03.823912000 +0200 +@@ -51,7 +51,7 @@ + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -375,8 +375,6 @@ + "-Wl,-z,relro", + ] + if (!using_sanitizer) { +- ldflags += [ "-Wl,-z,defs" ] +- + # Functions interposed by the sanitizers can make ld think + # that some libraries aren't needed when they actually are, + # http://crbug.com/234010. As workaround, disable --as-needed. +@@ -467,7 +465,7 @@ + # TODO(hans): Remove this once Clang generates better optimized debug info by + # default. https://crbug.com/765793 + if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { ++ target_os != "chromeos" && !is_bsd) { + cflags += [ + "-Xclang", + "-mllvm", +@@ -708,7 +706,7 @@ + cflags += [ "-mtune=$arm_tune" ] + } + } else if (current_cpu == "arm64") { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + cflags += [ "--target=aarch64-linux-gnu" ] + ldflags += [ "--target=aarch64-linux-gnu" ] + } +@@ -1387,10 +1385,6 @@ + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + if (llvm_force_head_revision) { + cflags += [ +@@ -1572,9 +1566,9 @@ + if ((is_posix && !is_nacl) || is_fuchsia) { + # TODO(thomasanderson): Enable on ChromeOS builds once + # https://crbug.com/829956 is fixed. +- if (default_toolchain != "//build/toolchain/cros:target") { +- arflags = [ "-T" ] +- } ++ # if (default_toolchain != "//build/toolchain/cros:target") { ++ # arflags = [ "-T" ] ++ # } + } + } + +@@ -2096,7 +2090,7 @@ + # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f + cflags += [ "-gdwarf-3" ] + } +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] + } + if (use_debug_fission && !is_nacl) { + cflags += [ "-gsplit-dwarf" ] +@@ -2110,7 +2104,7 @@ + # DWARF info may be corrupt; offsets in a range list entry are in different + # sections" there. Maybe just a bug in nacl_switch_32.S. + if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && +- (use_gold || use_lld)) { ++ (use_gold || use_lld) && !is_bsd) { + if (is_clang) { + # This flag enables the GNU-format pubnames and pubtypes sections, + # which lld needs in order to generate a correct GDB index. +@@ -2207,7 +2201,7 @@ + if (!is_win && fatal_linker_warnings && + !(is_chromeos && current_cpu == "arm") && + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 3ddf88089fb..1d5eff6a485 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100 -+++ BUILD.gn 2018-03-03 19:04:30.972689000 +0100 -@@ -361,7 +361,7 @@ +--- BUILD.gn.orig 2018-06-13 00:09:58.000000000 +0200 ++++ BUILD.gn 2018-07-14 12:26:56.482016000 +0200 +@@ -359,7 +359,7 @@ } } @@ -9,16 +9,16 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -406,8 +406,6 @@ +@@ -401,8 +401,6 @@ "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", - "//sandbox/linux:chrome_sandbox", - "//sandbox/linux:sandbox_linux_unittests", + "//testing:empty_main", ] - if (use_dbus) { -@@ -464,10 +462,6 @@ +@@ -460,10 +458,6 @@ "//chrome/test/chromedriver:chromedriver", "//chrome/test/chromedriver:chromedriver_tests", "//components/sync:run_sync_testserver", @@ -29,8 +29,8 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -522,10 +516,6 @@ - "//mojo/edk/test:mojo_public_system_perftests", +@@ -519,10 +513,6 @@ + "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", - "//third_party/breakpad:dump_syms($host_toolchain)", @@ -40,16 +40,16 @@ ] if (!is_android) { -@@ -593,7 +583,7 @@ - deps += - [ "//chrome/installer/mini_installer:next_version_mini_installer" ] +@@ -598,7 +588,7 @@ + host_os == "win") { + deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } - } else if (!is_android && !is_ios && !is_fuchsia) { + } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -835,7 +825,6 @@ +@@ -818,7 +808,6 @@ "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -57,7 +57,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -939,7 +928,7 @@ +@@ -921,7 +910,7 @@ ] } @@ -66,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -948,7 +937,7 @@ +@@ -930,7 +919,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1064,9 +1053,6 @@ +@@ -1055,9 +1044,6 @@ if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] @@ -84,4 +84,4 @@ - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } if (is_win || is_android) { - data_deps += [ "//chrome/test:angle_perftests" ] + data_deps += [ diff --git a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc new file mode 100644 index 00000000000..cba69a67511 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc @@ -0,0 +1,51 @@ +--- base/files/file_path_watcher_stub.cc.orig 2018-07-19 23:00:07.807326000 +0200 ++++ base/files/file_path_watcher_stub.cc 2018-07-19 23:05:24.785603000 +0200 +@@ -1,14 +1,15 @@ +-// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Copyright 2014 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + +-// This file exists for Unix systems which don't have the inotify headers, and +-// thus cannot build file_watcher_inotify.cc + +-#include "base/files/file_path_watcher.h" ++#include + ++#include "base/files/file_path_watcher.h" ++#include "base/files/file_path_watcher_kqueue.h" + #include "base/macros.h" + #include "base/memory/ptr_util.h" ++#include "build/build_config.h" + + namespace base { + +@@ -22,12 +23,26 @@ + bool Watch(const FilePath& path, + bool recursive, + const FilePathWatcher::Callback& callback) override { +- return false; ++ DCHECK(!impl_.get()); ++ if (recursive) { ++ if (!FilePathWatcher::RecursiveWatchAvailable()) ++ return false; ++ } else { ++ impl_ = std::make_unique(); ++ } ++ DCHECK(impl_.get()); ++ return impl_->Watch(path, recursive, callback); + } + +- void Cancel() override {} ++ void Cancel() override { ++ if (impl_.get()) ++ impl_->Cancel(); ++ set_cancelled(); ++ } + + private: ++ std::unique_ptr impl_; ++ + DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl); + }; + diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h new file mode 100644 index 00000000000..b8da5df6eb7 --- /dev/null +++ b/www/chromium/files/patch-base_process_kill.h @@ -0,0 +1,11 @@ +--- base/process/kill.h.orig 2018-07-19 22:11:43.638992000 +0200 ++++ base/process/kill.h 2018-07-19 22:12:06.613065000 +0200 +@@ -111,7 +111,7 @@ + BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( + ProcessHandle handle, int* exit_code); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Spawns a thread to wait asynchronously for the child |process| to exit + // and then reaps it. + BASE_EXPORT void EnsureProcessGetsReaped(Process process); diff --git a/www/chromium/files/patch-base_process_kill_posix.cc b/www/chromium/files/patch-base_process_kill_posix.cc new file mode 100644 index 00000000000..0f24fdcd822 --- /dev/null +++ b/www/chromium/files/patch-base_process_kill_posix.cc @@ -0,0 +1,11 @@ +--- base/process/kill_posix.cc.orig 2018-07-19 22:11:49.327358000 +0200 ++++ base/process/kill_posix.cc 2018-07-19 22:12:22.837132000 +0200 +@@ -167,7 +167,7 @@ + 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void EnsureProcessGetsReaped(Process process) { + DCHECK(!process.is_current()); + diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc new file mode 100644 index 00000000000..5ba03737172 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -0,0 +1,11 @@ +--- base/process/process_handle.cc.orig 2018-07-19 22:31:30.212555000 +0200 ++++ base/process/process_handle.cc 2018-07-19 22:32:27.185612000 +0200 +@@ -39,7 +39,7 @@ + return g_unique_id; + } + +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + + void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { + g_unique_id = MangleProcessId(pid_outside_of_namespace); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h new file mode 100644 index 00000000000..a445193a491 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -0,0 +1,11 @@ +--- base/process/process_handle.h.orig 2018-07-19 22:31:39.988330000 +0200 ++++ base/process/process_handle.h 2018-07-19 22:32:06.977544000 +0200 +@@ -64,7 +64,7 @@ + // a process's PID. + BASE_EXPORT uint32_t GetUniqueIdForProcess(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // When a process is started in a different PID namespace from the browser + // process, this function must be called with the process's PID in the browser's + // PID namespace in order to initialize its unique ID. Not thread safe. diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 22259506b40..26b1ceef669 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,8 +1,8 @@ ---- base/process/process_metrics_freebsd.cc.orig 2018-02-24 16:25:08.000000000 +0100 -+++ base/process/process_metrics_freebsd.cc 2018-03-03 19:25:40.067505000 +0100 -@@ -12,6 +12,10 @@ - #include "base/macros.h" +--- base/process/process_metrics_freebsd.cc.orig 2018-06-13 00:10:01.000000000 +0200 ++++ base/process/process_metrics_freebsd.cc 2018-07-20 00:07:42.005261000 +0200 +@@ -13,6 +13,10 @@ #include "base/memory/ptr_util.h" + #include "base/process/process_metrics_iocounters.h" +#include /* getpagesize() */ +#include /* O_RDONLY */ @@ -11,19 +11,7 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -25,6 +29,11 @@ - return WrapUnique(new ProcessMetrics(process)); - } - -+bool GetVmStatInfo(VmStatInfo* vmstat) { -+ NOTIMPLEMENTED(); -+ return false; -+} -+ - size_t ProcessMetrics::GetPagefileUsage() const { - struct kinfo_proc info; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; -@@ -118,6 +127,60 @@ +@@ -61,6 +65,65 @@ pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); @@ -81,6 +69,11 @@ + meminfo->swap_free = (swap_total - swap_used) * pagesizeKB; + + return true; ++} ++ ++uint64_t ProcessMetrics::GetVmSwapBytes() const { ++ NOTIMPLEMENTED(); ++ return 0; } } // namespace base diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni index ef4e8f3b803..d963319c462 100644 --- a/www/chromium/files/patch-build_config_allocator.gni +++ b/www/chromium/files/patch-build_config_allocator.gni @@ -1,15 +1,15 @@ ---- build/config/allocator.gni.orig 2017-07-25 21:04:48.000000000 +0200 -+++ build/config/allocator.gni 2017-08-01 23:13:58.535952000 +0200 -@@ -7,7 +7,7 @@ +--- build/config/allocator.gni.orig 2018-06-13 00:10:02.000000000 +0200 ++++ build/config/allocator.gni 2018-07-14 13:12:35.947359000 +0200 +@@ -6,7 +6,7 @@ + # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. - if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan || - is_lsan || is_tsan || is_msan || is_win || is_syzyasan || is_fuchsia || -- (is_linux && target_cpu == "arm64")) { -+ (is_linux && target_cpu == "arm64") || is_bsd) { + if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan || +- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) { ++ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) { _default_allocator = "none" } else { _default_allocator = "tcmalloc" -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ # against the debug CRT with "is_nacl=false". if ((is_linux || is_android || is_mac || (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan && diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn deleted file mode 100644 index 143285f0120..00000000000 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ /dev/null @@ -1,93 +0,0 @@ ---- build/config/compiler/BUILD.gn.orig 2018-03-20 23:05:14.000000000 +0100 -+++ build/config/compiler/BUILD.gn 2018-03-24 12:40:43.469299000 +0100 -@@ -48,7 +48,7 @@ - # only two architectures that are currently checked in). Turn this off when - # you are using a custom toolchain and need to control -B in cflags. - linux_use_bundled_binutils = -- linux_use_bundled_binutils_override && is_linux && -+ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && - (current_cpu == "x64" || current_cpu == "x86") - binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", - root_build_dir) -@@ -365,8 +365,6 @@ - "-Wl,-z,relro", - ] - if (!using_sanitizer) { -- ldflags += [ "-Wl,-z,defs" ] -- - # Functions interposed by the sanitizers can make ld think - # that some libraries aren't needed when they actually are, - # http://crbug.com/234010. As workaround, disable --as-needed. -@@ -469,7 +467,7 @@ - # TODO(hans): Remove this once Clang generates better optimized debug info by - # default. https://crbug.com/765793 - if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -+ target_os != "chromeos" && !is_bsd) { - cflags += [ - "-Xclang", - "-mllvm", -@@ -667,7 +665,7 @@ - cflags += [ "-mtune=$arm_tune" ] - } - } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1317,27 +1315,8 @@ - # TODO(hans): https://crbug.com/637306 - "-Wno-address-of-packed-member", - -- # TODO(hans): https://crbug.com/681136 -- "-Wno-unused-lambda-capture", -- - # TODO(thakis ): https://crbug.com/683349 - "-Wno-user-defined-warnings", -- -- # TODO(thakis): https://crbug.com/753973 -- "-Wno-enum-compare-switch", -- -- # TODO(hans): https://crbug.com/763392 -- "-Wno-tautological-unsigned-zero-compare", -- -- # TODO(hans): https://crbug.com/766891 -- "-Wno-null-pointer-arithmetic", -- -- # TODO(hans): https://crbug.com/767059 -- # Disable -Wtautological-constant-compare (and implicitly also -- # -Wtautological-unsigned-enum-zero-compare), but re-enable -- # useful sub-diagnostics in that group. -- "-Wno-tautological-constant-compare", -- "-Wtautological-constant-out-of-range-compare", - ] - } else if (use_xcode_clang) { - cflags += [ -@@ -1952,7 +1931,7 @@ - # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f - cflags += [ "-gdwarf-3" ] - } -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } - if (use_debug_fission && !is_nacl) { - cflags += [ "-gsplit-dwarf" ] -@@ -1966,7 +1945,7 @@ - # DWARF info may be corrupt; offsets in a range list entry are in different - # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. -@@ -2052,7 +2031,7 @@ - if (!is_win && fatal_linker_warnings && - !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn new file mode 100644 index 00000000000..8622d398e2d --- /dev/null +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/linux/BUILD.gn.orig 2018-07-19 22:09:59.968726000 +0200 ++++ build/config/linux/BUILD.gn 2018-07-19 22:10:16.334896000 +0200 +@@ -28,7 +28,7 @@ + } + + if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && +- (!use_custom_libcxx || current_cpu == "mipsel")) { ++ (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { + libs = [ "atomic" ] + } + } diff --git a/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn b/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn new file mode 100644 index 00000000000..54b990f5fc6 --- /dev/null +++ b/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn @@ -0,0 +1,22 @@ +--- build/linux/unbundle/ffmpeg.gn.orig 2018-07-20 01:03:59.604084000 +0200 ++++ build/linux/unbundle/ffmpeg.gn 2018-07-20 01:04:45.406745000 +0200 +@@ -14,8 +14,8 @@ + ] + } + +-buildflag_header("ffmpeg_buildflags") { +- header = "ffmpeg_buildflags.h" ++buildflag_header("ffmpeg_features") { ++ header = "ffmpeg_features.h" + flags = [ "USE_SYSTEM_FFMPEG=true" ] + } + +@@ -30,7 +30,7 @@ + + source_set("ffmpeg") { + deps = [ +- ":ffmpeg_buildflags", ++ ":ffmpeg_features", + ":ffmpeg_shim", + ] + public_configs = [ ":system_ffmpeg" ] diff --git a/www/chromium/files/patch-build_linux_unbundle_libusb.gn b/www/chromium/files/patch-build_linux_unbundle_libusb.gn new file mode 100644 index 00000000000..55c6dbb7f97 --- /dev/null +++ b/www/chromium/files/patch-build_linux_unbundle_libusb.gn @@ -0,0 +1,27 @@ +--- build/linux/unbundle/libusb.gn.orig 2018-07-20 03:07:05.793992000 +0200 ++++ build/linux/unbundle/libusb.gn 2018-07-20 03:07:35.792417000 +0200 +@@ -0,0 +1,24 @@ ++# Copyright 2016 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/linux/pkg_config.gni") ++import("//build/shim_headers.gni") ++ ++pkg_config("system_libusb") { ++ packages = [ "libusb-1.0" ] ++} ++ ++shim_headers("libusb_shim") { ++ root_path = "src/libusb" ++ headers = [ ++ "libusb.h", ++ ] ++} ++ ++source_set("libusb") { ++ deps = [ ++ ":libusb_shim", ++ ] ++ public_configs = [ ":system_libusb" ] ++} diff --git a/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py b/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py new file mode 100644 index 00000000000..5dd7a9d2391 --- /dev/null +++ b/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py @@ -0,0 +1,10 @@ +--- build/linux/unbundle/replace_gn_files.py.orig 2018-07-20 03:07:59.446131000 +0200 ++++ build/linux/unbundle/replace_gn_files.py 2018-07-20 03:08:31.519350000 +0200 +@@ -27,6 +27,7 @@ + 'libevent': 'base/third_party/libevent/BUILD.gn', + 'libjpeg': 'third_party/libjpeg.gni', + 'libpng': 'third_party/libpng/BUILD.gn', ++ 'libusb': 'third_party/libusb/BUILD.gn', + 'libvpx': 'third_party/libvpx/BUILD.gn', + 'libwebp': 'third_party/libwebp/BUILD.gn', + 'libxml': 'third_party/libxml/BUILD.gn', diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 91c193713db..13cdee68690 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,15 @@ ---- chrome/browser/about_flags.cc.orig 2018-03-20 23:05:16.000000000 +0100 -+++ chrome/browser/about_flags.cc 2018-03-24 13:04:35.001279000 +0100 -@@ -2429,12 +2429,12 @@ +--- chrome/browser/about_flags.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/about_flags.cc 2018-07-20 16:41:11.196156000 +0200 +@@ -593,7 +593,7 @@ + switches::kForceDirectionRTL}, + }; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + // Feature used to enable the identification of open tabs given URLs in + // suggestions, and converting those suggestions to ones that allow switching to + // the tab if found. Currently only on the desktop. Includes button option +@@ -2441,12 +2441,12 @@ flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS @@ -15,7 +24,7 @@ {"enable-origin-trials", flag_descriptions::kOriginTrialsName, flag_descriptions::kOriginTrialsDescription, kOsAll, FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -3047,7 +3047,7 @@ +@@ -3058,7 +3058,7 @@ flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, @@ -24,7 +33,7 @@ {"omnibox-entity-suggestions", flag_descriptions::kOmniboxEntitySuggestionsName, flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, -@@ -3066,7 +3066,7 @@ +@@ -3077,7 +3077,7 @@ {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)}, diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 672652837c6..bae35a6d02a 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/browser_process_impl.cc 2017-12-24 00:34:24.918627000 +0100 -@@ -170,7 +170,7 @@ +--- chrome/browser/browser_process_impl.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/browser_process_impl.cc 2018-07-14 13:27:02.197056000 +0200 +@@ -180,7 +180,7 @@ #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" #endif @@ -9,12 +9,12 @@ #include "chrome/browser/resource_coordinator/tab_manager.h" #endif -@@ -813,7 +813,7 @@ +@@ -856,7 +856,7 @@ resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - if (!tab_manager_) - tab_manager_ = base::MakeUnique(); - return tab_manager_.get(); + if (!tab_manager_) { + tab_manager_ = std::make_unique(); + tab_lifecycle_unit_source_ = diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index da2dd81c114..c3bd477966d 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,24 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/browser/browser_resources.grd 2018-03-04 09:28:51.895810000 +0100 -@@ -77,7 +77,7 @@ - - - -- -+ - - - -@@ -369,7 +369,7 @@ - - - -- -+ - - - -@@ -619,7 +619,7 @@ +--- chrome/browser/browser_resources.grd.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/browser_resources.grd 2018-07-14 13:48:09.392254000 +0200 +@@ -634,7 +634,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 6cc2d0b1935..b94d601d1cb 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2018-03-20 23:05:16.000000000 +0100 -+++ chrome/browser/chrome_browser_main.cc 2018-03-24 22:37:46.110352000 +0100 -@@ -206,7 +206,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_browser_main.cc 2018-07-14 13:55:52.288113000 +0200 +@@ -211,7 +211,7 @@ #include "chromeos/settings/cros_settings_names.h" #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -244,7 +244,7 @@ +@@ -251,7 +251,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,8 +18,21 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -737,7 +737,7 @@ - field_trial_synchronizer_ = new FieldTrialSynchronizer(); +@@ -1342,10 +1342,10 @@ + } + #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) + // Set the product channel for crash reports. + breakpad::SetChannelCrashKey(chrome::GetChannelName()); +-#endif // defined(OS_LINUX) || defined(OS_OPENBSD) ++#endif // defined(OS_LINUX) + + #if defined(OS_MACOSX) + // Get the Keychain API to register for distributed notifications on the main +@@ -1369,7 +1369,7 @@ + } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -27,16 +40,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1145,7 +1145,7 @@ - } - #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) - --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) - // Set the product channel for crash reports. - breakpad::SetChannelCrashKey(chrome::GetChannelString()); - #endif // defined(OS_LINUX) || defined(OS_OPENBSD) -@@ -1351,7 +1351,7 @@ +@@ -1514,7 +1514,7 @@ // Start the tab manager here so that we give the most amount of time for the // other services to start up before we start adjusting the oom priority. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index f2e640f9788..4e67be0738a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.cc 2018-03-03 20:34:31.799512000 +0100 -@@ -281,7 +281,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.cc 2018-07-14 14:04:47.872292000 +0200 +@@ -305,7 +305,7 @@ #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" - #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" + #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -316,7 +316,7 @@ +@@ -342,7 +342,7 @@ #include "chrome/common/importer/profile_import.mojom.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/webshare/share_service_impl.h" #endif -@@ -330,7 +330,7 @@ +@@ -356,7 +356,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -912,7 +912,7 @@ +@@ -1033,7 +1033,7 @@ main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -36,7 +36,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -928,7 +928,7 @@ +@@ -1049,7 +1049,7 @@ // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -45,7 +45,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1651,7 +1651,7 @@ +@@ -1789,7 +1789,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -54,7 +54,7 @@ bool enable_crash_reporter = breakpad::IsCrashReporterEnabled(); #if defined(OS_CHROMEOS) // Chrome OS uses the OS-level crash_reporter for mash services, so disable -@@ -2913,7 +2913,7 @@ +@@ -3096,7 +3096,7 @@ } } @@ -63,7 +63,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -2949,7 +2949,7 @@ +@@ -3132,7 +3132,7 @@ } #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3630,7 +3630,7 @@ +@@ -3806,7 +3806,7 @@ #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry)); diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 462f310457c..70e8ec6942f 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,9 +1,9 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.h 2017-12-24 00:50:35.917227000 +0100 -@@ -291,12 +291,12 @@ +--- chrome/browser/chrome_content_browser_client.h.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.h 2018-07-14 14:13:02.407023000 +0200 +@@ -299,12 +299,12 @@ + void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, - blink::WebPageVisibilityState* visibility_state) override; - + blink::mojom::PageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index bd4a290c0db..4533799135c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/download/download_commands.cc -@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman +--- chrome/browser/download/download_commands.cc.orig 2018-06-13 00:10:05.000000000 +0200 ++++ chrome/browser/download/download_commands.cc 2018-07-14 14:30:03.853964000 +0200 +@@ -249,7 +249,7 @@ return download_item_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_item_); case ALWAYS_OPEN_TYPE: @@ -8,17 +8,17 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - download_item_->GetBrowserContext()); -@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command) + content::DownloadItemUtils::GetBrowserContext(download_item_)); +@@ -293,7 +293,7 @@ bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - download_item_->GetBrowserContext()); + content::DownloadItemUtils::GetBrowserContext(download_item_)); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); DownloadItemModel(download_item_) -@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() const { +@@ -408,7 +408,7 @@ return browser_displayer.browser(); } @@ -27,7 +27,7 @@ bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -425,7 +425,7 @@ return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index 9bc543bcb3f..b7bc9b8160b 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,9 +1,9 @@ ---- chrome/browser/download/download_query.cc.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/download/download_query.cc +--- chrome/browser/download/download_query.cc.orig 2018-06-13 00:10:05.000000000 +0200 ++++ chrome/browser/download/download_query.cc 2018-07-15 13:01:15.987418000 +0200 @@ -27,7 +27,11 @@ + #include "components/download/public/common/download_item.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" - #include "content/public/browser/download_item.h" +#if defined(OS_BSD) +#include +#else @@ -11,4 +11,4 @@ +#endif #include "url/gurl.h" - using content::DownloadDangerType; + using download::DownloadDangerType; diff --git a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc index 01d364277b4..db4acbe84cf 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc @@ -1,5 +1,5 @@ ---- chrome/browser/download/download_status_updater.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/download/download_status_updater.cc +--- chrome/browser/download/download_status_updater.cc.orig 2018-06-13 00:10:05.000000000 +0200 ++++ chrome/browser/download/download_status_updater.cc 2018-07-15 13:07:15.012034000 +0200 @@ -13,7 +13,7 @@ #include "base/memory/ptr_util.h" #include "build/build_config.h" @@ -9,10 +9,10 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated( +@@ -136,7 +136,7 @@ #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) void DownloadStatusUpdater::UpdateAppIconDownloadProgress( - content::DownloadItem* download) { + download::DownloadItem* download) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) const views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 04582a63eef..a7bdd4c23fb 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-09-05 21:05:12.000000000 +0200 -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2017-09-06 18:14:17.437338000 +0200 -@@ -61,7 +61,7 @@ - #include "chrome/browser/chromeos/extensions/input_method_api.h" +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2018-06-13 00:10:06.000000000 +0200 ++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2018-07-15 13:15:07.666902000 +0200 +@@ -57,7 +57,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" + #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h" -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -105,7 +105,7 @@ +@@ -99,7 +99,7 @@ #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc new file mode 100644 index 00000000000..6d25ec73df5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc @@ -0,0 +1,22 @@ +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2018-07-21 15:25:50.187627000 +0200 ++++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc 2018-07-21 15:28:47.631030000 +0200 +@@ -111,6 +111,11 @@ + bool incognito, + CreateRouteCallback callback) { + DCHECK(!base::ContainsKey(presentations_, presentation_id)); ++#if defined(OS_BSD) // XXX ++ std::move(callback).Run(base::nullopt, std::string("Not implemented"), ++ RouteRequestResult::UNKNOWN_ERROR); ++ return; ++#else + base::Optional display = GetDisplayBySinkId(sink_id); + if (!display) { + std::move(callback).Run(base::nullopt, std::string("Display not found"), +@@ -135,6 +140,7 @@ + presentation.receiver()->Start(presentation_id, GURL(media_source)); + std::move(callback).Run(route, base::nullopt, RouteRequestResult::OK); + NotifyRouteObservers(); ++#endif + } + + void WiredDisplayMediaRouteProvider::JoinRoute( diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc new file mode 100644 index 00000000000..3a42fb39734 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc @@ -0,0 +1,11 @@ +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2018-07-19 22:14:21.658215000 +0200 ++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc 2018-07-19 22:14:37.578585000 +0200 +@@ -51,7 +51,7 @@ + const char kProduct[] = "Chrome"; + #elif defined(OS_MACOSX) + const char kProduct[] = "Chrome_Mac"; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + const char kProduct[] = "Chrome_Linux"; + #elif defined(OS_ANDROID) + const char kProduct[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc index e7bc28cd3b7..4ac38bb3b94 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc @@ -1,14 +1,13 @@ ---- chrome/browser/memory_details_linux.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/memory_details_linux.cc -@@ -71,9 +71,10 @@ ProcessData GetProcessDataMemoryInformation( +--- chrome/browser/memory_details_linux.cc.orig 2018-06-13 00:10:06.000000000 +0200 ++++ chrome/browser/memory_details_linux.cc 2018-07-20 00:12:53.799188000 +0200 +@@ -70,8 +70,10 @@ + std::unique_ptr metrics( base::ProcessMetrics::CreateProcessMetrics(pid)); - metrics->GetWorkingSetKBytes(&pmi.working_set); +#if !defined(OS_BSD) pmi.num_open_fds = metrics->GetOpenFdCount(); pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit(); -- +#endif + process_data.processes.push_back(pmi); } - return process_data; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 0c5236895e9..327593c0e57 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,15 +1,15 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2017-12-15 02:04:10.000000000 +0100 -+++ chrome/browser/resources/settings/appearance_page/appearance_page.html 2017-12-24 02:04:05.313610000 +0100 -@@ -77,7 +77,7 @@ +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2018-06-13 00:10:07.000000000 +0200 ++++ chrome/browser/resources/settings/appearance_page/appearance_page.html 2018-07-15 13:34:27.093948000 +0200 +@@ -75,7 +75,7 @@ hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" - on-tap="openThemeUrl_"> + on-click="openThemeUrl_"> - + @@ -18,7 +18,7 @@