diff --git a/Manual.md b/Manual.md index b2b175fe2ca..8afae26a049 100644 --- a/Manual.md +++ b/Manual.md @@ -38,6 +38,7 @@ packages for XBPS, the `Void Linux` native packaging system. * [Python packages](#pkgs_python) * [Go packages](#pkgs_go) * [Haskell packages](#pkgs_haskell) + * [Font packages](#pkgs_font) * [Notes](#notes) * [Contributing via git](#contributing) * [Help](#help) @@ -580,13 +581,30 @@ Example: A list is composed of three components separated by a colon: group, symlink and target. i.e `alternatives="vi:/usr/bin/vi:/usr/bin/nvi ex:/usr/bin/ex:/usr/bin/nvi-ex"`. +- `font_dirs` A white space separated list of directories specified by an absolute path where a +font package installs its fonts. +It is used in the `x11-fonts` xbps-trigger to rebuild the font cache during install/removal +of the package. +i.e `font_dirs="/usr/share/fonts/TTF /usr/share/fonts/X11/misc"` + +- `dkms_modules` A white space separated list of Dynamic Kernel Module Support (dkms) modules +that will be installed and removed by the `dkms` xbps-trigger with the install/removal of the +package. +The format is a white space separated pair of strings that represent the name of the module, +most of the time `pkgname`, and the version of the module, most of the time `version`. +i.e `dkms_modules="$pkgname $version zfs 4.14"` + +- `register_shell` A white space separated list of shells defined by absolute path to be +registered into the system shells database. It is used by the `register-shell` trigger. +i.e `register_shell="/bin/tcsh /bin/csh"` + #### About the many types of `depends` variable. -So far we have listed three types of `depends`, there are `hostmakedepends`, -`makedepends`, and plain old `depends`. To understand the difference between -them, understand this: Void Linux cross compiles for many arches. Sometimes in -a build process, certain programs must be run, for example `yacc`, or the +So far we have listed four types of `depends`, there are `hostmakedepends`, +`makedepends`, `checkdepends` and plain old `depends`.To understand the difference +between them, understand this: Void Linux cross compiles for many arches. +Sometimes in a build process, certain programs must be run, for example `yacc`, or the compiler itself for a C program. Those programs get put in `hostmakedepends`. When the build runs, those will be installed on the host to help the build complete. @@ -597,6 +615,11 @@ architecture of the build machine, the architecture of the target machine must be used. Typically the `makedepends` will be the only one of the three types of `depends` to include `-devel` packages, and typically only `-devel` packages. +Then there are those things that are required for a package to run its testsuite +`dejagnu` or libraries it must link to when building test binaries like `cmocka`. +These are `checkdepends` and they are installed like they are part of `makedepends`. +the difference is that they are only installed when `XBPS_CHECK_PKGS` is defined. + The final variable, `depends`, is for those things the package needs at runtime and without which is unusable, and that xbps can't auto-detect. These are not all the packages the package needs at runtime, but only those @@ -731,6 +754,10 @@ be passed in via `make_build_args` and install arguments via `make_install_args` target can be overridden via `make_build_target` and the install target via `make_install_target`. +- `meson` For packages that use the Meson Build system, configuration options can be passed +via `configure_args`, the meson command can be overridden by `meson_cmd` and the location of +the out of source build by `meson_builddir` + For packages that use the Python module build method (`setup.py`), you can choose one of the following: @@ -1242,6 +1269,18 @@ The following variables influence how Haskell packages are built: - `make_build_args`: This is passed as-is to `stack build ...`, so you can add your `--flag ...` parameters there. + +### Font packages + +Font packages are very straightforward to write, they are always set with the +following variables: + +- `noarch=yes`: Font packages don't install arch specific files. +- `depends="font-util"`: because they are required for regenerating the font +cache during the install/removal of the package +- `font_dirs`: which should be set to the directory where the package +installs its fonts + ### Notes diff --git a/common/environment/build-style/scons.sh b/common/environment/build-style/scons.sh new file mode 100644 index 00000000000..614fb2c04be --- /dev/null +++ b/common/environment/build-style/scons.sh @@ -0,0 +1 @@ +hostmakedepends+=" scons" diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh index 5e1e6e2793c..cd0a6386cb2 100644 --- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh +++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh @@ -148,7 +148,7 @@ _EOF # if [ -d "${PKGDESTDIR}/usr/lib/udev/hwdb.d" ]; then _add_trigger hwdb.d-dir - fi + fi # # (Un)Register a shell in /etc/shells. # @@ -222,6 +222,20 @@ _EOF _add_trigger gio-modules fi # + # Handle gtk immodules in /usr/lib/gtk-2.0/2.10.0/immodules with + # gtk-immodules + # + if [ -d ${PKGDESTDIR}/usr/lib/gtk-2.0/2.10.0/immodules ]; then + _add_trigger gtk-immodules + fi + # + # Handle gtk3 immodules in /usr/lib/gtk-3.0/3.0.0/immodules with + # gtk3-immodules + # + if [ -d ${PKGDESTDIR}/usr/lib/gtk-3.0/3.0.0/immodules ]; then + _add_trigger gtk3-immodules + fi + # # Handle gsettings schemas in /usr/share/glib-2.0/schemas with # gsettings-schemas. # @@ -229,6 +243,13 @@ _EOF _add_trigger gsettings-schemas fi # + # Handle gdk-pixbuf loadable modules in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders + # with gdk-pixbuf-loaders + # + if [ -d ${PKGDESTDIR}/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders ]; then + _add_trigger gdk-pixbuf-loaders + fi + # # Handle mime database in /usr/share/mime with update-mime-database. # if [ -d ${PKGDESTDIR}/usr/share/mime ]; then diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index e428277e8b1..0019945a2d1 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -153,5 +153,5 @@ hook() { generic_wrapper3 libetpan-config generic_wrapper3 giblib-config python_wrapper python-config 2.7 - python_wrapper python3.4-config 3.4m + python_wrapper python3-config 3.6m } diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index 556fbc87ef6..d244a8495c7 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -47,7 +47,7 @@ store_pkgdestdir_rundeps() { } hook() { - local depsftmp f lf j tmplf mapshlibs sorequires _curdep + local depsftmp f lf j mapshlibs sorequires _curdep # Disable trap on ERR, xbps-uhelper cmd might return error... but not something # to be worried about because if there are broken shlibs this hook returns @@ -55,7 +55,6 @@ hook() { trap - ERR mapshlibs=$XBPS_COMMONDIR/shlibs - tmplf=$XBPS_SRCPKGDIR/$pkgname/template if [ -n "$noarch" -o -n "$noverifyrdeps" ]; then store_pkgdestdir_rundeps diff --git a/common/shlibs b/common/shlibs index e60d0eab7e3..4dfe14678f3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -124,6 +124,7 @@ libGLESv1_CM.so.1 libGLES-1.0_1 libGLESv2.so.2 libGLES-1.0_1 libEGL.so rpi-userland-0.0.0.0.20150907_1 libGLESv2.so rpi-userland-0.0.0.0.20150907_1 +libGLESv2.so opera-55.0.2994.37_2 libbrcmEGL.so rpi-userland-20180103_2 libbrcmGLESv2.so rpi-userland-20180103_2 libbrcmOpenVG.so rpi-userland-20180103_2 @@ -341,7 +342,7 @@ libMagickCore-6.Q16.so.6 libmagick-6.9.9.44_1 libMagickWand-6.Q16.so.6 libmagick-6.9.9.44_1 libMagick++-6.Q16.so.8 libmagick-6.9.9.0_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.74 poppler-0.63.0_1 +libpoppler.so.79 poppler-0.68.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 @@ -1568,10 +1569,10 @@ libdovecot-lda.so.0 dovecot-2.2.11_2 libnetapi.so.0 samba-3.6.23_1 libsmbsharemodes.so.0 samba-3.6.23_1 libmysqld.so.18 libmariadbclient-5.5.36_1 -libwscodecs.so.1 libwireshark-2.4.1_1 -libwiretap.so.7 libwireshark-2.4.1_1 -libwireshark.so.9 libwireshark-2.4.5_1 -libwsutil.so.8 libwireshark-2.4.1_1 +libwscodecs.so.2 libwireshark-2.6.2_1 +libwiretap.so.8 libwireshark-2.6.2_1 +libwireshark.so.10 libwireshark-2.6.2_1 +libwsutil.so.9 libwireshark-2.6.2_1 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1 libKF5Prison.so.5 prison-5.43.0_1 @@ -2020,11 +2021,11 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 liblastfm.so.1 liblastfm-1.0.9_1 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1 -libdruntime-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1 -libdruntime-ldc-shared.so.80 ldc-runtime-1.10.0_1 -libphobos2-ldc-shared.so.80 ldc-runtime-1.10.0_1 -libphobos2-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1 -libldc-jit.so.80 ldc-runtime-1.10.0_1 +libdruntime-ldc-debug-shared.so.81 ldc-runtime-1.11.0_1 +libdruntime-ldc-shared.so.81 ldc-runtime-1.11.0_1 +libphobos2-ldc-shared.so.81 ldc-runtime-1.11.0_1 +libphobos2-ldc-debug-shared.so.81 ldc-runtime-1.11.0_1 +libldc-jit.so.81 ldc-runtime-1.11.0_1 libmarblewidget.so.19 marble-4.14.3_2 libastro.so.1 marble-4.14.3_2 libmarblewidget-qt5.so.28 marble5-17.12.2_1 @@ -2197,7 +2198,7 @@ libgoocanvas.so.3 goocanvas1-1.0.0_1 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1 libplatform.so.2.0 platform-2.0.1_1 libp8-platform.so.2 p8-platform-2.1.0.1_1 -libfacter.so.3.11.3 facter-3.11.3_1 +libfacter.so.3.11.4 facter-3.11.4_1 libOIS-1.3.0.so ois-1.3_1 libSILLY.so.1 silly-0.1.0_1 libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1 @@ -2830,7 +2831,7 @@ libsidplayfp.so.4 libsidplayfp-1.8.7_1 libstilview.so.0 libsidplayfp-1.8.7_1 libczmq.so.4 czmq-4.0.1_1 liblz.so.1 lzlib-1.8_1 -libelogind.so.0 elogind-219.12_1 +libelogind.so.0 libelogind-238.1_2 libnma.so.0 libnm-gtk-1.4.0_1 libgspell-1.so.2 gspell-1.8.0_1 libotf.so.1 libotf-0.9.16_1 @@ -3353,9 +3354,6 @@ libgeos-3.6.2.so geos-3.6.2_1 libgeos_c.so.1 geos-3.6.2_1 libspatialindex.so.4 libspatialindex-1.8.5_1 libspatialindex_c.so.4 libspatialindex-1.8.5_1 -liboctave.so.5 octave-4.4.0_1 -liboctinterp.so.5 octave-4.4.0_1 -liboctgui.so.3 octave-4.4.0_1 libpapi.so.5 papi-5.6.0_1 libpfm.so.4 papi-5.6.0_1 libfifechan.so.0.1.4 fifechan-0.1.4_1 @@ -3405,3 +3403,4 @@ libbelcard.so.1 belcard-1.0.2_1 libshaderc_shared.so shaderc-2017.2_1 libglslang.so glslang-6.2.2596_1 libSPIRV.so glslang-6.2.2596_1 +libmaxminddb.so.0 libmaxminddb-1.3.2_1 diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template new file mode 100644 index 00000000000..93879fcc8f6 --- /dev/null +++ b/srcpkgs/0ad-data/template @@ -0,0 +1,20 @@ +# Template file for '0ad-data' +pkgname=0ad-data +version=0.0.23 +revision=1 +noarch=yes +wrksrc="0ad-${version}-alpha" +short_desc="Historically-based real-time strategy game (data files)" +maintainer="Helmut Pozimski " +license="CC-BY-SA-3.0" +homepage="https://play0ad.com" +distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz" +checksum=fdbf774637252dbedf339fbe29b77d7d585ab53a9a5ddede56dd7b8fda66d8ac + +do_install() { + vmkdir usr/share/0ad/data + vmkdir usr/share/0ad/data/tools + vcopy binaries/data/mods usr/share/0ad/data + vcopy binaries/data/config usr/share/0ad/data + vcopy binaries/data/tools/atlas usr/share/0ad/data/tools +} diff --git a/srcpkgs/0ad/patches/musl.patch b/srcpkgs/0ad/patches/musl.patch new file mode 100644 index 00000000000..59a59f9d2ec --- /dev/null +++ b/srcpkgs/0ad/patches/musl.patch @@ -0,0 +1,22 @@ +--- libraries/source/nvtt/src/src/nvmath/nvmath.h.orig 2018-06-16 16:01:48.511540946 +0200 ++++ libraries/source/nvtt/src/src/nvmath/nvmath.h 2018-06-16 16:02:29.935000183 +0200 +@@ -130,7 +130,7 @@ + { + #if NV_OS_WIN32 + return _isnan(f) != 0; +-#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD ++#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD || !defined(__GLIBC__) + return isnan(f); + #elif NV_OS_LINUX + return isnanf(f); +--- source/lib/sysdep/os/linux/ldbg.cpp.orig 2018-06-16 16:27:55.639277094 +0200 ++++ source/lib/sysdep/os/linux/ldbg.cpp 2018-06-16 16:28:17.342014019 +0200 +@@ -33,7 +33,7 @@ + #include "lib/sysdep/sysdep.h" + #include "lib/debug.h" + +-#if OS_ANDROID ++#if OS_ANDROID || !defined(__GLIBC__) + + // Android NDK doesn't support backtrace() + // TODO: use unwind.h or similar? diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template new file mode 100644 index 00000000000..149019c98ba --- /dev/null +++ b/srcpkgs/0ad/template @@ -0,0 +1,41 @@ +# Template file for '0ad' +pkgname=0ad +version=0.0.23 +revision=1 +wrksrc="${pkgname}-${version}-alpha" +hostmakedepends="pkg-config perl cmake python" +makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel + libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel + nspr-devel wxWidgets-devel" +depends="${pkgname}-data" +short_desc="Historically-based real-time strategy game" +maintainer="Helmut Pozimski " +license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT" +homepage="https://play0ad.com" +distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz" +checksum=cfa1e3b6989466961451c95a96c19c274cd373ce6d98f83836e6f862c9d3e163 +nocross="uses bundled third-party libraries that do not cross-compile" + +CXXFLAGS="-fpermissive" + +do_configure() { + cd ${wrksrc}/build/workspaces + ./update-workspaces.sh --bindir=/usr/bin --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data +} + +do_build() { + make config=release -C build/workspaces/gcc ${makejobs} +} + +do_install() { + vbin binaries/system/pyrogenesis + vmkdir usr/lib/${pkgname} + vcopy binaries/system/*.so usr/lib/${pkgname} + vmkdir usr/share/${pkgname}/data + vcopy binaries/data/l10n usr/share/${pkgname}/data + vbin build/resources/${pkgname}.sh ${pkgname} + vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications + vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps + vlicense LICENSE.txt +} diff --git a/srcpkgs/0ad/update b/srcpkgs/0ad/update new file mode 100644 index 00000000000..584aa9077fb --- /dev/null +++ b/srcpkgs/0ad/update @@ -0,0 +1 @@ +pattern='href="0ad-\K[\d\.]*+(?=-alpha-unix-build.tar.xz")' diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index f68922d3f28..207be9b2b3d 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,6 +1,6 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.94.0.92 +version=3.94.0.120 revision=1 noarch=yes build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage=https://github.com/adapta-project/adapta-gtk-theme distfiles="https://github.com/adapta-project/adapta-gtk-theme/archive/$version.tar.gz" -checksum=b47f0b3f2a2c8f321a53ce72dd15002d2dd1c6a6de2ba78b5921bffdb50138a2 +checksum=e97472dff931611928dc927fc463cf504ac00daf25279a534c86ab92668ca705 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/DarkRadiant/patches/03_c++17_filesystem.patch b/srcpkgs/DarkRadiant/patches/03_c++17_filesystem.patch new file mode 100644 index 00000000000..eaf7c4e0503 --- /dev/null +++ b/srcpkgs/DarkRadiant/patches/03_c++17_filesystem.patch @@ -0,0 +1,35 @@ +Description: Resolve FTBFS with GCC 8 + We can't use the regular C++17 header, because the code is written + against the pre-C++17 header . +Author: Juhani Numminen +Bug-Debian: https://bugs.debian.org/897734 +Forwarded: http://bugs.thedarkmod.com/view.php?id=4874 +Last-Update: 2018-05-24 +--- configure.ac ++++ configure.ac +@@ -159,15 +159,6 @@ + # By default, we rely on boost.filesystem, unless we have the C++17 libs + use_boost_filesystem=yes + +-# Check for the regular C++17 header +-AC_CHECK_HEADER([filesystem], [found_std_filesystem=yes], [found_std_filesystem=no]) +- +-# if no is present, check for the pre-C++17 header +-if test "$found_std_filesystem" = "yes" +-then +- AC_DEFINE([HAVE_STD_FILESYSTEM], [1], [Define this to indicate that the header is available for inclusion.]) +- use_boost_filesystem=no +-else + AC_CHECK_HEADER([experimental/filesystem], [found_experimental_filesystem=yes], [found_experimental_filesystem=no]) + + if test "$found_experimental_filesystem" = "yes" +@@ -176,7 +167,6 @@ + header is available for inclusion.]) + use_boost_filesystem=no + fi +-fi + + FILESYSTEM_LIBS='' + + + diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index eeeca59d001..9b64ea5e498 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant version=2.6.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-darkmod-plugins" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/Maelstrom/patches/gcc82.patch b/srcpkgs/Maelstrom/patches/gcc82.patch new file mode 100644 index 00000000000..b111c1736b7 --- /dev/null +++ b/srcpkgs/Maelstrom/patches/gcc82.patch @@ -0,0 +1,94 @@ +--- load.h 2016-10-08 10:10:38.000000000 +0200 ++++ load.h 2018-08-22 10:13:31.696766996 +0200 +@@ -108,9 +108,9 @@ + delete[] path; + path = new char[strlen(directory)+1+strlen(filename)+1]; + if ( strcmp(directory, DIR_SEP) == 0 ) { +- sprintf(path, DIR_SEP"%s", filename); ++ sprintf(path, DIR_SEP "%s", filename); + } else { +- sprintf(path, "%s"DIR_SEP"%s", directory, filename); ++ sprintf(path, "%s" DIR_SEP "%s", directory, filename); + } + return(path); + } +--- load.cpp 2000-02-15 03:47:39.000000000 +0100 ++++ load.cpp 2018-08-22 10:23:36.123798178 +0200 +@@ -81,7 +81,7 @@ + SDL_Surface *bmp, *title; + + /* Open the title file -- we know its colormap is our global one */ +- sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id); ++ sprintf(file, "Images" DIR_SEP "Maelstrom_Titles#%d.bmp", title_id); + bmp = SDL_LoadBMP(path.Path(file)); + if ( bmp == NULL ) { + return(NULL); +@@ -103,7 +103,7 @@ + Uint16 w, h; + + /* Open the cicn sprite file.. */ +- sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id); ++ sprintf(file, "Images" DIR_SEP "Maelstrom_Icon#%hd.cicn", cicn_id); + if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) { + error("GetCIcon(%hd): Can't open CICN %s: ", + cicn_id, path.Path(file)); +--- Maelstrom-netd.c 2000-02-12 10:58:59.000000000 +0100 ++++ Maelstrom-netd.c 2018-08-22 10:14:38.352770435 +0200 +@@ -2,6 +2,8 @@ + /* Here we go... */ + + #include ++#include ++#include + #include + #include + #include +--- buttonlist.h 2000-01-25 17:41:32.000000000 +0100 ++++ buttonlist.h 2018-08-22 10:17:36.182779609 +0200 +@@ -16,7 +16,7 @@ + + void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, + void (*callback)(void)) { +- struct button *belem; ++ ButtonList::button *belem; + + for ( belem=&button_list; belem->next; belem=belem->next ); + belem->next = new button; +@@ -30,7 +30,7 @@ + } + + void Activate_Button(Uint16 x, Uint16 y) { +- struct button *belem; ++ ButtonList::button *belem; + + for ( belem=button_list.next; belem; belem=belem->next ) { + if ( (x >= belem->x1) && (x <= belem->x2) && +@@ -42,7 +42,7 @@ + } + + void Delete_Buttons(void) { +- struct button *belem, *btemp; ++ ButtonList::button *belem, *btemp; + + for ( belem=button_list.next; belem; ) { + btemp = belem; +@@ -58,7 +58,7 @@ + Uint16 x1, y1; + Uint16 x2, y2; + void (*callback)(void); +- struct button *next; ++ struct ButtonList::button *next; + } button; + button button_list; + }; +--- dialog.h 2001-07-20 17:08:10.000000000 +0200 ++++ dialog.h 2018-08-22 10:21:41.404792260 +0200 +@@ -402,7 +402,7 @@ + /* Loop to end of radio box list */; + /* Which is ANSI C++? */ + #ifdef linux +- radio->next = new struct Mac_RadioList::radio; ++ radio->next = new Mac_RadioList::radio; + #else + radio->next = new struct radio; + #endif diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template index 83e83672ee7..7b857125bd9 100644 --- a/srcpkgs/Maelstrom/template +++ b/srcpkgs/Maelstrom/template @@ -1,7 +1,7 @@ # Template file for 'Maelstrom' pkgname=Maelstrom version=3.0.6a -revision=1 +revision=2 wrksrc="${pkgname}-${version%a}" build_style=gnu-configure hostmakedepends="automake libtool SDL_net-devel" @@ -13,6 +13,8 @@ homepage="https://www.libsdl.org/projects/${pkgname}/" distfiles="${homepage}/src/${pkgname}-${version}.tar.gz" checksum=342557bcc89eea57af4272778d3511be95fe46cf75e291298a15caa49a2f0e29 +CXXFLAGS="-Wno-error -Wno-write-strings" + pre_configure() { mv configure.{in,ac} ./autogen.sh diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template index c70552dbba1..6cb571588e7 100644 --- a/srcpkgs/NetAuth-nsscache/template +++ b/srcpkgs/NetAuth-nsscache/template @@ -1,7 +1,7 @@ # Template file for 'NetAuth-nsscache' pkgname=NetAuth-nsscache version=0.2 -revision=1 +revision=2 wrksrc="nsscache-$version" build_style=go go_import_path="github.com/NetAuth/nsscache" diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template index 285c8919f02..fc3bf793fe4 100644 --- a/srcpkgs/NetAuth/template +++ b/srcpkgs/NetAuth/template @@ -1,7 +1,7 @@ # Template file for 'NetAuth' pkgname=NetAuth version=0.0.9 -revision=1 +revision=2 build_style=go hostmakedepends="dep" go_import_path="github.com/NetAuth/NetAuth" diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template index 19cd0a3d2dd..dc4142e97ed 100644 --- a/srcpkgs/NetKeys/template +++ b/srcpkgs/NetKeys/template @@ -1,7 +1,7 @@ # Template file for 'NetKeys' pkgname=NetKeys version=0.2 -revision=1 +revision=2 build_style=go go_import_path="github.com/NetAuth/NetKeys" go_package="${go_import_path}/cmd/netkeys" diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template index 7b7f7617867..bd1c7d81c47 100644 --- a/srcpkgs/PopCorn/template +++ b/srcpkgs/PopCorn/template @@ -1,7 +1,7 @@ # Template file for 'PopCorn' pkgname=PopCorn version=0.3 -revision=1 +revision=2 build_style=go go_import_path="github.com/the-maldridge/popcorn" go_package="${go_import_path}/cmd/popcorn diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template index 9fcaa018b43..1f403bacb63 100644 --- a/srcpkgs/R-cran-digest/template +++ b/srcpkgs/R-cran-digest/template @@ -1,10 +1,11 @@ # Template file for 'R-cran-digest' pkgname=R-cran-digest -version=0.6.15 -revision=2 +version=0.6.16 +revision=1 build_style=R-cran short_desc="Create Compact Hash Digests of R Objects" maintainer="Florian Wagner " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://dirk.eddelbuettel.com/code/digest.html" -checksum=882e74bb4f0722260bd912fd7f8a0fcefcf44c558f43ac8a03d63e53d25444c5 +changelog="https://github.com/eddelbuettel/digest/raw/master/ChangeLog" +checksum=59193110d88038c07705749b4908e050a70975881725efe530eb42d96e2a1ad2 diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template index d7af82482d4..91a192b1ed5 100644 --- a/srcpkgs/R-cran-fansi/template +++ b/srcpkgs/R-cran-fansi/template @@ -1,10 +1,10 @@ # Template file for 'R-cran-fansi' pkgname=R-cran-fansi -version=0.2.3 +version=0.3.0 revision=1 build_style=R-cran short_desc="ANSI Control Sequence Aware String Functions" maintainer="Florian Wagner " license="GPL-2.0-or-later" homepage="https://cran.r-project.org/web/packages/fansi/index.html" -checksum=db6dfef8bfe6682d58b654b6a6a1d59cb07225ca41755176b465ab8611fd96c9 +checksum=dd6401d5c91ff4c45d752cceddd5379d1ae39a8a1196f236b0bc0ec6d691b88c diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template index 975338737cc..2e1ce58b21a 100644 --- a/srcpkgs/R-cran-rlang/template +++ b/srcpkgs/R-cran-rlang/template @@ -1,10 +1,10 @@ # Template file for 'R-cran-rlang' pkgname=R-cran-rlang -version=0.2.1 +version=0.2.2 revision=1 build_style=R-cran short_desc="Functions for Base Types and Core R and 'Tidyverse' Features" maintainer="Florian Wagner " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://rlang.tidyverse.org/" -checksum=f2ba4826bc376e6893d1d547b97b5df7367c08b4814e73c96416c5ecb7310f3e +checksum=c9119420ff0caeb6b0fcee8800e2fb1ec072e291e0e53b8acea3c4cf49420d33 diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template index 19c4c89d2a6..e619096bc99 100644 --- a/srcpkgs/R-cran-scales/template +++ b/srcpkgs/R-cran-scales/template @@ -1,7 +1,7 @@ # Template file for 'R-cran-scales' pkgname=R-cran-scales -version=0.5.0 -revision=2 +version=1.0.0 +revision=1 build_style=R-cran depends+="R-cran-RColorBrewer R-cran-dichromat R-cran-plyr R-cran-munsell>=0.2 R-cran-labeling R-cran-Rcpp R-cran-R6 @@ -13,7 +13,7 @@ short_desc="Scale Functions for Visualization" maintainer="Florian Wagner " license="MIT" homepage="https://github.com/hadley/scales" -checksum=dbfcc0817c4ab8b8777ec7d68ebfe220177c193cfb5bd0e8ba5d365dbfe3e97d +checksum=0c1f4a14edd336a404da34a3cc71a6a9d0ca2040ba19360c41a79f36e06ca30c post_install() { vlicense LICENSE diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index 25960a353c8..4b769e87934 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,7 +1,7 @@ # Template file for 'SLADE' pkgname=SLADE version=3.1.1.5 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_WEBVIEW_STARTPAGE=ON" hostmakedepends="pkg-config zip" diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template index d401032092a..1150d5d5614 100644 --- a/srcpkgs/TerraState/template +++ b/srcpkgs/TerraState/template @@ -1,7 +1,7 @@ # Template file for 'TerraState' pkgname=TerraState version=0.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/the-maldridge/TerraState" go_package="${go_import_path}/cmd/terrastate" diff --git a/srcpkgs/VeraCrypt/template b/srcpkgs/VeraCrypt/template index 36a1d6be5ce..ba4c4c220ac 100644 --- a/srcpkgs/VeraCrypt/template +++ b/srcpkgs/VeraCrypt/template @@ -1,7 +1,7 @@ # Template file for 'Veracrypt' pkgname=VeraCrypt version=1.22 -revision=2 +revision=3 create_wrksrc=1 build_wrksrc="src" build_style=gnu-makefile diff --git a/srcpkgs/WoeUSB/template b/srcpkgs/WoeUSB/template index 9df267c8c6f..146be88922e 100644 --- a/srcpkgs/WoeUSB/template +++ b/srcpkgs/WoeUSB/template @@ -1,7 +1,7 @@ # Template file for 'WoeUSB' pkgname=WoeUSB version=3.2.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" makedepends="wxWidgets-devel" diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template index 2589743f142..2b60602d852 100644 --- a/srcpkgs/acbuild/template +++ b/srcpkgs/acbuild/template @@ -1,7 +1,7 @@ # Template file for 'acbuild' pkgname=acbuild version=0.4.0 -revision=11 +revision=12 wrksrc="build-${version}" build_style=go go_import_path=github.com/appc/acbuild diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template index 8b65850981c..c2d157656ef 100644 --- a/srcpkgs/acmetool/template +++ b/srcpkgs/acmetool/template @@ -1,7 +1,7 @@ # Template file for 'acmetool' pkgname=acmetool version=0.0.67 -revision=4 +revision=5 wrksrc="acme-${version}" build_style=go go_import_path=github.com/hlandau/acme diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template index aac8498db2d..77dcb7e8306 100644 --- a/srcpkgs/acpi_call-dkms/template +++ b/srcpkgs/acpi_call-dkms/template @@ -11,7 +11,6 @@ homepage="https://github.com/damadmai/acpi_call" distfiles="$homepage/archive/v$version.tar.gz" checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b -triggers="dkms" dkms_modules="acpi_call ${version}" depends="dkms" diff --git a/srcpkgs/agg/patches/gcc82.patch b/srcpkgs/agg/patches/gcc82.patch new file mode 100644 index 00000000000..eb535ff0318 --- /dev/null +++ b/srcpkgs/agg/patches/gcc82.patch @@ -0,0 +1,11 @@ +--- include/agg_renderer_outline_aa.h 2006-10-09 06:07:08.000000000 +0200 ++++ include/agg_renderer_outline_aa.h 2018-08-22 11:06:28.038930861 +0200 +@@ -1375,7 +1375,7 @@ + //--------------------------------------------------------------------- + void profile(const line_profile_aa& prof) { m_profile = &prof; } + const line_profile_aa& profile() const { return *m_profile; } +- line_profile_aa& profile() { return *m_profile; } ++ line_profile_aa& profile() { return const_cast(*m_profile); } + + //--------------------------------------------------------------------- + int subpixel_width() const { return m_profile->subpixel_width(); } diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template index 2929a4f44df..e56d1e1a367 100644 --- a/srcpkgs/agg/template +++ b/srcpkgs/agg/template @@ -1,15 +1,16 @@ # Template file for 'agg' pkgname=agg version=2.5 -revision=4 +revision=5 build_style=gnu-configure +configure_args="--disable-examples" disable_parallel_build=1 -hostmakedepends="pkg-config automake libtool gettext-devel SDL-devel" -makedepends="freetype-devel SDL-devel" +hostmakedepends="SDL-devel automake gettext-devel libtool pkg-config" +makedepends="SDL-devel freetype-devel" short_desc="A High Quality Rendering Engine for C++" maintainer="Juan RP " homepage="http://www.antigrain.com/" -license="GPL-2" +license="GPL-2.0-or-later" distfiles="http://www.antigrain.com/agg-${version}.tar.gz" checksum=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template index c1648216de3..6a0359cf29e 100644 --- a/srcpkgs/alertmanager/template +++ b/srcpkgs/alertmanager/template @@ -1,7 +1,7 @@ # Template file for 'alertmanager' pkgname=alertmanager version=0.15.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/prometheus/alertmanager" go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool" diff --git a/srcpkgs/annie/template b/srcpkgs/annie/template index 6ba3bc1354a..87e6f231228 100644 --- a/srcpkgs/annie/template +++ b/srcpkgs/annie/template @@ -1,7 +1,7 @@ # Template file for 'annie' pkgname=annie -version=0.7.15 -revision=1 +version=0.7.17 +revision=2 build_style=go go_import_path="github.com/iawia002/annie" depends="ffmpeg" @@ -10,7 +10,7 @@ maintainer="cr6git " license="MIT" homepage="https://github.com/iawia002/annie" distfiles="https://github.com/iawia002/annie/archive/${version}.tar.gz" -checksum=73e26dd5ba0ed1d767d79d0d7f9f0182cf3443585ea6f858afb964df6d79a1b7 +checksum=18f8738c6601f88773e6ca7b826ed55d65b7566ce170eb6d601d77da5f2e3597 post_install() { vlicense LICENSE diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 8dc4a422a19..92514072ac4 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.6.2 +version=2.6.3 revision=1 noarch=yes build_style=python2-module @@ -9,11 +9,11 @@ hostmakedepends="python-setuptools" depends="${hostmakedepends} python-cryptography python-Jinja2 python-paramiko python-yaml" short_desc="Simple deployment, configuration management and execution framework" -maintainer="Juan RP " +maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=747e4cca09c10833ffe3a7c53af310d2d387bd4f499ec6e1bde60662606aaff8 +checksum=1027f627e6d8a2d51f3a79abb01447716a78aa646e0c2f9860cfde273256a28c post_install() { for f in examples/*; do diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index 7b44294afe9..f994e3b5f2a 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -1,7 +1,7 @@ # Template file for 'antibody' pkgname=antibody version=3.6.1 -revision=1 +revision=2 build_style=go go_import_path=github.com/getantibody/antibody hostmakedepends="git" diff --git a/srcpkgs/apl/template b/srcpkgs/apl/template index 12331037cc9..8eb174b55b2 100644 --- a/srcpkgs/apl/template +++ b/srcpkgs/apl/template @@ -11,6 +11,8 @@ homepage="http://www.gnu.org/software/apl" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=8ff6e28256d7a3cdfa9dc6025e3905312310b27a43645ef5d617fd4a5b43b81f +CXXFLAGS="-Wno-format-truncation -Wno-class-memaccess -Wno-restrict" + post_install() { vdoc support-files/Dyalog-Keyboard/apl.xkb vdoc support-files/Dyalog-Keyboard/apl.xmodmap diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template index f10c711e427..63244700ada 100644 --- a/srcpkgs/apvlv/template +++ b/srcpkgs/apvlv/template @@ -1,7 +1,7 @@ # Template file for 'apvlv' pkgname=apvlv version=0.1.5 -revision=5 +revision=7 build_style=cmake configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes" hostmakedepends="pkg-config" diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template index 5f7373b73de..eb861974a1b 100644 --- a/srcpkgs/ark/template +++ b/srcpkgs/ark/template @@ -1,18 +1,18 @@ # Template file for 'ark' pkgname=ark -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kdoctools kconfig" makedepends="libarchive-devel kpty-devel kparts-devel kitemmodels-devel libzip-devel" short_desc="KDE Archiving Tool" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://kde.org/applications/utilities/ark" -distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e5cc2484dbd422b28b17b23e0563d392746b7e89d69edac3c2a2468d760dbb09 +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=e544c3433350fb837570b62e14faeb1033ef31458084a819d49c630b58a6e736 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python kcoreaddons kparts" configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" fi diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template index 52552107d93..c901df55f22 100644 --- a/srcpkgs/atlantis/template +++ b/srcpkgs/atlantis/template @@ -1,7 +1,7 @@ # Template file for 'atlantis' pkgname=atlantis -version=0.4.5 -revision=1 +version=0.4.6 +revision=2 build_style=go go_import_path="github.com/runatlantis/atlantis" hostmakedepends="dep" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://runatlantis.io" distfiles="https://github.com/runatlantis/atlantis/archive/v$version.tar.gz" -checksum=17d13037a26525dbafb3053c2dd2cfd37bb9da519ce36c54f2022500cb719800 +checksum=3f88783b725f7d056dea691dda2a29c13bce0afa45738896bd0c14038c503010 pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template index 1871a3688b1..66308b8283d 100644 --- a/srcpkgs/atril/template +++ b/srcpkgs/atril/template @@ -1,13 +1,13 @@ # Template file for 'atril' pkgname=atril version=1.20.2 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-djvu --enable-dvi --enable-t1lib --enable-pixbuf --enable-comics --enable-xps --disable-static $(vopt_enable gir introspection)" hostmakedepends="glib-devel intltool itstool pkg-config - $(vopt_if gir 'gobject-introspection')" + $(vopt_if gir 'gobject-introspection') perl-XML-Parser" makedepends="djvulibre-devel libSM-devel libcaja-devel libgxps-devel libnotify-devel libsecret-devel libspectre-devel libunique-devel mate-desktop-devel mate-icon-theme poppler-glib-devel webkit2gtk-devel" diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index 5bdc939a2e4..07c86bbae4a 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -1,7 +1,7 @@ # Template file for 'audacity' pkgname=audacity version=2.2.2 -revision=3 +revision=4 wrksrc="${pkgname}-Audacity-${version}" build_style=gnu-configure hostmakedepends="pkg-config cmake libtool m4" diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index 1e95b496d2e..617493fb248 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,6 +1,6 @@ # Template file for 'babl' pkgname=babl -version=0.1.54 +version=0.1.56 revision=1 build_style=gnu-configure hostmakedepends="pkg-config vala-devel" @@ -10,7 +10,7 @@ license="LGPL-3.0-only" homepage="http://gegl.org/babl/" changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS" distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.bz2" -checksum=4d2bf1345d7214b08762e6d1e23d0038508b806dbf7c4c44386faee434682a07 +checksum=8ad26ca717ec3c74e261f454dd6bb316333a39fd1f87db4ac44706a860dc4d28 babl-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template index cf3d5fdb1a7..df1437dd367 100644 --- a/srcpkgs/backblaze-b2/template +++ b/srcpkgs/backblaze-b2/template @@ -1,6 +1,6 @@ # Template file for 'backblaze-b2' pkgname=backblaze-b2 -version=1.3.4 +version=1.3.6 revision=1 noarch=yes wrksrc="B2_Command_Line_Tool-${version}" @@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/Backblaze/B2_Command_Line_Tool" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=3e224cb19b16ffd293048b73ac59a2c3d99b8ab0059469ce36ce5f290dfabe69 +checksum=077d5e9b186d4cb0be1fcbeb3b80e1788d8b941b0fcfbf2c7386b8c6a653740c post_install() { # Remove test directory polluting site-packages diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index 1c97ffbdae3..7f33f4c097c 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,6 +1,6 @@ # Template file for 'bat' pkgname=bat -version=0.4.1 +version=0.5.0 revision=1 hostmakedepends="cargo cmake" makedepends="libcurl-devel libssh2-devel oniguruma-devel" @@ -9,7 +9,7 @@ maintainer="cr6git " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/bat" distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz" -checksum=3ae66854da59d691b8740672708a2e7f2f240c76e8a00283f59a6e39127e4583 +checksum=ae96e7397ece312fa4e074a340fc9438b4b3f69d541623db5cfd5749b2baa3b2 nocross="https://travis-ci.org/voidlinux/void-packages/jobs/374173136#L1025 https://travis-ci.org/voidlinux/void-packages/jobs/374173137#L1021" diff --git a/srcpkgs/batman-adv/template b/srcpkgs/batman-adv/template index 06e24bc80bc..db11a8f391d 100644 --- a/srcpkgs/batman-adv/template +++ b/srcpkgs/batman-adv/template @@ -9,7 +9,6 @@ homepage="http://www.open-mesh.org/" distfiles="http://downloads.open-mesh.org/batman/releases/batman-adv-${version}/batman-adv-${version}.tar.gz" checksum=ec1848023308c41710eeefb544580f5853d68b88a627a3f2dabaa3472b988c15 -triggers="dkms" dkms_modules="batman-adv ${version}" depends="dkms" diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template index 523b448897a..d58ae54cdbb 100644 --- a/srcpkgs/batman-adv14/template +++ b/srcpkgs/batman-adv14/template @@ -12,7 +12,6 @@ conflicts="batman-adv>=0" wrksrc="batman-adv-$version" provides="batman-adv-${version}_${revision}" -triggers="dkms" dkms_modules="batman-adv14 ${version}" depends="dkms" diff --git a/srcpkgs/bbswitch/template b/srcpkgs/bbswitch/template index b603e1ec605..92457f9b747 100644 --- a/srcpkgs/bbswitch/template +++ b/srcpkgs/bbswitch/template @@ -6,7 +6,6 @@ hostmakedepends="git" makedepends="dkms" depends="dkms" dkms_modules="${pkgname} ${version}" -triggers="dkms" short_desc="kernel module allowing to switch dedicated graphics card on Optimus laptops" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template index 299ed8e362b..de6f593bf17 100644 --- a/srcpkgs/bettercap/template +++ b/srcpkgs/bettercap/template @@ -1,7 +1,7 @@ # Template file for 'bettercap' pkgname=bettercap -version=2.7 -revision=1 +version=2.8 +revision=2 build_style=go hostmakedepends="git pkg-config" makedepends="libpcap-devel libnetfilter_queue-devel" @@ -11,7 +11,7 @@ license="GPL-3" go_import_path=github.com/bettercap/bettercap homepage="https://${go_import_path}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=4ce11f69f3532d482bfc38ffab12d69545b6d7826bac5222d6bd6ff8ee20a26b +checksum=9f8054aaa78acf0ddc020e52b6c7f6737556f2f4c7df16c094ac54e51dd11784 case "$XBPS_TARGET_MACHINE" in x86_64-musl) broken="fails to build" ;; diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template index dca495890e8..5009473c48d 100644 --- a/srcpkgs/blackbox_exporter/template +++ b/srcpkgs/blackbox_exporter/template @@ -1,7 +1,7 @@ # Template file for 'blackbox_exporter' pkgname=blackbox_exporter version=0.12.0 -revision=3 +revision=4 build_style=go go_import_path="github.com/prometheus/blackbox_exporter" go_ldflags="-X ${go_import_path}/version.Version=${version} diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template index 9bb936e22a4..f88d583c6de 100644 --- a/srcpkgs/blush/template +++ b/srcpkgs/blush/template @@ -1,7 +1,7 @@ # Template file for 'blush' pkgname=blush version=0.5.3 -revision=1 +revision=2 build_style=go go_import_path=github.com/arsham/blush hostmakedepends="git" diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 11ce1f7b178..8ef58c49a07 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,9 +1,9 @@ # Template file for 'boinc' pkgname=boinc version=7.12.1 -revision=2 -_majorver=${version%.*.*} -wrksrc=boinc-client_release-${_majorver}-${version%.*} +revision=3 +_majorver=${version%.*} +wrksrc=boinc-client_release-${_majorver}-${version} build_style=gnu-configure hostmakedepends="automake libtool pkg-config python xorgproto" makedepends="glu-devel libfreeglut-devel libcurl-devel @@ -16,10 +16,10 @@ boinc_shell="/bin/bash" conf_files="/etc/default/boinc-client" short_desc="Berkely Infrastructure for Network Computing" maintainer="Jürgen Buchmüller " -license="LGPL-3.0" +license="LGPL-3.0-or-later" homepage="https://boinc.berkeley.edu/" distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz" -checksum=1004d96c8f9b2100bef36bfee6079bf1fed318788c7288b8d4b8ac77e30377d7 +checksum=8fcfa84d2c1c90f65b0f1a5b0edf8353341f0211acfaa7538428845d9817e2d7 conflicts="boinc-nox>=0" CXXFLAGS="-Wno-redundant-decls" diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index d787c2cb714..7511ac4fb2a 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -12,7 +12,6 @@ repository="nonfree" create_wrksrc=yes short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" -triggers="dkms" dkms_modules="wl ${version}" depends="dkms" diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template index 786946aae5e..5972ec2f2e9 100644 --- a/srcpkgs/browserpass/template +++ b/srcpkgs/browserpass/template @@ -1,7 +1,7 @@ # Template file for 'browserpass' pkgname=browserpass version=2.0.21 -revision=2 +revision=3 build_style=go go_import_path="github.com/dannyvankooten/browserpass" go_package="${go_import_path}/cmd/browserpass" diff --git a/srcpkgs/bs1770gain/patches/ffmpeg4.patch b/srcpkgs/bs1770gain/patches/ffmpeg4.patch deleted file mode 100644 index 89deff65f2f..00000000000 --- a/srcpkgs/bs1770gain/patches/ffmpeg4.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- libffsox-2/ffsox_frame.c.orig 2018-05-03 16:26:40.651562783 +0200 -+++ libffsox-2/ffsox_frame.c 2018-05-03 16:27:43.450930824 +0200 -@@ -48,7 +48,7 @@ - goto frame; - } - -- if (NULL!=codec&&(codec->capabilities&CODEC_CAP_VARIABLE_FRAME_SIZE)) -+ if (NULL!=codec&&(codec->capabilities&AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) - nb_samples=10000; - else - nb_samples=cc->frame_size; ---- libffsox-2/ffsox_frame_writer.c.orig 2018-05-03 16:27:03.067335575 +0200 -+++ libffsox-2/ffsox_frame_writer.c 2018-05-03 16:28:05.418712077 +0200 -@@ -66,7 +66,7 @@ - goto open; - - if (fw->so.fc->oformat->flags&AVFMT_GLOBALHEADER) -- fw->so.cc->flags|=CODEC_FLAG_GLOBAL_HEADER; -+ fw->so.cc->flags|=AV_CODEC_FLAG_GLOBAL_HEADER; - - fw->so.st->time_base=fw->so.cc->time_base; - //fw->so.st->time_base=fr->si.st->time_base; ---- libffsox-2/ffsox_packet_writer.c.orig 2018-05-03 16:27:24.836116183 +0200 -+++ libffsox-2/ffsox_packet_writer.c 2018-05-03 16:28:19.530571557 +0200 -@@ -65,7 +65,7 @@ - pw->so.cc->codec_tag=0; - - if (pw->so.fc->oformat->flags&AVFMT_GLOBALHEADER) -- pw->so.cc->flags|=CODEC_FLAG_GLOBAL_HEADER; -+ pw->so.cc->flags|=AV_CODEC_FLAG_GLOBAL_HEADER; - - if (ffsox_sink_append(so,&pw->si,&pw->so)<0) { - DMESSAGE("appending output stream"); diff --git a/srcpkgs/bs1770gain/template b/srcpkgs/bs1770gain/template index 92ed366691d..80c93209611 100644 --- a/srcpkgs/bs1770gain/template +++ b/srcpkgs/bs1770gain/template @@ -1,12 +1,14 @@ # Template file for 'bs1770gain' pkgname=bs1770gain -version=0.4.12 -revision=2 +version=0.5.0.beta.5 +revision=1 +_real_version=0.5.0-beta-5 +wrksrc="${pkgname}-${_real_version}" build_style=gnu-configure makedepends="ffmpeg-devel sox-devel" short_desc="A loudness scanner compliant with ITU-R BS.1770" maintainer="Michal Koutenský " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://bs1770gain.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=cafc5440cf4940939c675e98c8dbeb839f4965d60f74270a37d4ee70559b3a59 +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${_real_version}.tar.gz" +checksum=27babaaf257b7d5c8890d82c30594103281c64b85efa231989c66afa09ae804d diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template index 52985af607a..a81139a2d1c 100644 --- a/srcpkgs/bum/template +++ b/srcpkgs/bum/template @@ -1,10 +1,10 @@ # Template file for 'bum' pkgname=bum version=0.1.3 -revision=2 +revision=3 noarch=yes build_style=python3-module -pycompile_modules="bum" +pycompile_module="bum" hostmakedepends="python3-setuptools" depends="python3-setuptools python3-mpd2 python3-musicbrainzngs python3-mpv" short_desc="Daemon that downloads and displays album arts via MPD events" diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index bef89c78e5a..8e7336f13cc 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -1,7 +1,7 @@ # Template file for 'caddy' pkgname=caddy version=0.11.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/mholt/caddy" go_package="${go_import_path}/caddy" diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 0e68074c04b..184e4aaa7c4 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.1.0 -revision=7 +revision=9 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON" hostmakedepends="automoc4 perl pkg-config extra-cmake-modules" @@ -18,6 +18,7 @@ license="GPL-2.0-or-later LGPL-2.0-or-later GFDL-1.2-or-later" homepage="http://www.calligra-suite.org/" distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz" checksum=6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870 +nocross="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/11481/steps/shell_3/logs/stdio" replaces="calligra-braindump>=0 calligra-flow>=0" diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 8ccaba6a66a..c8220cc9a43 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -122,7 +122,6 @@ do_install() { catalyst-dkms_package() { short_desc="${_desc} - DKMS kernel module" - triggers="dkms" depends="dkms" dkms_modules="fglrx ${version}_${revision}" pkg_install() { diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template index efe0f790a9b..380f3e901d9 100644 --- a/srcpkgs/cdetect/template +++ b/srcpkgs/cdetect/template @@ -1,7 +1,7 @@ # Template file for 'cdetect' pkgname=cdetect version=0.5.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/xyproto/cdetect" short_desc="Detects the compiler (and version) used to compile an ELF binary" diff --git a/srcpkgs/cdogs-sdl-data b/srcpkgs/cdogs-sdl-data new file mode 120000 index 00000000000..c95cdde7057 --- /dev/null +++ b/srcpkgs/cdogs-sdl-data @@ -0,0 +1 @@ +cdogs-sdl \ No newline at end of file diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template index d9fbce21a67..b935cf9841b 100644 --- a/srcpkgs/cdogs-sdl/template +++ b/srcpkgs/cdogs-sdl/template @@ -1,10 +1,11 @@ # Template file for 'cdogs' pkgname=cdogs-sdl version=0.6.7 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel" +depends="cdogs-sdl-data>=${version}_${revision}" short_desc="A classic overhead run-and-gun game" maintainer="Enno Boland " homepage="http://cxong.github.io/cdogs-sdl/" @@ -13,6 +14,16 @@ distfiles="https://github.com/cxong/cdogs-sdl/archive/$version.tar.gz" checksum=af53c4f45938c4c57f630bc073ea84354ca5a6e26f4e315241a7ba9036c13b52 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/" +CFLAGS="-Wno-restrict -Wno-format-truncation -Wno-stringop-overflow -Wno-stringop-truncation -Wno-format-overflow" + pre_configure() { sed -i '/appveyor.yml.cmake/ s/^/#/' CMakeLists.txt } + +cdogs-sdl-data_package() { + short_desc+=" - data" + noarch=yes + pkg_install() { + vmove usr/share/cdogs + } +} diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template index aabf7439645..1b50f058192 100644 --- a/srcpkgs/cfssl/template +++ b/srcpkgs/cfssl/template @@ -1,7 +1,7 @@ # Template file for 'cfssl' pkgname=cfssl version=1.3.2 -revision=3 +revision=4 build_style=go go_import_path="github.com/cloudflare/cfssl" go_package="${go_import_path}/cmd/cfssl" diff --git a/srcpkgs/cfssljson/template b/srcpkgs/cfssljson/template index 48dcf84618a..869f0696063 100644 --- a/srcpkgs/cfssljson/template +++ b/srcpkgs/cfssljson/template @@ -1,7 +1,7 @@ # Template file for 'cfssl' pkgname=cfssljson version=1.3.2 -revision=3 +revision=4 wrksrc="cfssl-${version}" build_style=go go_import_path="github.com/cloudflare/cfssl" diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template index 10ee2a5af3c..b59064bc6c5 100644 --- a/srcpkgs/cgrps/template +++ b/srcpkgs/cgrps/template @@ -1,7 +1,7 @@ # Template file for 'cgrps' pkgname=cgrps version=0.7.0 -revision=1 +revision=2 build_style=go go_import_path=github.com/k1LoW/cgrps short_desc="Set of commands for checking cgroups" diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template index c9e13a26ce3..96273eb1ecf 100644 --- a/srcpkgs/chroma/template +++ b/srcpkgs/chroma/template @@ -1,7 +1,7 @@ # Template file for 'chroma' pkgname=chroma version=0.5.0 -revision=1 +revision=2 build_style=go hostmakedepends="git" go_import_path="github.com/alecthomas/${pkgname}" diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index 328e4772bdd..1ec08cb8420 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -1,7 +1,7 @@ # Template file for 'chronograf' pkgname=chronograf version=1.6.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/influxdata/${pkgname}" go_package="${go_import_path}/cmd/chronograf" diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index 471d38e64cb..700da5b144b 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -6,7 +6,7 @@ short_desc="The Cinnamon Control Center" build_style=gnu-configure configure_args="--disable-static --disable-update-mimedb --disable-systemd" hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common - gobject-introspection intltool pkg-config" + gobject-introspection intltool pkg-config libxslt" makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel diff --git a/srcpkgs/cinnamon-desktop/patches/conditionalize-introspection.patch b/srcpkgs/cinnamon-desktop/patches/conditionalize-introspection.patch new file mode 100644 index 00000000000..27850158a4e --- /dev/null +++ b/srcpkgs/cinnamon-desktop/patches/conditionalize-introspection.patch @@ -0,0 +1,104 @@ +--- libcinnamon-desktop/meson.build ++++ libcinnamon-desktop/meson.build +@@ -81,31 +81,35 @@ if pnp_ids_install_internal + ) + endif + +-cdesktop_gir = gnome.generate_gir(libcinnamon_desktop, +- sources: 'cdesktop-enums.h', +- namespace: 'CDesktopEnums', +- nsversion: '3.0', +- identifier_prefix: 'CDesktop', +- symbol_prefix: 'c_desktop', +- extra_args: [ +- '-DGNOME_DESKTOP_USE_UNSTABLE_API', +- ], +- install: true, +-) ++with_introspection = get_option('introspection') + +-gnome.generate_gir(libcinnamon_desktop, +- sources: libcinnamon_desktop_gir_sources + libcinnamon_desktop_headers, +- namespace: 'CinnamonDesktop', +- nsversion: '3.0', +- export_packages: 'cinnamon-desktop', +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome_', +- includes: ['GObject-2.0', 'Gtk-3.0', cdesktop_gir[0], ], +- extra_args: [ +- '-DGNOME_DESKTOP_USE_UNSTABLE_API', +- ], +- install: true, +-) ++if with_introspection ++ cdesktop_gir = gnome.generate_gir(libcinnamon_desktop, ++ sources: 'cdesktop-enums.h', ++ namespace: 'CDesktopEnums', ++ nsversion: '3.0', ++ identifier_prefix: 'CDesktop', ++ symbol_prefix: 'c_desktop', ++ extra_args: [ ++ '-DGNOME_DESKTOP_USE_UNSTABLE_API', ++ ], ++ install: true, ++ ) ++ ++ gnome.generate_gir(libcinnamon_desktop, ++ sources: libcinnamon_desktop_gir_sources + libcinnamon_desktop_headers, ++ namespace: 'CinnamonDesktop', ++ nsversion: '3.0', ++ export_packages: 'cinnamon-desktop', ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome_', ++ includes: ['GObject-2.0', 'Gtk-3.0', cdesktop_gir[0], ], ++ extra_args: [ ++ '-DGNOME_DESKTOP_USE_UNSTABLE_API', ++ ], ++ install: true, ++ ) ++endif + + # FIXME + # https://github.com/mesonbuild/meson/issues/1687 +--- libcvc/meson.build ++++ libcvc/meson.build +@@ -44,18 +44,20 @@ libcvc = shared_library('cvc', + version: '0.0.0', + ) + +-gnome.generate_gir(libcvc, +- sources: libcvc_gir_sources + libcvc_headers, +- namespace: 'Cvc', +- nsversion: '1.0', +- identifier_prefix: 'Gvc', +- symbol_prefix: 'gvc_', +- includes: [ +- 'GObject-2.0', +- 'Gio-2.0', +- ], +- install: true, +-) ++if get_option('introspection') ++ gnome.generate_gir(libcvc, ++ sources: libcvc_gir_sources + libcvc_headers, ++ namespace: 'Cvc', ++ nsversion: '1.0', ++ identifier_prefix: 'Gvc', ++ symbol_prefix: 'gvc_', ++ includes: [ ++ 'GObject-2.0', ++ 'Gio-2.0', ++ ], ++ install: true, ++ ) ++endif + + + install_headers( +--- meson_options.txt ++++ meson_options.txt +@@ -1,3 +1,4 @@ + option('deprecation-flags', type: 'boolean', value: true) + option('pnp-ids-path', type: 'string', value: '') + option('use-alsa', type: 'boolean', value: false) ++option('introspection', type: 'boolean', value: true) diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template index bc47da33719..aca87aed373 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -2,19 +2,23 @@ pkgname=cinnamon-desktop version=3.8.1 revision=1 -short_desc="Library with common API for various Cinnamon modules" build_style=meson -hostmakedepends="glib-devel gobject-introspection intltool pkg-config" +configure_args="-Dintrospection=$(vopt_if gir true false)" +hostmakedepends="glib-devel $(vopt_if gir gobject-introspection) intltool pkg-config" makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel pulseaudio-devel" depends="xkeyboard-config" +short_desc="Library with common API for various Cinnamon modules" maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" checksum=239c8a210de18468919d9cbc379535e55628559e396cb321100ccab4ee0d04d0 -nocross=yes +case "$XBPS_TARGET_MACHINE" in + aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;; +esac + build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index 8f4eb46e50d..9b1fb51327d 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-session' pkgname=cinnamon-session version=3.8.2 -revision=1 +revision=2 short_desc="The Cinnamon session handler" build_style=meson hostmakedepends="pkg-config gobject-introspection diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index f3f46d1de00..fb953c6e05d 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon version=3.8.4 -revision=1 +revision=2 short_desc="The Cinnamon Settings Daemon" build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile --disable-gconf" diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index 466725ce6f1..c7d33528af3 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -1,7 +1,7 @@ # Template file for 'claws-mail' pkgname=claws-mail version=3.17.0 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin" hostmakedepends="pkg-config python-devel" diff --git a/srcpkgs/clinfo/update b/srcpkgs/clinfo/update new file mode 100644 index 00000000000..64555b2ec21 --- /dev/null +++ b/srcpkgs/clinfo/update @@ -0,0 +1 @@ +ignore="20*" diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index 9eaae915114..ddf6eea591b 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -1,6 +1,6 @@ # Template file for 'clipgrab' pkgname=clipgrab -version=3.6.8 +version=3.6.9 revision=1 build_style=qmake configure_args=clipgrab.pro @@ -9,10 +9,10 @@ makedepends="qt-webkit-devel" depends="ffmpeg desktop-file-utils" short_desc="Friendly downloader for YouTube and other sites" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://clipgrab.org" distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz" -checksum=1704386b88d2d17ed7d56dc62e5285a04fc27bcb6576f11d6798d674de49f729 +checksum=7bb0fc45dde0e79edc6d6706d71ff243de1492e8a5eb24b45d81e36d9080209b do_install() { vbin clipgrab diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index ace950f87f0..f8672bc633f 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,7 +1,7 @@ # Template file for 'codeblocks' pkgname=codeblocks version=17.12 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config zip" makedepends="gtk+-devel wxWidgets-devel tinyxml-devel" diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index e9fd2bc5e82..ad5826ed2c7 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,7 +1,7 @@ # Template file for 'codelite' pkgname=codelite version=12.0 -revision=3 +revision=4 build_style=cmake configure_args="-DENABLE_CLANG=1 -DENABLE_LLDB=1 -DWITH_MYSQL=1" hostmakedepends="pkg-config clang" diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template index 67f24150994..98d1b532843 100644 --- a/srcpkgs/codesearch/template +++ b/srcpkgs/codesearch/template @@ -1,7 +1,7 @@ # Template file for 'codesearch' pkgname=codesearch version=0.0.20150617 -revision=13 +revision=14 _githash=a45d81b686e85d01f2838439deaf72126ccd5a96 wrksrc="${pkgname}-${_githash}" build_style=go diff --git a/srcpkgs/confuse/template b/srcpkgs/confuse/template index 6c076e8cddb..1ce2817db37 100644 --- a/srcpkgs/confuse/template +++ b/srcpkgs/confuse/template @@ -1,15 +1,16 @@ # Template file for 'confuse' pkgname=confuse -version=3.2.1 +version=3.2.2 revision=1 build_style=gnu-configure configure_args="--enable-shared --enable-static" short_desc="Small configuration file parser library for C" maintainer="Juan RP " -homepage="https://github.com/martinh/libconfuse/" license="ISC" +homepage="https://github.com/martinh/libconfuse/" +changelog="https://github.com/martinh/libconfuse/raw/master/ChangeLog.md" distfiles="https://github.com/martinh/libconfuse/releases/download/v${version}/confuse-${version}.tar.xz" -checksum=23c63272baf2ef4e2cbbafad2cf57de7eb81f006ec347c00b954819824add25e +checksum=a9240b653d02e8cfc52db48e8c4224426e528e1faa09b65e8ca08a197fad210b post_install() { vlicense LICENSE diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index af6d272e4fe..164be293b1c 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -1,7 +1,7 @@ # Template file for 'consul' pkgname=consul version=1.2.2 -revision=1 +revision=2 build_style=go go_import_path="github.com/hashicorp/${pkgname}" short_desc="Distributed solution to connect and configure applications" diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template index 797bcd1ebad..df610ab136e 100644 --- a/srcpkgs/containerd/template +++ b/srcpkgs/containerd/template @@ -1,10 +1,16 @@ # Template file for 'containerd' pkgname=containerd -version=1.1.2 -revision=1 +version=1.1.3 +revision=2 build_style=go go_import_path=github.com/containerd/containerd -hostmakedepends="git pkg-config" +go_package="${go_import_path}/cmd/containerd + ${go_import_path}/cmd/containerd-release + ${go_import_path}/cmd/containerd-shim + ${go_import_path}/cmd/ctr" +go_ldflags="-X ${go_import_path}/version.Version=$version -X ${go_import_path}/version.Revision=UNSET" +go_build_tags="seccomp apparmor" +hostmakedepends="pkg-config go-md2man" makedepends="libbtrfs-devel libseccomp-devel" depends="runc" short_desc="An open and reliable container runtime" @@ -12,16 +18,20 @@ maintainer="Paul Knopf " license="Apache-2.0" homepage="https://github.com/containerd/containerd" distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz" -checksum=fd2531e1a1ace89b62f193f8c32e04ab847d75ad6316c7aa864e1eb386db3743 +checksum=a946f4614d92d60361213ef18deab04ee73599e4567f1ff26f7a72841afe4fa2 make_dirs="/var/lib/containerd 0755 root root" -do_build() { - cd ${GOSRCPATH} - make +post_build() { + # Build the man pages + for _i in ctr.1 containerd.1 config.toml.5 containerd-config.1 ; do + go-md2man -in "docs/man/$_i.md" -out "docs/man/$_i" + done } -do_install() { +post_install() { vsv containerd - cd ${GOSRCPATH} - make install DESTDIR=${DESTDIR}/usr/ + + for _i in ctr.1 containerd.1 config.toml.5 containerd-config.1 ; do + vman docs/man/$_i + done } diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template index 0a0e153b5cb..16cabb0c3fe 100644 --- a/srcpkgs/crane/template +++ b/srcpkgs/crane/template @@ -1,7 +1,7 @@ # Template file for 'crane' pkgname=crane version=3.4.2 -revision=1 +revision=2 build_style=go hostmakedepends="git" short_desc="Lift containers with ease" diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template index 7ab40e96c20..11c83f9f662 100644 --- a/srcpkgs/crystal/template +++ b/srcpkgs/crystal/template @@ -1,9 +1,9 @@ # Template file for 'crystal' pkgname=crystal -version=0.25.1 +version=0.26.0 revision=1 _shardsversion=0.8.1 -_bootstrapversion=0.25.1 +_bootstrapversion=0.26.0 _bootstraprevision=1 hostmakedepends="git llvm" makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel @@ -18,7 +18,7 @@ homepage="https://crystal-lang.org/" distfiles=" https://github.com/crystal-lang/crystal/archive/${version}.tar.gz https://github.com/crystal-lang/shards/archive/v${_shardsversion}.tar.gz" -checksum="9b5a7bd2de67ab36cc5430133228a1e656a431fc7d928a37a61109bd8da77fc6 +checksum="e98cf1403d5182fce888a120cda61918c329244765eaa265a17038bbfb217ba3 75c74ab6acf2d5c59f61a7efd3bbc3c4b1d65217f910340cb818ebf5233207a5" nocross="FIXME: someone needs to sort out the llvm --cxxflags for cross building" _crystalflags="--release --no-debug --progress" @@ -31,11 +31,11 @@ if [ "$build_option_binary_bootstrap" ]; then case "$XBPS_MACHINE" in x86_64) distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-x86_64.tar.gz" - checksum+=" 943ea77a976e80d2b3558ef525d2c9fa7fc3d41d6b5799923e378408d75e557e" + checksum+=" 856c6fe8b5104ea9bc9aeaf64e21bacb9082c7edc3ee4e27ad3c462f40b06af5" ;; i686) distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz" - checksum+=" ff0e38021cb20ad7cea3aaba78350a4ae22c4dc48563ba482aa3a87eb07e1044" + checksum+=" 2c822deabd2c5ab2151b8545f8c9b67bfa50515f33bb0b7ebdfcec4c83bbfac5" ;; *) broken="cannot be built on $XBPS_MACHINE" diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index d25c4b1a18d..4ee3c76cf50 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,13 +1,13 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.20.4 -revision=1 +version=1.21.0 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi --with-browseremoteprotocols=DNSSD,CUPS" -hostmakedepends="ghostscript glib-devel mupdf-tools poppler-utils pkg-config" +hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler-utils" makedepends="avahi-glib-libs-devel cups-devel fontconfig-devel - ghostscript-devel lcms2-devel libqpdf-devel poppler-cpp-devel" + ghostscript-devel lcms2-devel libqpdf-devel libqpdf-devel poppler-cpp-devel" depends="bc ghostscript libcups-filters-${version}_${revision} poppler-utils" checkdepends="dejavu-fonts-ttf" conf_files="/etc/cups/cups-browsed.conf" @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters" distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz" -checksum=33756e9fa8562cde050ecbec13f4c84b1c61c4f79a525e02382787c528ab536a +checksum=d1e975eaece2884ffa726f8d57dc249bd220e09cc5bd48ef7a0892987a07493b lib32disabled=yes diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template index 90dd85da0b8..602b39d2fb6 100644 --- a/srcpkgs/darch/template +++ b/srcpkgs/darch/template @@ -1,7 +1,7 @@ # Template file for 'darch' pkgname=darch version=0.20.0 -revision=1 +revision=2 build_style=go go_import_path=github.com/godarch/darch hostmakedepends="git go" diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index 9645c8f7027..665c22c56de 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,6 +1,6 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.107 +version=1.0.108 revision=1 build_style=fetch depends="binutils gnupg gzip tar wget xz" @@ -10,7 +10,7 @@ license="MIT" homepage="http://packages.qa.debian.org/d/debootstrap.html" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2017.5_all.deb" -checksum="d26114b8df0e8c99b3bae964b053672fafd9bf34f0577621dd3e2dc1a051dbc9 +checksum="21fd97b585b3c1a83433e5b021b208ebec9d4025d35372174644810ab843c3a7 6a38407c47fefad2d8459dc271d109f1841ee857f993ed3ce2884e33f7f0f734" do_install() { diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template index 11c54fba9d7..dff85391b3b 100644 --- a/srcpkgs/deepin-terminal/template +++ b/srcpkgs/deepin-terminal/template @@ -1,6 +1,6 @@ # Template file for 'deepin-terminal' pkgname=deepin-terminal -version=3.0.1 +version=3.0.3 revision=1 build_style=cmake configure_args="-DTEST_BUILD=OFF" @@ -15,5 +15,5 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-terminal" changelog="https://github.com/linuxdeepin/deepin-terminal/blob/master/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz" -checksum=1e58e48ea6f3e9b2a41c1443a848f64ff167a24f90a913d18fe6836302442a28 +checksum=b23d1b04cc2953bc79ec866d2f213fd16a5c92e3db1b865f17d2044d49c7ccfb nocross=yes diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template index 676dbfe6f81..1b88fcc8d5b 100644 --- a/srcpkgs/dep/template +++ b/srcpkgs/dep/template @@ -1,7 +1,7 @@ # Template file for 'dep' pkgname=dep version=0.5.0 -revision=1 +revision=2 build_style=go hostmakedepends="git" depends="git go" diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 0245bd1167f..2fb51c91804 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,6 +1,6 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=7.0.7 +version=7.0.8 revision=1 build_style=configure configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="BSD-2-Clause" homepage="https://roy.marples.name/projects/dhcpcd" distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=af23f11cf7a6d6cbbe236ac7c4b45db5765a4c1e468e88f2ef37ac2fa2de3a49 +checksum=96968e883369ab4afd11eba9dfd9bb109f5dfff65b2814ce6c432f36362dc9b5 lib32disabled=yes conf_files=/etc/dhcpcd.conf diff --git a/srcpkgs/dht-node/template b/srcpkgs/dht-node/template index 8227faf93c0..1db2b1c8e19 100644 --- a/srcpkgs/dht-node/template +++ b/srcpkgs/dht-node/template @@ -1,7 +1,7 @@ # Template file for 'dht-node' pkgname=dht-node version=0.2.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/ipfs/dht-node" go_build_tags="netgo" diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template index 493b35b1c37..2ee68cd59f0 100644 --- a/srcpkgs/diff-pdf/template +++ b/srcpkgs/diff-pdf/template @@ -1,7 +1,7 @@ # Template file for 'diff-pdf' pkgname=diff-pdf version=0.2.20160602 -revision=5 +revision=7 _commit=ccf96982fa8a35d64a377779cfd80c921f66cefc build_style=gnu-configure wrksrc="$pkgname-$_commit" diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template index edace42d2a4..40116690d3d 100644 --- a/srcpkgs/direnv/template +++ b/srcpkgs/direnv/template @@ -1,7 +1,7 @@ # Template file for 'direnv' pkgname=direnv version=2.17.0 -revision=1 +revision=2 build_style=go go_import_path=github.com/direnv/direnv short_desc="An environment switcher for the shell" diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template index 5dd951ef557..74cfd3ffb1b 100644 --- a/srcpkgs/dnote-cli/template +++ b/srcpkgs/dnote-cli/template @@ -1,7 +1,7 @@ # Template file for 'dnote-cli' pkgname=dnote-cli version=0.2.1 -revision=4 +revision=5 wrksrc=cli-${version} build_style=go go_import_path="github.com/dnote-io/cli" diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index 34f94d43f9e..b6948a969d7 100644 --- a/srcpkgs/dnscrypt-proxy/template +++ b/srcpkgs/dnscrypt-proxy/template @@ -1,7 +1,7 @@ # Template file for 'dnscrypt-proxy' pkgname=dnscrypt-proxy version=2.0.16 -revision=1 +revision=2 build_style=go short_desc="DNS proxy that encrypts queries" go_import_path=github.com/jedisct1/dnscrypt-proxy @@ -16,6 +16,8 @@ conf_files="/etc/dnscrypt-proxy.toml" system_accounts="dnscrypt_proxy" make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy" +broken="go-1.11/runtime.support_avx2" + post_install() { vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml vlicense LICENSE diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template index e85c475e864..78bd5278958 100644 --- a/srcpkgs/docker-gen/template +++ b/srcpkgs/docker-gen/template @@ -1,7 +1,7 @@ # Template file for 'docker-gen' pkgname=docker-gen version=0.7.4 -revision=5 +revision=6 build_style=go hostmakedepends="git glock" short_desc="Generate files from docker container meta-data" diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template index c2343d90764..6f265624fa1 100644 --- a/srcpkgs/docker-machine/template +++ b/srcpkgs/docker-machine/template @@ -1,7 +1,7 @@ # Template file for 'docker-machine' pkgname=docker-machine version=0.14.0 -revision=3 +revision=4 wrksrc="machine-${version}" build_style=go go_import_path="github.com/docker/machine" diff --git a/srcpkgs/docker2aci/template b/srcpkgs/docker2aci/template index 34dac3e2446..1a22cb2b08f 100644 --- a/srcpkgs/docker2aci/template +++ b/srcpkgs/docker2aci/template @@ -1,7 +1,7 @@ # Template file for 'docker2aci' pkgname=docker2aci version=0.17.2 -revision=2 +revision=3 hostmakedepends="git" build_style=go short_desc="Library and CLI tool to convert Docker images to ACIs" diff --git a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch b/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch new file mode 100644 index 00000000000..a808884a62a --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch @@ -0,0 +1,47 @@ +Origin: https://github.com/dolphin-emu/dolphin/commit/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch +Subject: [PATCH] intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, + which are reserved + +--- +--- Source/Core/Common/x64CPUDetect.cpp 2016-06-24 10:09:07.000000000 +0200 ++++ - 2018-08-19 19:43:35.737800299 +0200 +@@ -41,15 +41,27 @@ + return __cpuidex(info, function_id, 0); + } + +-#define _XCR_XFEATURE_ENABLED_MASK 0 +-static u64 _xgetbv(u32 index) ++#endif // ifndef _WIN32 ++ ++#ifdef _WIN32 ++ ++static u64 xgetbv(u32 index) ++{ ++ return _xgetbv(index); ++} ++constexpr u32 XCR_XFEATURE_ENABLED_MASK = _XCR_XFEATURE_ENABLED_MASK; ++ ++#else ++ ++static u64 xgetbv(u32 index) + { + u32 eax, edx; + __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index)); + return ((u64)edx << 32) | eax; + } ++constexpr u32 XCR_XFEATURE_ENABLED_MASK = 0; ++#endif // ifdef _WIN32 + +-#endif // ifndef _WIN32 + + CPUInfo cpu_info; + +@@ -134,7 +146,7 @@ + // - XGETBV result has the XCR bit set. + if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1)) + { +- if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6) ++ if ((xgetbv(XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6) + { + bAVX = true; + if ((cpu_id[2] >> 12) & 1) diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 6bb1ebcd5c1..7e604778a96 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -3,7 +3,7 @@ only_for_archs="x86_64 x86_64-musl" pkgname=dolphin-emu version=5.0 -revision=14 +revision=15 wrksrc="dolphin-${version}" build_style=cmake nopie=yes diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index ded42542a46..49913be0c81 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=2.7.1 +version=2.7.2 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="cr6git " license="GPL-3.0-or-later" homepage="https://www.doomretro.com" distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz" -checksum=f70183d509b2a052f3fbdccf4618473c61066c284728f858af9d6866e40fe58c +checksum=d0d483b75a335ace7f73fe804fb79277cac144160111c5567ec105293392f8da diff --git a/srcpkgs/double-conversion/template b/srcpkgs/double-conversion/template index f19a3fc2400..ecc37a72e22 100644 --- a/srcpkgs/double-conversion/template +++ b/srcpkgs/double-conversion/template @@ -3,7 +3,6 @@ pkgname=double-conversion version=3.0.0 revision=1 build_style=scons -hostmakedepends="scons" short_desc="Efficient binary-decimal and decimal-binary routines for IEEE doubles" maintainer="Diogo Leal " license="BSD-3-Clause" diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template index 803587944ef..700552eef00 100644 --- a/srcpkgs/drive/template +++ b/srcpkgs/drive/template @@ -1,7 +1,7 @@ # Template file for 'drive' pkgname=drive version=0.3.9.1 -revision=10 +revision=11 build_style=go hostmakedepends="git" short_desc="Google Drive client for the commandline" diff --git a/srcpkgs/dub/template b/srcpkgs/dub/template new file mode 100644 index 00000000000..281a3c0e199 --- /dev/null +++ b/srcpkgs/dub/template @@ -0,0 +1,23 @@ +# Template file for 'dub' +pkgname=dub +version=1.10.0 +revision=1 +hostmakedepends="dmd" +makedepends="libcurl-devel" +depends="dmd" +short_desc="Package/build management system for D projects" +maintainer="Follpvosten " +license="MIT" +homepage="https://github.com/dlang/dub" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=db6c3a9e45408d2431bc3d1138a31b561fb71665c1d89db4b0cb3725b2b12faa +nocross="because of dmd, see template line 26" + +do_build() { + ./build.sh +} + +do_install() { + vbin bin/dub + vlicense LICENSE +} diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index a30ee7cc2b7..60a1df4d315 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -1,7 +1,7 @@ # Template file for 'duplicity' pkgname=duplicity -version=0.7.17 -revision=2 +version=0.7.18 +revision=1 build_style=python2-module hostmakedepends="python-setuptools" makedepends="python-devel librsync-devel" @@ -14,7 +14,7 @@ _changelog="http://duplicity.nongnu.org/CHANGELOG" license="GPL-2" maintainer="Leah Neukirchen " distfiles="http://code.launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz" -checksum=3724c5f1f839e584e49154ee0ff137e6f3450eedbd7f3886f31d2093001cb04a +checksum=abb0f507db79165ac4d08b4adb5860217f0f3c83f114933fea36cc40899a91e2 post_extract() { chmod 0644 bin/*.1 diff --git a/srcpkgs/e2fsprogs/patches/fix-glibcism.patch b/srcpkgs/e2fsprogs/patches/fix-glibcism.patch new file mode 100644 index 00000000000..b7f7fee96bd --- /dev/null +++ b/srcpkgs/e2fsprogs/patches/fix-glibcism.patch @@ -0,0 +1,257 @@ +--- lib/ext2fs/ext4_acl.h ++++ lib/ext2fs/ext4_acl.h +@@ -50,13 +50,17 @@ typedef struct { + + typedef struct { + __le32 a_version; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" ++#endif + #endif + posix_acl_xattr_entry a_entries[0]; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic pop + #endif ++#endif + } posix_acl_xattr_header; + +--- lib/ext2fs/fiemap.h ++++ lib/ext2fs/fiemap.h +@@ -31,14 +31,18 @@ struct fiemap { + __u32 fm_mapped_extents;/* number of extents that were mapped (out) */ + __u32 fm_extent_count; /* size of fm_extents array (in) */ + __u32 fm_reserved; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" ++#endif + #endif + struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */ ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic pop + #endif ++#endif + }; + + #if defined(__linux__) && !defined(FS_IOC_FIEMAP) +--- lib/ext2fs/mmp.c ++++ lib/ext2fs/mmp.c +@@ -34,8 +34,10 @@ + #define O_DIRECT 0 + #endif + ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic push ++#endif + #ifndef CONFIG_MMP + #pragma GCC diagnostic ignored "-Wunused-parameter" + #endif +@@ -467,6 +469,8 @@ mmp_error: + return EXT2_ET_OP_NOT_SUPPORTED; + #endif + } ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic pop + #endif ++#endif +--- lib/ext2fs/unix_io.c ++++ lib/ext2fs/unix_io.c +@@ -1127,10 +1127,12 @@ unimplemented: + } + + /* parameters might not be used if OS doesn't support zeroout */ ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-parameter" + #endif ++#endif + static errcode_t unix_zeroout(io_channel channel, unsigned long long block, + unsigned long long count) + { +@@ -1197,9 +1199,11 @@ err: + unimplemented: + return EXT2_ET_UNIMPLEMENTED; + } ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic pop + #endif ++#endif + + static struct struct_io_manager struct_unix_manager = { + .magic = EXT2_ET_MAGIC_IO_MANAGER, +--- lib/ext2fs/hashmap.h ++++ lib/ext2fs/hashmap.h +@@ -17,14 +17,18 @@ struct ext2fs_hashmap { + struct ext2fs_hashmap_entry *next; + struct ext2fs_hashmap_entry *list_next; + struct ext2fs_hashmap_entry *list_prev; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" ++#endif + #endif + } *entries[0]; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic pop + #endif ++#endif + }; + + struct ext2fs_hashmap *ext2fs_hashmap_create( +--- lib/uuid/gen_uuid.c ++++ lib/uuid/gen_uuid.c +@@ -484,7 +484,9 @@ static void close_all_fds(void) + } + #endif /* defined(USE_UUIDD) && defined(HAVE_SYS_UN_H) */ + ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) ++#endif + #pragma GCC diagnostic push + #if !defined(USE_UUIDD) || !defined(HAVE_SYS_UN_H) + #pragma GCC diagnostic ignored "-Wunused-parameter" +@@ -572,9 +574,11 @@ fail: + #endif + return -1; + } ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic pop + #endif ++#endif + + void uuid__generate_time(uuid_t out, int *num) + { +--- e2fsck/problem.c ++++ e2fsck/problem.c +@@ -99,10 +99,12 @@ static const char *preen_msg[] = { + "", /* 20 */ + }; + ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" + #endif ++#endif + + static struct e2fsck_problem problem_table[] = { + +@@ -2094,9 +2096,11 @@ static struct latch_descr pr_latch_info[] = { + { PR_LATCH_OPTIMIZE_EXT, PR_1E_OPTIMIZE_EXT_HEADER, PR_1E_OPTIMIZE_EXT_END }, + { -1, 0, 0 }, + }; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic pop + #endif ++#endif + + static struct e2fsck_problem *find_problem(problem_t code) + { +--- misc/e2undo.c ++++ misc/e2undo.c +@@ -81,14 +81,18 @@ struct undo_key_block { + __le32 magic; /* KEYBLOCK_MAGIC number */ + __le32 crc; /* block checksum */ + __le64 reserved; /* zero */ ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" ++#endif + #endif + struct undo_key keys[0]; /* keys, which come immediately after */ ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic pop + #endif ++#endif + }; + + struct undo_key_info { +--- misc/filefrag.c ++++ misc/filefrag.c +@@ -535,9 +535,11 @@ int main(int argc, char**argv) + char *end; + blocksize = strtoul(optarg, &end, 0); + if (end) { ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (7, 0) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" ++#endif + #endif + switch (end[0]) { + case 'g': +@@ -555,8 +557,10 @@ int main(int argc, char**argv) + default: + break; + } ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (7, 0) + #pragma GCC diagnostic pop ++#endif + #endif + } + } else { /* Allow -b without argument for compat. Remove +--- misc/fuse2fs.c ++++ misc/fuse2fs.c +@@ -118,14 +118,18 @@ typedef struct { + + typedef struct { + u_int32_t a_version; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" ++#endif + #endif + acl_ea_entry a_entries[0]; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 8) + #pragma GCC diagnostic pop + #endif ++#endif + } acl_ea_header; + + static inline size_t acl_ea_size(int count) +--- debugfs/set_fields.c ++++ debugfs/set_fields.c +@@ -74,11 +74,12 @@ static errcode_t parse_bmap(struct field_set_info *info, char *field, char *arg) + static errcode_t parse_gd_csum(struct field_set_info *info, char *field, char *arg); + static errcode_t parse_mmp_clear(struct field_set_info *info, char *field, + char *arg); +- ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" + #endif ++#endif + + static struct field_set_info super_fields[] = { + { "inodes_count", &set_sb.s_inodes_count, NULL, 4, parse_uint }, +@@ -291,9 +292,11 @@ static struct field_set_info mmp_fields[] = { + { "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint }, + { 0, 0, 0, 0 } + }; ++#ifdef __GNUC_PREREQ + #if __GNUC_PREREQ (4, 6) + #pragma GCC diagnostic pop + #endif ++#endif + + #ifdef UNITTEST + diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index 2f66b20ffb8..a9f9b6dd6bb 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,6 +1,6 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.44.3 +version=1.44.4 revision=1 build_style=gnu-configure configure_args="--enable-elf-shlibs --disable-fsck @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://e2fsprogs.sourceforge.net/" distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz" -checksum=5d899f7d30f481cc0c6a049ebe26ebe145f1b524182ea1ecde4086162d4e4bb6 +checksum=ee03b2f2180614c5ae5f6dd2666f8808de61c3d8b37d22ba86cc6daea25be55a make_install_args="install-libs" conf_files="/etc/mke2fs.conf" diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 61e1b570dde..d6bd02cd69c 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.21.0 -revision=1 +revision=3 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 --disable-systemd $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) @@ -20,6 +20,7 @@ homepage="http://enlightenment.org" changelog="https://raw.githubusercontent.com/Enlightenment/efl/master/NEWS" distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" checksum=7e65be78a537aa67e447b945f01f4ecf9ddfa14d509bf6bbf53a60253ecbae4b +disable_parallel_build=yes if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake gettext-devel libtool efl-devel" diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 1c127002586..27b1080bcfa 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,7 +1,7 @@ # Template file for 'elogind' pkgname=elogind version=238.1 -revision=1 +revision=2 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot @@ -49,7 +49,7 @@ post_install() { } elogind-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="libelogind-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -58,3 +58,10 @@ elogind-devel_package() { vmove usr/lib/pkgconfig } } + +libelogind_package() { + short_desc+=" - elogind library" + pkg_install() { + vmove "usr/lib/libelogind.so.*" + } +} diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template index a95e45a4fe8..3cef29c9a62 100644 --- a/srcpkgs/elvish/template +++ b/srcpkgs/elvish/template @@ -1,7 +1,7 @@ # Template file for 'elvish' pkgname=elvish version=0.12 -revision=1 +revision=2 build_style=go go_import_path="github.com/elves/elvish" short_desc="Novel Unix shell" diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index 58d5f9b2701..ed0a47a7689 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -1,17 +1,25 @@ # Template file for 'encfs' pkgname=encfs -version=1.9.1 -revision=4 +version=1.9.5 +revision=1 build_style=cmake hostmakedepends="pkg-config perl" makedepends="fuse-devel libressl-devel gettext-devel" depends="perl" # for encfssh short_desc="Encrypted filesystem in user-space" maintainer="Juan RP " -license="GPL-3" +license="GPL-2.0-or-later, LGPL-3.0-or-later" homepage="http://www.arg0.net/encfs" distfiles="https://github.com/vgough/encfs/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=67203aeff7a06ce7be83df4948db296be89a00cffe1108a0a41c96d7481106a4 +checksum=4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63 + +# Can't run test programs when cross compiling +if [ "$CROSS_BUILD" ]; then + configure_args="-DBUILD_UNIT_TESTS=0" + case "${XBPS_TARGET_MACHINE}" in + armv[56]*) makedepends+=" libatomic-devel"; LDFLAGS="-latomic" ;; + esac +fi post_install() { chmod +x ${DESTDIR}/usr/bin/encfssh diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template index b05575c660f..5d0c06a8063 100644 --- a/srcpkgs/endless-sky/template +++ b/srcpkgs/endless-sky/template @@ -3,7 +3,6 @@ pkgname=endless-sky version=0.9.8 revision=2 build_style=scons -hostmakedepends="scons" makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel libopenal-devel libpng-devel" depends="${pkgname}-data" diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template index 54600daf9ca..73a134d0e4d 100644 --- a/srcpkgs/epdfview/template +++ b/srcpkgs/epdfview/template @@ -1,7 +1,7 @@ -# Template build file for 'epdfview'. +# Template file for 'epdfview' pkgname=epdfview version=0.1.8 -revision=8 +revision=10 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel poppler-glib-devel" @@ -10,7 +10,7 @@ short_desc="Lightweight PDF viewer using Poppler and GTK+" maintainer="Juan RP " homepage="http://www.emma-soft.com/projects/epdfview/" license="GPL-2" -distfiles="ftp://ftp.slackware.com/.1/blfs/conglomeration/epdfview/$pkgname-$version.tar.bz2" +distfiles="http://anduin.linuxfromscratch.org/BLFS/epdfview/epdfview-${version}.tar.bz2" checksum=948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0 post_install() { diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index c8fe8c6d3dc..ebd3bf13a0a 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang version=21.0 -revision=2 +revision=3 create_wrksrc=yes build_wrksrc=otp_src_${version} build_style=gnu-configure diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index eb0b9afb502..cea61c9cb33 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,7 +1,7 @@ # Template file for 'etcd' pkgname=etcd version=3.3.9 -revision=1 +revision=2 build_style=go short_desc="Distributed reliable key-value store" maintainer="Andrea Brancaleoni " diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index f2d85b1b4d0..645246b1af4 100644 --- a/srcpkgs/etcetera/template +++ b/srcpkgs/etcetera/template @@ -1,16 +1,17 @@ # Template file for 'etcetera' pkgname=etcetera -version=0.5 -revision=2 +version=0.6 +revision=1 noarch=yes +wrksrc="etcetera-v${version}" pycompile_dirs="/usr/lib/etcetera" depends="python3" short_desc="Config file management with a touch of wisdom" maintainer="cr6git " license="GPL-3.0-or-later" homepage="https://gitlab.com/jeancf/etcetera" -distfiles="https://github.com/jeancf/etcetera/archive/v${version}.tar.gz" -checksum=1cf1df80dabddc9207fa1c44d6d2ac26fe935e084cd6d83ea8d8a7fb4c8b972d +distfiles="https://gitlab.com/jeancf/etcetera/-/archive/v${version}/etcetera-v${version}.tar.gz" +checksum=09f4109e6b8b99e91e2b257794b2e15284cdc6310fe4843a6533b318f474771d conf_files="/etc/etcetera.conf" do_install() { diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 379e6f4ea76..12fbcfb56a0 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,13 +1,13 @@ # Template file for 'evince' pkgname=evince version=3.28.2 -revision=1 +revision=3 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile --enable-comics --disable-static --enable-xps --disable-t1lib --disable-browser-plugin" build_style=gnu-configure hostmakedepends="adwaita-icon-theme glib-devel gnome-doc-utils - gobject-introspection intltool itstool pkg-config" + gobject-introspection intltool itstool pkg-config perl-XML-Parser" # XXX missing packages for DVI backend. makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel libgxps-devel libsecret-devel libspectre-devel nautilus-devel @@ -17,7 +17,7 @@ short_desc="GNOME Document viewer for multiple document formats" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://projects.gnome.org/evince/" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1 build_options="gir" diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template index 733d0d28c1a..4f64c677944 100644 --- a/srcpkgs/exfat-dkms/template +++ b/srcpkgs/exfat-dkms/template @@ -11,7 +11,6 @@ homepage="https://github.com/dorimanx/exfat-nofuse" distfiles="https://github.com/dorimanx/exfat-nofuse/archive/${_commit}.tar.gz" checksum=b88a98f0a7e1b987465f5ccfcafb384b293506c7fec9d3b91b803e0fe5b16e0a -triggers="dkms" dkms_modules="exfat ${version}" depends="dkms" diff --git a/srcpkgs/extractpdfmark/template b/srcpkgs/extractpdfmark/template index c5e9035b4c5..04de0b8a69a 100644 --- a/srcpkgs/extractpdfmark/template +++ b/srcpkgs/extractpdfmark/template @@ -1,7 +1,7 @@ # Template file for 'extractpdfmark' pkgname=extractpdfmark version=1.0.2 -revision=3 +revision=5 build_wrksrc="build" build_style=gnu-configure configure_script="../configure" diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 9c41ba09bbf..16025f40eba 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,6 +1,6 @@ # Template file for 'facter' pkgname=facter -version=3.11.3 +version=3.11.4 revision=1 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" @@ -13,10 +13,10 @@ maintainer="Juan RP " license="Apache-2.0" homepage="http://puppetlabs.com/facter" distfiles="http://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=aafded9846f397bc0c74ab71376f9172f44fc8e5bece243454d2f26c2be073a0 +checksum=b450ff0640cd32ea03e8bc55ecbf791477dbaea703dd8ceb8285334d25223c5a if [ "$XBPS_GCC_VERSION_MAJOR" -ge 8 ]; then - CXXFLAGS+=" -Wno-catch-value -Wno-stringop-truncation" + CXXFLAGS+=" -Wno-catch-value -Wno-stringop-truncation" fi post_install() { diff --git a/srcpkgs/fceux/template b/srcpkgs/fceux/template index 0226572bd12..8a8c87d4fc4 100644 --- a/srcpkgs/fceux/template +++ b/srcpkgs/fceux/template @@ -1,14 +1,14 @@ # Template file for 'fceux' pkgname=fceux version=2.2.3 -revision=1 +revision=2 build_style=scons make_build_args="SYSTEM_LUA=1" -hostmakedepends="pkg-config scons" +hostmakedepends="pkg-config" makedepends="zlib-devel lua51-devel SDL-devel gtk+-devel gd-devel" short_desc="The all in one NES/Famicom Emulator" maintainer="bra1nwave " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.fceux.com/" distfiles="${SOURCEFORGE_SITE}/fceultra/Source%20Code/${version}%20src/${pkgname}-${version}.src.tar.gz" checksum=4be6dda9a347f941809a3c4a90d21815b502384adfdd596adaa7b2daf088823e diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template index b5968c0d5d0..f0c4b0e66a6 100644 --- a/srcpkgs/fcitx/template +++ b/srcpkgs/fcitx/template @@ -79,14 +79,12 @@ fcitx-devel_package() { } } libfcitx-gtk_package() { - triggers="gtk-immodules" short_desc+=" - GTK2 IM module" pkg_install() { vmove usr/lib/gtk-2.0 } } libfcitx-gtk3_package() { - triggers="gtk3-immodules" short_desc+=" - GTK3 IM module" pkg_install() { vmove usr/lib/gtk-3.0 diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template index 1e8046079f7..9a3a47d0ca7 100644 --- a/srcpkgs/fd/template +++ b/srcpkgs/fd/template @@ -1,6 +1,6 @@ # Template file for 'fd' pkgname=fd -version=7.0.0 +version=7.1.0 revision=1 hostmakedepends="cargo" short_desc="Simple, fast and user-friendly alternative to find" @@ -8,7 +8,7 @@ maintainer="Jerry Tegno " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/fd" distfiles="https://github.com/sharkdp/fd/archive/v${version}.tar.gz" -checksum=93cc5a7c9199dc650f51a491e4ed4512262eeaeae5847722e6886763b41e2896 +checksum=9385a55738947f69fd165781598de6c980398c6214a4927fce13a4f7f1e63d4d nocross=yes do_build() { diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template index cbbe823be38..9bf3b038769 100644 --- a/srcpkgs/ffmpegthumbs/template +++ b/srcpkgs/ffmpegthumbs/template @@ -1,6 +1,6 @@ # Template file for 'ffmpegthumbs' pkgname=ffmpegthumbs -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,8 @@ maintainer="Michael Straube " license="GPL-2.0-or-later" homepage="https://download.kde.org/stable/applications" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e6b2e6cd096bbc87696fbdecec0c21de3ee688161fa0b1adc83952a8f8004472 +checksum=366fc0518a8f987247178dce774faad2643ddf2116b68f4b908459ef2d5f6ee5 + +if [ "CROSS_BUILD" ]; then + hostmakedepends+=" kconfig-devel" +fi \ No newline at end of file diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template index a755e561c52..ad486429b4c 100644 --- a/srcpkgs/figurine/template +++ b/srcpkgs/figurine/template @@ -1,7 +1,7 @@ # Template file for 'figurine' pkgname=figurine version=0.2.2 -revision=1 +revision=2 build_style=go go_import_path=github.com/arsham/figurine hostmakedepends="git" diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 7820ac83b66..9a5ebd893b5 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,7 +1,7 @@ # Template file for 'filezilla' pkgname=filezilla version=3.35.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck" hostmakedepends="pkg-config" diff --git a/srcpkgs/flacon/INSTALL.msg b/srcpkgs/flacon/INSTALL.msg new file mode 100644 index 00000000000..d1df373c96f --- /dev/null +++ b/srcpkgs/flacon/INSTALL.msg @@ -0,0 +1,11 @@ +Optional Dependencies: + +flac – For FLAC support +lame – For MP3 support +mac – For APE support +mp3gain – For MP3 Replay Gain support +opus-tools – For OPUS support +ttaenc – For TrueAudio support (Not packaged by Void) +vorbis-tools – For OGG support +vorbisgain – For OGG Replay Gain support +wavpack – For WavPack support diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template new file mode 100644 index 00000000000..1d6c1d8731d --- /dev/null +++ b/srcpkgs/flacon/template @@ -0,0 +1,18 @@ +# Template file for 'flacon' +pkgname=flacon +version=4.1.0 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="qt5-tools-devel uchardet-devel" +depends="ffmpeg hicolor-icon-theme" +short_desc="Audio File Encoder. Splits audio tracks into separate tracks" +maintainer="travankor " +license="LGPL-2.1-or-later" +homepage="https://flacon.github.io/" +distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz" +checksum=8e9b7e9b12b79d7dbe1b1e4f47d7561538a62a55ab752a7269736a77bf56dd70 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-qmake" +fi diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template index 1335e4dc774..0981484dfc9 100644 --- a/srcpkgs/flameshot/template +++ b/srcpkgs/flameshot/template @@ -1,19 +1,19 @@ # Template file for 'flameshot' pkgname=flameshot -version=0.5.1 +version=0.6.0 revision=1 build_style=qmake configure_args="CONFIG+=packaging" -makedepends="qt5-devel" +makedepends="qt5-svg-devel" depends="desktop-file-utils" -maintainer="cr6git " short_desc="Powerful yet simple to use screenshot software for GNU/Linux" +maintainer="cr6git " +license="GPL-3.0-or-later" homepage="https://github.com/lupoDharkael/flameshot" -license="GPL-3" distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz" -checksum=35220eabb8c4203abb0732c63e0b4d955e17ddd0c03c3d2c7a5beb875728e44e +checksum=61b3a1969d6e17d80d5d90a3fce53ca5ae78fa21f9a45e5a19b0b32ea815a589 if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-devel" + hostmakedepends+=" qt5-svg-devel" fi diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template index b64d716db33..5c45798cca4 100644 --- a/srcpkgs/flannel/template +++ b/srcpkgs/flannel/template @@ -1,7 +1,7 @@ # Template file for 'flannel' pkgname=flannel version=0.10.0 -revision=5 +revision=6 build_style=go short_desc="Etcd backed network fabric for containers" maintainer="Andrea Brancaleoni " diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 79ce393597f..570a78d3805 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,6 +1,6 @@ # Template file for 'flatpak' pkgname=flatpak -version=0.11.8.3 +version=1.0.0 revision=1 build_style=gnu-configure configure_args="--disable-documentation --with-system-bubblewrap" @@ -13,9 +13,9 @@ short_desc="Application sandboxing and distribution framework" maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://flatpak.org/" -#changelog="https://github.com/flatpak/flatpak/blob/master/NEWS" +changelog="https://github.com/flatpak/flatpak/blob/master/NEWS" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" -checksum=be463fb628490252aea10e7855bb4a522cc1b57856509cf50e21009067c8f3b5 +checksum=e61bd01cffbbbb2ecd6a0946307987f9de795533358ba6ed7c63ce0c9f3b03e7 post_install() { rm -rf $DESTDIR/usr/lib/systemd diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 0985310e8bc..1b8ae9d964c 100644 --- a/srcpkgs/flint/template +++ b/srcpkgs/flint/template @@ -1,7 +1,7 @@ # Template file for 'flint' pkgname=flint version=0.1.0 -revision=8 +revision=9 build_style=go hostmakedepends="git" short_desc="Check your project for common sources of contributor friction" diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template index 1998626370b..2c7d7d4315c 100644 --- a/srcpkgs/font-ibm-plex-ttf/template +++ b/srcpkgs/font-ibm-plex-ttf/template @@ -1,6 +1,6 @@ # Template file for 'font-ibm-plex-ttf' pkgname=font-ibm-plex-ttf -version=1.1.4 +version=1.1.5 revision=1 wrksrc="plex-${version}" noarch=yes @@ -11,7 +11,7 @@ maintainer="Vintodrimmer " license="OFL-1.1" homepage="https://github.com/IBM/plex" distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz" -checksum=bd08eb276c0a684ba7fad388588af905c8fa002484650ed9a5a720ae837335b7 +checksum=46b5238046ee82b2e0d844566ddcbc7cc6003aa4a5f56ba66a348bda1151ff81 do_install() { vmkdir usr/share/fonts/TTF diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template index 0b4cb60aac1..6f239f15efc 100644 --- a/srcpkgs/forego/template +++ b/srcpkgs/forego/template @@ -1,7 +1,7 @@ # Template file for 'forego' pkgname=forego version=20180216151118 -revision=4 +revision=5 build_style=go hostmakedepends="git mercurial" short_desc="A process supervisor in Go" diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template index 2e18054a7a2..a3f0e919eb0 100644 --- a/srcpkgs/frp/template +++ b/srcpkgs/frp/template @@ -1,7 +1,7 @@ # Template file for 'frp' pkgname=frp version=0.21.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/fatedier/frp" go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps" diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template index 1ac0f69626d..05485887e2f 100644 --- a/srcpkgs/fs-repo-migrations/template +++ b/srcpkgs/fs-repo-migrations/template @@ -1,7 +1,7 @@ # Template file for 'fs-repo-migrations' pkgname=fs-repo-migrations version=1.4.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/ipfs/fs-repo-migrations" short_desc="Tool to upgrade the IPFS filesystem repository" diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index a0d7db54f2a..72581cd433e 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,7 +1,7 @@ # Template file for 'fzf' pkgname=fzf version=0.17.4 -revision=1 +revision=2 build_style=go go_import_path="github.com/junegunn/fzf" hostmakedepends="git" diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template index 3d55a338891..726aad2fc14 100644 --- a/srcpkgs/gallery-dl/template +++ b/srcpkgs/gallery-dl/template @@ -1,11 +1,11 @@ # Template file for 'gallery-dl' pkgname=gallery-dl version=1.5.1 -revision=1 +revision=2 wrksrc="gallery_dl-${version}" noarch=yes build_style=python3-module -pycompile_modules="gallery_dl" +pycompile_module="gallery_dl" hostmakedepends="python3-setuptools" depends="python3-requests" short_desc="Command-line program to download image galleries" diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template index 48081013cbe..4a9f9c76880 100644 --- a/srcpkgs/gdbm/template +++ b/srcpkgs/gdbm/template @@ -1,6 +1,6 @@ # Template file for 'gdbm' pkgname=gdbm -version=1.17 +version=1.18 revision=1 build_style=gnu-configure configure_args="--enable-libgdbm-compat --disable-rpath" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="http://www.gnu.org.ua/software/gdbm/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=7cd8cc2e35b1aaede6084ea57cc9447752f498daaea854100a4bad567614977d +checksum=b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce if [ "$CROSS_BUILD" ]; then hostmakedepends="libtool automake gettext-devel" diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index d8cc9e3cb56..1277f423f0f 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -8,12 +8,11 @@ configure_args="$(vopt_enable gir introspection) --without-libjasper hostmakedepends="automake gettext-devel glib-devel libtool pkg-config $(vopt_if gir 'gobject-introspection')" makedepends="libX11-devel libglib-devel libpng-devel tiff-devel" -triggers="gtk-pixbuf-loaders" short_desc="Image loading library for The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="https://wiki.gnome.org/Projects/GdkPixbuf" license="GPL-2.0-or-later" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334 # Package build options @@ -28,7 +27,7 @@ pre_configure() { sed -i '/SUBDIRS/s/tests//' Makefile.am autoreconf -fi # Can't create loaders.cache with cross compiled modules - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then touch gdk-pixbuf/loaders.cache fi } diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 1ef55a6393f..13f1510e912 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=3.28.3 +version=3.28.4 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -21,7 +21,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=08d962684511e5793b791ccfd9ab45b7e5676c478f259f20cf4831dfc465a189 +checksum=799f524278eb1a663c1d693589878c12ce8fad2293a66ef336e9626e1f933a3b conf_files=" /etc/gdm/custom.conf /etc/pam.d/gdm-autologin diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template index c0c2742f94c..c2f8225ff17 100644 --- a/srcpkgs/gede/template +++ b/srcpkgs/gede/template @@ -1,6 +1,6 @@ # Template file for 'gede' pkgname=gede -version=2.11.5 +version=2.11.7 revision=1 build_style=qmake build_options="qt5" @@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni " license="BSD" homepage="http://acidron.com/gede" distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz" -checksum=1b45efb0fc2b80ccac40684be35a5cd5586755164cf5a4fc086d98e097e47378 +checksum=97f275a8881ae7191af7c2c2404d550ff5bf9e08a5293ff90eed0111386072eb if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" $(vopt_if qt5 'qt5-host-tools qt5-devel' 'qt-host-tools qt-devel')" diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index 4ec35ed833d..4bcbe4b5731 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,21 +1,21 @@ # Template file for 'gegl' pkgname=gegl -version=0.4.6 +version=0.4.8 revision=1 build_style=gnu-configure configure_args="--disable-docs --without-sdl --without-libopenraw --without-libavformat --without-graphviz --without-lua --without-libspiro --without-umfpack --with-exiv2 --without-libv4l --disable-introspection" hostmakedepends="pkg-config intltool" -makedepends="libglib-devel libpng-devel babl-devel jasper-devel - libjpeg-turbo-devel librsvg-devel gtk+-devel exiv2-devel json-glib-devel" +makedepends="babl-devel exiv2-devel gtk+-devel jasper-devel json-glib-devel + librsvg-devel" short_desc="Graph based image processing framework" maintainer="Enno Boland " license="GPL-3.0-only, LGPL-3.0-only" homepage="https://www.gimp.org" changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt" distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2" -checksum=f397eb43f6b8ec387d177b21a0002070c78c38a94a1a0ca6575226f081519ae5 +checksum=719468eec56ac5b191626a0cb6238f3abe9117e80594890c246acdc89183ae49 gegl-devel_package() { depends="json-glib-devel babl-devel gegl>=${version}_${revision}" diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index 6554e5d927e..1063bdc68ec 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -1,7 +1,7 @@ # Template file for 'gendesk' pkgname=gendesk version=0.7 -revision=4 +revision=5 build_style=go hostmakedepends="git" go_import_path="github.com/xyproto/gendesk" diff --git a/srcpkgs/ghq/patches/142bf317f76150d64b1448fb4b77f0bc12ee0817.patch b/srcpkgs/ghq/patches/142bf317f76150d64b1448fb4b77f0bc12ee0817.patch new file mode 100644 index 00000000000..e44af80fd0f --- /dev/null +++ b/srcpkgs/ghq/patches/142bf317f76150d64b1448fb4b77f0bc12ee0817.patch @@ -0,0 +1,34 @@ +From 344a2a8a0eea18db2f24dec7cae395f1e1621db7 Mon Sep 17 00:00:00 2001 +From: Yota Toyama +Date: Fri, 17 Aug 2018 01:32:04 +0000 +Subject: [PATCH] Use new constructor for logger + +--- + utils/log.go | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git utils/log.go b/utils/log.go +index fa4c4e4..135699b 100644 +--- utils/log.go ++++ utils/log.go +@@ -6,7 +6,7 @@ import ( + "github.com/motemen/go-colorine" + ) + +-var logger = &colorine.Logger{ ++var logger = colorine.NewLogger( + colorine.Prefixes{ + "git": colorine.Verbose, + "hg": colorine.Verbose, +@@ -23,10 +23,7 @@ var logger = &colorine.Logger{ + "authorized": colorine.Notice, + + "error": colorine.Error, +- +- "": colorine.Info, +- }, +-} ++ }, colorine.Info) + + func Log(prefix, message string) { + logger.Log(prefix, message) diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template index 228df28a9e6..ba0821d66a0 100644 --- a/srcpkgs/ghq/template +++ b/srcpkgs/ghq/template @@ -1,10 +1,10 @@ # Template file for 'ghq' pkgname=ghq version=0.8.0 -revision=6 +revision=7 build_style=go -go_import_path="github.com/motemen/ghq" -go_package="${go_import_path}" +go_import_path=github.com/motemen/ghq +go_package="$go_import_path" hostmakedepends="git" depends="git" short_desc="Remote repository management made easy" diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 1240ca65fc7..8593d4c80b2 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,11 +1,11 @@ -# Template build file for 'gimp' +# Template file for 'gimp' pkgname=gimp version=2.10.4 -revision=3 +revision=5 lib32disabled=yes build_style=gnu-configure hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool - libtool pkg-config pygtk-devel" + libtool pkg-config pygtk-devel perl-XML-Parser" makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel ghostscript-devel jasper-devel lcms-devel libXcursor-devel libXpm-devel libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template index 41c689dae1b..aa486b3f41b 100644 --- a/srcpkgs/gister/template +++ b/srcpkgs/gister/template @@ -1,7 +1,7 @@ # Template file for 'gister' pkgname=gister version=0.5.0 -revision=1 +revision=2 build_style=go go_import_path=github.com/viyatb/gister short_desc="Command line app to create Gists in Go" diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template index ee856f9d227..6817284ac19 100644 --- a/srcpkgs/git-lfs/template +++ b/srcpkgs/git-lfs/template @@ -1,7 +1,7 @@ # Template file for 'git-lfs' pkgname=git-lfs version=2.5.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/git-lfs/git-lfs" hostmakedepends="go" diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index 0e68966e5f8..7feb2695ae4 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,7 +1,7 @@ # Template file for 'gitea' pkgname=gitea version=1.5.0 -revision=2 +revision=3 build_style=go go_import_path="code.gitea.io/gitea" # This could be done with build options, but these are built in with the diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template index 0a3c9525ba3..a7ab953b773 100644 --- a/srcpkgs/github-opml/template +++ b/srcpkgs/github-opml/template @@ -1,7 +1,7 @@ # Template file for 'github-opml' pkgname=github-opml version=1.0 -revision=5 +revision=6 build_style=go go_import_path=github.com/jojomi/github-opml hostmakedepends="git" diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template index 50ed2c499bf..f2b9ae64a20 100644 --- a/srcpkgs/gkill/template +++ b/srcpkgs/gkill/template @@ -1,7 +1,7 @@ # Template file for 'gkill' pkgname=gkill version=1.0.2 -revision=8 +revision=9 build_style=go hostmakedepends="git" short_desc="Easy Process Killer" diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template index 049160b48c6..54e1ea6bbd3 100644 --- a/srcpkgs/glide/template +++ b/srcpkgs/glide/template @@ -1,7 +1,7 @@ # Template file for 'glide' pkgname=glide version=0.13.1 -revision=5 +revision=6 build_style=go hostmakedepends="git" depends="go git" diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template index 774b6be5fec..6cd6cc4c5d8 100644 --- a/srcpkgs/glock/template +++ b/srcpkgs/glock/template @@ -1,7 +1,7 @@ # Template file for 'docker-gen' pkgname=glock version=0.0.0.20150512 -revision=11 +revision=12 _commit=30723574b54030cef8a13e672ce287f29c59f369 wrksrc="glock-$_commit" build_style=go diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template index bcf4060adc1..3d585d7bb48 100644 --- a/srcpkgs/gloobus-preview/template +++ b/srcpkgs/gloobus-preview/template @@ -1,7 +1,7 @@ # Template file for 'gloobus-preview' pkgname=gloobus-preview version=2015.12.21 -revision=3 +revision=5 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3 gettext-devel xz" makedepends="gettext-devel boost-devel gtk+-devel gtk+3-devel gtksourceview-devel diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template index 08a5a74bd2b..383efff40c0 100644 --- a/srcpkgs/gnome-nibbles/template +++ b/srcpkgs/gnome-nibbles/template @@ -1,13 +1,15 @@ # Template file for 'gnome-nibbles' pkgname=gnome-nibbles -version=3.24.0 +version=3.24.1 revision=2 build_style=gnu-configure -hostmakedepends="glib intltool itstool pkg-config glib-devel" -makedepends="clutter-gtk-devel libcanberra-devel librsvg-devel libgnome-games-support-devel" +hostmakedepends="glib-devel intltool itstool pkg-config" +makedepends="clutter-gtk-devel libcanberra-devel libgnome-games-support-devel + librsvg-devel" short_desc="GNOME snake eats diamonds game" maintainer="Jürgen Buchmüller " -license="GPL-2" +license="GPL-3.0-or-later" +changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS" homepage="https://wiki.gnome.org/Apps/Nibbles" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f +checksum=65582bac93f3a55ed287a94fd0a0d2ce6fe8f2c4c2efb640d92185952d23e4a5 diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 40027f4ff76..861cb92e622 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,7 +1,7 @@ # Template file for 'gnome-session' pkgname=gnome-session version=3.28.1 -revision=1 +revision=2 build_style=meson hostmakedepends="glib-devel intltool pkg-config xmlto" configure_args="-Dsystemd_journal=false" diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 6f2a4cdba7c..154d90c8f44 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,6 +1,6 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.1.8 +version=2.1.9 revision=1 noarch=yes build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=66465cfdbe6e64c40e112e815d1761b1bffc23ac990e5df77aea79b2ce851692 +checksum=79b9ad2dd3011fc02801dbd807e923a4f0b39860814c5b5ebe0b31e855e9fe53 post_install() { vinstall gns3-gui.desktop 644 usr/share/applications diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index a0b74f0e857..ab4879000ac 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,6 +1,6 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.1.8 +version=2.1.9 revision=1 build_style=python3-module pycompile_module="gns3server" @@ -13,7 +13,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" -checksum=8bccf2ba16832743e0743f11fe19f506172af07c68d2eae156ea1b946415b1a0 +checksum=2255fd3fd2eb7756f58d8f1b60e32d24899a14ca471de1ae03f6db2d8cd00b4f pre_build() { # relax requirements diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template index 33b20c28417..f7740645844 100644 --- a/srcpkgs/gnumeric/template +++ b/srcpkgs/gnumeric/template @@ -1,7 +1,7 @@ # Template file for 'gnumeric' pkgname=gnumeric -version=1.12.42 -revision=3 +version=1.12.43 +revision=1 build_style=gnu-configure hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config " makedepends="goffice-devel librsvg-devel libxslt-devel" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="http://gnumeric.org/" changelog="https://raw.githubusercontent.com/GNOME/gnumeric/master/NEWS" distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz" -checksum=54def8f93ab4858e2ed6499e2731c4393c1e94993696c944bd755a7a0879146d +checksum=87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5 # This isn't a direct dependency but when soname bumping perl it will # cause build failures diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template index 739804eee14..7d642761084 100644 --- a/srcpkgs/gnuplot/template +++ b/srcpkgs/gnuplot/template @@ -1,7 +1,7 @@ # Template file for 'gnuplot' pkgname=gnuplot version=5.2.4 -revision=2 +revision=3 configure_args="--with-readline=builtin" hostmakedepends="pkg-config lua52" makedepends="zlib-devel libX11-devel gd-devel lua52-devel" diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template index 80e66771308..fefc747838b 100644 --- a/srcpkgs/go-bindata/template +++ b/srcpkgs/go-bindata/template @@ -1,7 +1,7 @@ # Template file for 'go-bindata' pkgname=go-bindata version=3.0.7.20151023 -revision=11 +revision=12 _commit=a0ff2567cfb70903282db057e799fd826784d41d wrksrc="$pkgname-$_commit" build_style=go diff --git a/srcpkgs/go-gdm/template b/srcpkgs/go-gdm/template index 48374e7cc85..351cce02631 100644 --- a/srcpkgs/go-gdm/template +++ b/srcpkgs/go-gdm/template @@ -1,7 +1,7 @@ # Template file for 'go-gdm' pkgname=go-gdm version=1.4 -revision=6 +revision=7 build_style=go hostmakedepends="git" short_desc="Go dependency manager - gdm" diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template index f5a5b2ad5ac..0fe68d3d9e9 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -1,7 +1,7 @@ # Template file for 'go-ipfs' pkgname=go-ipfs version=0.4.17 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc="${pkgname}-${version}" build_style=go diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template index e99b88ef495..537d365eca8 100644 --- a/srcpkgs/go-jira/template +++ b/srcpkgs/go-jira/template @@ -1,7 +1,7 @@ # Template file for 'go-jira' pkgname=go-jira version=1.0.20 -revision=1 +revision=2 build_style=go hostmakedepends="dep" short_desc="Simple jira command line client in Go" diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template index ccafb6a8bba..e9a293714f8 100644 --- a/srcpkgs/go-md2man/template +++ b/srcpkgs/go-md2man/template @@ -1,7 +1,7 @@ # Template file for 'go-md2man' pkgname=go-md2man version=1.0.8 -revision=3 +revision=4 build_style=go go_import_path=github.com/cpuguy83/go-md2man hostmakedepends="git" diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template index 053bba263b4..1e6bdaf8bd2 100644 --- a/srcpkgs/go-mtpfs/template +++ b/srcpkgs/go-mtpfs/template @@ -1,7 +1,7 @@ # Template file for 'go-mtpfs' pkgname=go-mtpfs version=0.0.1.20180121 -revision=5 +revision=6 build_style=go go_import_path=github.com/hanwen/go-mtpfs hostmakedepends="git pkg-config" diff --git a/srcpkgs/go/template b/srcpkgs/go/template index ba3973dc93d..d4f71b23c28 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,16 +1,16 @@ # Template file for 'go' pkgname=go -version=1.10.3 +version=1.11 revision=1 create_wrksrc=yes build_wrksrc=go hostmakedepends="go1.4-bootstrap" short_desc="The Go Programming Language" -maintainer="Michael Gehring " +maintainer="Michael Aldridge " homepage="http://golang.org/" license="3-clause-BSD" distfiles="https://golang.org/dl/go${version}.src.tar.gz" -checksum=567b1cc66c9704d1c019c50bef946272e911ec6baf244310f87f4e678be155f2 +checksum=afc1e12f5fe49a471e3aae7d906c73e9d5b1fdd36d52d72652dde8f6250152fb nostrip=yes noverifyrdeps=yes diff --git a/srcpkgs/go1.4-bootstrap/template b/srcpkgs/go1.4-bootstrap/template index 3d4129a801d..3f0f8eb5430 100644 --- a/srcpkgs/go1.4-bootstrap/template +++ b/srcpkgs/go1.4-bootstrap/template @@ -5,7 +5,7 @@ revision=1 create_wrksrc=yes build_wrksrc="go" short_desc="Go 1.4 (bootstrap compiler)" -maintainer="Michael Gehring " +maintainer="Michael Aldridge " license="3-clause-BSD" homepage="https://golang.org" distfiles="https://dl.google.com/go/go1.4-bootstrap-${version}.tar.gz" diff --git a/srcpkgs/goat/template b/srcpkgs/goat/template index 7d46ef34213..c7eb49d2c24 100644 --- a/srcpkgs/goat/template +++ b/srcpkgs/goat/template @@ -1,7 +1,7 @@ # Template file for 'goat' pkgname=goat version=0.0.0.28022016 -revision=9 +revision=10 build_style=go _commit=2184ebe13497ec587e6f48b9381883285fa0071c hostmakedepends="git" diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template index b0484dbfa5a..ab7712997cd 100644 --- a/srcpkgs/gobuster/template +++ b/srcpkgs/gobuster/template @@ -1,7 +1,7 @@ # Template file for 'gobuster' pkgname=gobuster version=1.4.2 -revision=1 +revision=2 build_style=go go_import_path=github.com/OJ/gobuster hostmakedepends="git" diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 2ff8734fcfd..5be34edb39d 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -4,7 +4,7 @@ version=3.0.6 revision=1 wrksrc="${pkgname}-${version}-stable" build_style=scons -hostmakedepends="scons pkg-config clang" +hostmakedepends="pkg-config clang" makedepends=" alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel" @@ -17,7 +17,7 @@ checksum=50431e021ee5ec21002cc23435f530f8fde518c6eb7085c9f7f1027abaae2581 # Godot contains private copies of libraries # that already have been packaged elsewhere. make_build_args="use_llvm=yes platform=x11 tools=yes target=release_debug dev=no progress=no pulseaudio=no" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio" +nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC" LDFLAGS+=" -pie" diff --git a/srcpkgs/goffice/template b/srcpkgs/goffice/template index cbcc91d18e1..3341ba7a775 100644 --- a/srcpkgs/goffice/template +++ b/srcpkgs/goffice/template @@ -1,6 +1,6 @@ # Template file for 'goffice' pkgname=goffice -version=0.10.42 +version=0.10.43 revision=1 hostmakedepends="automake pkg-config pcre gettext-devel intltool libtool glib-devel gtk-doc" makedepends="GConf-devel gtk+3-devel librsvg-devel libgsf-devel libxml2-devel pcre-devel libxslt-devel" @@ -10,7 +10,7 @@ license="GPL-2.0-or-later" short_desc="Document-centric objects and utilities for GLib and Gtk+" homepage="https://github.com/GNOME/goffice" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ee1f2700e78ea804b2b1d635fce557ba96f135ce3818c495055dbec9794355f8 +checksum=550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e pre_configure() { autoreconf -if diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template index e2ce7efd91b..eedf789ac1a 100644 --- a/srcpkgs/gogs/template +++ b/srcpkgs/gogs/template @@ -1,7 +1,7 @@ # Template build file for 'gogs' pkgname=gogs version=0.11.43 -revision=1 +revision=2 build_style=go go_import_path="github.com/gogits/gogs" short_desc="Self-hosted Git Service in Go" diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index 961e313c226..8ae898da91f 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -1,7 +1,7 @@ # Template file for 'golly' pkgname=golly version=3.2 -revision=2 +revision=3 wrksrc="${pkgname}-${version}-src" build_style=gnu-configure configure_script="gui-wx/configure/configure" diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template index 50372d64b7b..3f67e2b37f2 100644 --- a/srcpkgs/goodvibes/template +++ b/srcpkgs/goodvibes/template @@ -1,10 +1,10 @@ # Template file for 'goodvibes' pkgname=goodvibes -version=0.3.7 +version=0.4 revision=1 wrksrc="goodvibes-v${version}" -build_style=gnu-configure -hostmakedepends="automake gettext-devel glib-devel pkg-config" +build_style=meson +hostmakedepends="appstream-glib desktop-file-utils gettext-devel glib-devel pkg-config" makedepends="dconf-devel gst-plugins-base1-devel gtk+3-devel libkeybinder3-devel libsoup-devel" depends="desktop-file-utils hicolor-icon-theme" @@ -14,8 +14,4 @@ license="GPL-3.0-or-later" homepage="https://gitlab.com/goodvibes/goodvibes" changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS" distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz" -checksum=8d215198ed789c69b7e08b739eb70adc9f4bd14af1cc69e286329c543c5cff91 - -pre_configure() { - ./autogen.sh -} +checksum=937969f0a6666173196eae31b0ba5d2e149fa71b623f702502cb160ce0062c95 diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index d12789a8c00..48ead7c35d3 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,7 +1,7 @@ # Template file for 'gopass' pkgname=gopass version=1.8.2 -revision=1 +revision=2 build_style=go go_import_path=github.com/gopasspw/gopass makedepends="gnupg2" @@ -14,6 +14,8 @@ changelog="https://raw.githubusercontent.com/justwatchcom/gopass/master/CHANGELO distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz" checksum=6dc423448c0672fd5087ab75e4c3d8584fb75c93789c9fd68bf14576ab46d1ed +broken="go-1.11/runtime.support_avx2" + if [ "$CROSS_BUILD" ]; then # Depend on system gopass to generate completions hostmakedepends="gopass" diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template index bf735439a22..cf9e8258395 100644 --- a/srcpkgs/gopm/template +++ b/srcpkgs/gopm/template @@ -1,7 +1,7 @@ # Template build file for 'gopm' pkgname=gopm version=0.7.2.20150801 -revision=13 +revision=14 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d wrksrc="${pkgname}-${_commit}" build_style=go diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template index 1748e97c91a..34388757f28 100644 --- a/srcpkgs/gosh/template +++ b/srcpkgs/gosh/template @@ -1,7 +1,7 @@ # Template file for 'gosh' pkgname=gosh version=0.2.3 -revision=11 +revision=12 build_style=go go_import_path="github.com/mkouhei/gosh" short_desc="Interactive shell for Golang" diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template index aec1ce5f554..0e4e5273228 100644 --- a/srcpkgs/gotop/template +++ b/srcpkgs/gotop/template @@ -1,7 +1,7 @@ # Template file for 'gotop' pkgname=gotop version=1.4.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/cjbassi/gotop" short_desc="Terminal based graphical activity monitor" diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template index ec48b8145b4..0e5d268e992 100644 --- a/srcpkgs/gotty/template +++ b/srcpkgs/gotty/template @@ -1,7 +1,7 @@ # Template file for 'gotty' pkgname=gotty version=1.0.1 -revision=7 +revision=8 build_style=go go_import_path="github.com/yudai/gotty" hostmakedepends="git" diff --git a/srcpkgs/govendor/template b/srcpkgs/govendor/template index c64eaff9f14..76b83b36abb 100644 --- a/srcpkgs/govendor/template +++ b/srcpkgs/govendor/template @@ -1,7 +1,7 @@ # Template file for 'govendor' pkgname=govendor version=1.0.9 -revision=1 +revision=2 build_style=go go_import_path="github.com/kardianos/govendor" short_desc="Go vendor tool that works with the standard vendor file" diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template index 7cf2995251a..304044bc0c5 100644 --- a/srcpkgs/goversion/template +++ b/srcpkgs/goversion/template @@ -1,7 +1,7 @@ # Template file for 'goversion' pkgname=goversion version=1.2.0 -revision=2 +revision=3 build_style=go go_import_path=rsc.io/goversion hostmakedepends="git" diff --git a/srcpkgs/goxel/patches/util_sseb.patch b/srcpkgs/goxel/patches/util_sseb.patch new file mode 100644 index 00000000000..8b989d1a65e --- /dev/null +++ b/srcpkgs/goxel/patches/util_sseb.patch @@ -0,0 +1,11 @@ +--- ext_src/cycles/src/util/util_sseb.h 2018-04-25 09:48:18.000000000 +0200 ++++ ext_src/cycles/src/util/util_sseb.h 2018-08-23 11:27:31.552028617 +0200 +@@ -119,7 +119,7 @@ + __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); } + + template __forceinline const sseb shuffle( const sseb& a ) { +- return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)); ++ return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0))); + } + + template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) { diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template index 4f43ebae388..77c38903785 100644 --- a/srcpkgs/goxel/template +++ b/srcpkgs/goxel/template @@ -1,10 +1,10 @@ # Template file for 'goxel' pkgname=goxel version=0.8.0 -revision=1 +revision=2 build_style=scons make_build_args="debug=0 werror=0" -hostmakedepends="pkg-config scons" +hostmakedepends="pkg-config" makedepends="glfw-devel gtk+3-devel" short_desc="Open Source 3D voxel editor" maintainer="John " @@ -13,17 +13,21 @@ homepage="https://guillaumechereau.github.io/goxel/" distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz" checksum=2fb9328e27b4f24f2ddff9e79f01832661fd626b52fa0079039cbb64a3e704ca -if [ "$CROSS_BUILD" ];then - pre_build() { - sed -i -e "/conf = env.Configure()/ a env.Replace(CC = \"$CC\")\nenv.Replace(CXX = \"$CXX\")" SConstruct - } -fi - case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; i686*) make_build_args+=" cycles=0";; esac +pre_build() { + if [ "$CROSS_BUILD" ];then + sed -i SConstruct \ + -e "/conf = env.Configure()/ a env.Replace(CC = \"$CC\")" \ + -e "/conf = env.Configure()/ a env.Replace(CXX = \"$CXX\")" + fi + sed -i Makefile \ + -e "s;scons debug=0;& werror=0;" +} + do_install() { sed -i 's|${SNAP}/icon.png|goxel.png|' snap/gui/goxel.desktop vbin goxel diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template index ecce5576c32..59be0630a7e 100644 --- a/srcpkgs/gparted/template +++ b/srcpkgs/gparted/template @@ -1,7 +1,7 @@ # Template file for 'gparted' pkgname=gparted -version=0.31.0 -revision=2 +version=0.32.0 +revision=1 build_style=gnu-configure configure_args="--enable-libparted-dmraid" hostmakedepends="gnome-doc-utils intltool pkg-config" @@ -9,10 +9,10 @@ makedepends="glib-devel gnome-doc-utils gtkmm2-devel libparted-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Gnome Partition Editor" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="https://gparted.sourceforge.io" -license="GPL-2" distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz" -checksum=3b7b49a434d9e4b397bc41a1f5acab8539b9ff402b472dfd83ad77b2decd07ba +checksum=ae1db86def71015f2d755310a32ab334354076d23bf400e35a720226112357ba pre_configure() { sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template index 9ebee91a784..464e83a26e8 100644 --- a/srcpkgs/gpick/template +++ b/srcpkgs/gpick/template @@ -1,17 +1,17 @@ # Template file for 'gpick' pkgname=gpick version=0.2.5 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=scons -hostmakedepends="scons pkg-config" +hostmakedepends="pkg-config" makedepends="boost-devel gtk+-devel lua52-devel" short_desc="Advanced color picker written in C++ using GTK+ toolkit" maintainer="Alexander Mamay " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/thezbyg/gpick" distfiles="https://github.com/thezbyg/gpick/archive/${pkgname}-${version}.tar.gz" -checksum="3a9706c101f82e9a49880db9fb408c760d49e6b4506ee5768962c25ec2ecbb57" +checksum=3a9706c101f82e9a49880db9fb408c760d49e6b4506ee5768962c25ec2ecbb57 do_install() { scons DESTDIR=${DESTDIR}/usr install diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index a23710034e5..3b5d34ec8d7 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,23 +1,22 @@ # Template file for 'gpsd' pkgname=gpsd version=3.17 -revision=2 +revision=3 build_style=scons -patch_args=-p1 +patch_args="-p1" make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}" -make_install_args="${make_build_args}" -make_install_target="udev-install" +make_install_args="$make_build_args" +make_install_target=udev-install +hostmakedepends="pkg-config bc python libxslt xmlto asciidoc ncurses" +makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel" short_desc="A GPS/AIS receiver monitoring daemon" maintainer="uriahheep " -license="BSD" +license="BSD-3-Clause" homepage="http://www.catb.org/gpsd/" distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz" checksum=68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a system_accounts="gpsd" -hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc ncurses" -makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel" - subpackages="gpsd-devel" if [ -z "$CROSS_BUILD" ]; then subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 5f8d46ec65e..3e1a7fc26c5 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -1,7 +1,7 @@ # Template file for 'grafana' pkgname=grafana -version=5.2.2 -revision=1 +version=5.2.3 +revision=2 build_style=go go_import_path=github.com/grafana/grafana go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://grafana.com" distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz" -checksum=4267618981b93135644dd88f6f1cd2f1aa184b96ff845c8164c38dcb6e3fd777 +checksum=f65668e8524219e5733e310574b40530f21357076879c11daed74fd4fc018aa7 system_accounts="_grafana" _grafana_homedir="/var/lib/grafana" diff --git a/srcpkgs/grv/template b/srcpkgs/grv/template index de44122eb71..7d9a06d6f94 100644 --- a/srcpkgs/grv/template +++ b/srcpkgs/grv/template @@ -1,7 +1,7 @@ # Template file for 'grv' pkgname=grv version=0.2.0 -revision=1 +revision=2 wrksrc=${pkgname} build_style=go go_import_path="github.com/rgburke/grv" diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index d54066d89c5..958eee1b494 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,4 +1,4 @@ -# Template build file for 'gtk+'. +# Template file for 'gtk+' pkgname=gtk+ version=2.24.32 revision=1 @@ -8,7 +8,7 @@ short_desc="The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://www.gtk.org" license="LGPL-2.1" -distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz" +distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)" @@ -18,7 +18,6 @@ makedepends="libglib-devel libXcursor-devel cairo-devel pango-devel atk-devel cups-devel" depends="shared-mime-info dbus-x11 gtk-update-icon-cache-${version}_${revision}" conf_files="/etc/gtk-2.0/im-multipress.conf" -triggers="gtk-immodules" CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED" diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template index e3145fd5f1a..5c57ea0596a 100644 --- a/srcpkgs/gtkd/template +++ b/srcpkgs/gtkd/template @@ -1,7 +1,7 @@ # Template file for 'gtkd' pkgname=gtkd version=3.8.3 -revision=2 +revision=3 wrksrc="GtkD-${version}" build_style=gnu-makefile hostmakedepends="ldc pkg-config" diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template index 2df5e1a2e96..4591f9765ce 100644 --- a/srcpkgs/gummi/template +++ b/srcpkgs/gummi/template @@ -1,7 +1,7 @@ # Template file for 'gummi' pkgname=gummi version=0.6.6 -revision=2 +revision=4 build_style=gnu-configure hostmakedepends="automake intltool pkg-config glib-devel gtk+-devel gettext-devel" makedepends="gtksourceview2-devel glib-devel poppler-glib-devel gtkspell-devel gettext-devel" diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 05f6e696f1c..592356fa237 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -99,7 +99,6 @@ gvfs-mtp_package() { gvfs-smb_package() { short_desc+=" - SMB/CIFS (Windows client) backend" depends="gvfs-${version}_${revision}" - triggers="gsettings-schemas" pkg_install() { vmove usr/libexec/gvfsd-smb vmove usr/libexec/gvfsd-smb-browse diff --git a/srcpkgs/gx-go/template b/srcpkgs/gx-go/template index 60fd7964c2f..1c66513c45e 100644 --- a/srcpkgs/gx-go/template +++ b/srcpkgs/gx-go/template @@ -1,7 +1,7 @@ # Template file for 'gx-go' pkgname=gx-go version=1.8.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/whyrusleeping/gx-go" hostmakedepends="git" diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template index 92ec970561c..acb11d80c03 100644 --- a/srcpkgs/gx/template +++ b/srcpkgs/gx/template @@ -1,7 +1,7 @@ # Template file for 'gx' pkgname=gx version=0.13.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/whyrusleeping/gx" hostmakedepends="git" diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template index 90aadb17641..ec7059a43cf 100644 --- a/srcpkgs/hcloud/template +++ b/srcpkgs/hcloud/template @@ -1,7 +1,7 @@ # Template file for 'hcloud' pkgname=hcloud version=1.6.0 -revision=1 +revision=2 wrksrc="cli-${version}" build_style=go go_import_path=github.com/hetznercloud/cli diff --git a/srcpkgs/hiera/template b/srcpkgs/hiera/template index e360db706a2..52fc82cab0f 100644 --- a/srcpkgs/hiera/template +++ b/srcpkgs/hiera/template @@ -1,7 +1,8 @@ # Template file for 'hiera' pkgname=hiera -version=3.4.3 +version=3.4.4 revision=1 +noarch=yes build_style=ruby-module hostmakedepends="ruby" depends="ruby" @@ -9,7 +10,6 @@ short_desc="A simple pluggable Hierarchical Database" maintainer="Juan RP " license="Apache-2.0" homepage="http://projects.puppetlabs.com/projects/hiera" -distfiles="http://github.com/puppetlabs/$pkgname/archive/$version.tar.gz" -checksum=484e94249d968b969b1bb823413606a16775e5bb08d645621a309f36692f8dc9 +distfiles="http://github.com/puppetlabs/${pkgname}/archive/${version}.tar.gz" +checksum=6debb3c478a208d7d28534f404aed767dc719700c5733502e784a0fa357c951c conf_files="/etc/hiera.yaml" -noarch=yes diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index da6462d77fd..b34dda8f7fb 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -1,6 +1,6 @@ # Template file for 'hopper' pkgname=hopper -version=4.3.28 +version=4.3.29 revision=1 _build=1 create_wrksrc=yes @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="EULA" homepage="https://www.hopperapp.com" distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz" -checksum=4dcb997387312d3674af597c8677f3d092b2f27f23cc2084ecf536b175366055 +checksum=caa2ad5cca190891f38f4c77f8c3506101b4521574730349051bf5845e26d3b9 only_for_archs="x86_64" restricted=yes diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template index b5806236973..c6ecf6bf23a 100644 --- a/srcpkgs/httpstat/template +++ b/srcpkgs/httpstat/template @@ -1,7 +1,7 @@ # Template file for 'httpstat' pkgname=httpstat version=1.0.0 -revision=11 +revision=12 build_style=go go_import_path="github.com/davecheney/httpstat" hostmakedepends="git" diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template index 01c33351240..d50a480214d 100644 --- a/srcpkgs/hub/template +++ b/srcpkgs/hub/template @@ -1,7 +1,7 @@ # Template file for 'hub' pkgname=hub -version=2.5.0 -revision=1 +version=2.5.1 +revision=2 build_style=go go_import_path=github.com/github/hub hostmakedepends="git" @@ -11,7 +11,7 @@ license="MIT" homepage="https://hub.github.com/" changelog="https://github.com/github/hub/releases" distfiles="https://github.com/github/hub/archive/v${version}.tar.gz" -checksum=8e3bda092ddc81eaf208c5fd2b87f66e030012129d55fa631635c6adf8437941 +checksum=35fecdbcaf0afb6b7273a160cc169f76ec62b95105037ac3fc833b24573f9a4f post_install() { # Requires ronn diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 5e3e3c28cd6..b4918ae3d09 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2018.0.0 -revision=4 +revision=5 wrksrc="${pkgname}-${version}" build_style=cmake pycompile_module="hpi.py hsi.py" diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index a0939cce95c..239bb15f40f 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,7 +1,7 @@ # Template file for 'hugo' pkgname=hugo -version=0.46 -revision=1 +version=0.47.1 +revision=2 build_style=go hostmakedepends="git" depends="$(vopt_if pygments python-Pygments)" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=3cb167e24bdbb2362415aba4b1be301596276b4ff565116cb81df95bdfc50c0a +checksum=1c47fef843812c5e2621f28bde445117bc90413e3221f72800512ed82db94c5f build_options="pygments" desc_option_pygments="Alternative syntax highlighter" diff --git a/srcpkgs/hunspell-fr_FR/template b/srcpkgs/hunspell-fr_FR/template index 255c2ddac7e..f1b276303d0 100644 --- a/srcpkgs/hunspell-fr_FR/template +++ b/srcpkgs/hunspell-fr_FR/template @@ -1,16 +1,16 @@ # Template file for 'hunspell-fr_FR' pkgname=hunspell-fr_FR -version=6.2 +version=6.3 revision=1 -maintainer="Leah Neukirchen " -homepage="http://www.dicollecte.org/home.php?prj=fr" -license="MPL-1.1" +noarch=yes hostmakedepends="unzip" short_desc="French dictionary for hunspell" +maintainer="Leah Neukirchen " +license="MPL-1.1" +homepage="http://www.dicollecte.org/home.php?prj=fr" distfiles="http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip" -checksum=c98147b99518a5aa51d51db58d6a153377bb9f366ebe8a21a2faa05b6c76308d +checksum=cc6c2d15073659d221487b45245e9eee9a4ed66c30c6dcf784326bab063c5266 create_wrksrc=yes -noarch=yes do_install() { _variant="classique" diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index 30c0493a366..38c864c01a2 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -13,7 +13,6 @@ makedepends="dconf-devel gtk+-devel hicolor-icon-theme iso-codes json-glib-devel libnotify-devel librsvg-devel python-xdg" depends="hicolor-icon-theme iso-codes dbus-x11 python-xdg $(vopt_if ibus_setup 'python-gobject>=3.12.1_3')" -triggers="gtk-immodules gtk3-immodules" short_desc="Intelligent Input Bus" maintainer="Juan RP " homepage="https://github.com/ibus/ibus" diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template index ef8ea1dcfb7..0a4257beea7 100644 --- a/srcpkgs/immortal/template +++ b/srcpkgs/immortal/template @@ -1,7 +1,7 @@ # Template file for 'immortal' pkgname=immortal version=0.20.0 -revision=1 +revision=2 build_style=go go_import_path=github.com/immortal/immortal go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl ${go_import_path}/cmd/immortaldir" diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template index 51ac80dc74d..b2cfe67a356 100644 --- a/srcpkgs/influxdb/template +++ b/srcpkgs/influxdb/template @@ -1,7 +1,7 @@ # Template file for 'influxdb' pkgname=influxdb version=1.6.1 -revision=1 +revision=2 build_style=go go_import_path=github.com/influxdata/influxdb go_package="${go_import_path}/cmd/influx diff --git a/srcpkgs/inkscape/patches/noconst.patch b/srcpkgs/inkscape/patches/noconst.patch new file mode 100644 index 00000000000..eeb47b91a42 --- /dev/null +++ b/srcpkgs/inkscape/patches/noconst.patch @@ -0,0 +1,59 @@ +--- src/extension/internal/pdfinput/pdf-parser.cpp 2018-03-11 10:38:09.000000000 -1000 ++++ src/extension/internal/pdfinput/pdf-parser.cpp 2018-04-21 08:55:27.901218709 -1000 +@@ -2490,7 +2490,7 @@ + builder->updateFont(state); + fontChanged = gFalse; + } +- doShowText(args[0].getString()); ++ doShowText((GooString *)args[0].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2511,7 +2511,7 @@ + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + builder->updateTextPosition(tx, ty); +- doShowText(args[0].getString()); ++ doShowText((GooString *)args[0].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2534,7 +2534,7 @@ + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + builder->updateTextPosition(tx, ty); +- doShowText(args[2].getString()); ++ doShowText((GooString *)args[2].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2572,7 +2572,7 @@ + } + builder->updateTextShift(state, obj.getNum()); + } else if (obj.isString()) { +- doShowText(obj.getString()); ++ doShowText((GooString *)obj.getString()); + } else { + error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); + } +@@ -2732,7 +2732,7 @@ + { + Object obj1, obj2, obj3, refObj; + +- char *name = args[0].getName(); ++ char *name = (char *)args[0].getName(); + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupXObject(name)).isNull()) { + #else +--- src/extension/internal/pdfinput/svg-builder.cpp 2018-03-11 10:38:09.000000000 -1000 ++++ src/extension/internal/pdfinput/svg-builder.cpp 2018-04-21 10:14:49.821436417 -1000 +@@ -1020,7 +1020,7 @@ + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = font->getName()->getCString(); ++ _font_specification = (char *)font->getName()->getCString(); + } else { + _font_specification = (char*) "Arial"; + } + diff --git a/srcpkgs/inkscape/patches/poppler-0.65.patch b/srcpkgs/inkscape/patches/poppler-0.65.patch new file mode 100644 index 00000000000..ecbd8efcfba --- /dev/null +++ b/srcpkgs/inkscape/patches/poppler-0.65.patch @@ -0,0 +1,30 @@ +From 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: [PATCH] Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 721524e10a..a3aa3213a1 100644 +--- src/extension/internal/pdfinput/pdf-parser.cpp ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -37,8 +37,7 @@ extern "C" { + #include "util/units.h" + + #include "goo/gmem.h" +-#include "goo/GooTimer.h" +-#include "goo/GooHash.h" ++#include "goo/GooString.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" +-- +2.18.0 + + diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 131e2d6b1b7..ebbd2d12103 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,12 +1,12 @@ # Template file for 'inkscape' pkgname=inkscape version=0.92.3 -revision=4 +revision=6 build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo --without-gnome-vfs --disable-static" hostmakedepends="automake pkg-config libtool intltool gettext-devel - glib-devel" + glib-devel perl-XML-Parser" makedepends=" popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel lcms2-devel poppler-glib-devel boost-devel libmagick-devel @@ -19,7 +19,7 @@ homepage="http://inkscape.org/" license="GPL-2, LGPL-2.1" distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2" checksum=a530c3ac5c9670a0533f4b71e27e62fa9c8a7f3bcff2148d882e4afafb2387d4 -wrksrc="$pkgname-INKSCAPE_${version//./_}" +wrksrc="${pkgname}-INKSCAPE_${version//./_}" # Use c++11 mode and reduce log spam due to gcc6 warnings CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-misleading-indentation -Wno-cast-align" diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index 59502aa6a39..5ae97efed62 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,7 +1,7 @@ # Template file for 'inspircd' pkgname=inspircd -version=2.0.25 -revision=3 +version=2.0.26 +revision=1 build_style=gnu-makefile hostmakedepends="perl pkg-config" makedepends="geoip-devel libressl-devel sqlite-devel" @@ -12,7 +12,7 @@ short_desc="Modular Internet Relay Chat server" maintainer="Alexander Gehrke " license="GPL-2" distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz" -checksum=c2488fafd04fcabbd8ddc8b9cdc6e0b57e942802b451c9cbccaf5d8483ebd251 +checksum=8a067add0132af57081f563bdca7ce6bb66c2e3c0465ce273b7eed1c5a955394 do_configure() { ./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp,m_geoip.cpp diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index 811e55460d0..3e8196b4183 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.2.7 -revision=10 +revision=12 _tools_commit=e5b23399a83d69fd5bb5d4645ef7325b4b57435b hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools wget" makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel" diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template index 1fc1f5d7aa5..13ece934158 100644 --- a/srcpkgs/ipfs-cluster/template +++ b/srcpkgs/ipfs-cluster/template @@ -1,7 +1,7 @@ # Template file for 'ipfs-cluster' pkgname=ipfs-cluster version=0.4.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/ipfs/ipfs-cluster" go_package="${go_import_path}/ipfs-cluster-ctl ${go_import_path}/ipfs-cluster-service" diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 1493b0ba911..dcee9b45fae 100644 --- a/srcpkgs/jgmenu/template +++ b/srcpkgs/jgmenu/template @@ -1,16 +1,16 @@ # Template file for 'jgmenu' pkgname=jgmenu -version=1.1 +version=1.2 revision=1 build_style=gnu-makefile make_use_env=yes make_install_args="prefix=/usr" hostmakedepends="pkg-config python3" -makedepends="librsvg-devel libXinerama-devel libxml2-devel menu-cache-devel pango-devel" +makedepends="librsvg-devel libXrandr-devel libxml2-devel menu-cache-devel pango-devel" depends="desktop-file-utils python3" short_desc="Small X11 menu intended to be used with openbox and tint2" maintainer="cr6git " license="GPL-2.0-or-later" homepage="https://www.github.com/johanmalm/jgmenu" distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz" -checksum=1478b763832f103ff4f57562c8fd21059dd647954dd4582dcf34135a5f7fb0d1 +checksum=b01397f2c541a3ce9f6b92fafb4f6966369662987302562d2ac972178ee4e7c4 diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template index 5b085920059..c7c032d9b40 100644 --- a/srcpkgs/jid/template +++ b/srcpkgs/jid/template @@ -1,7 +1,7 @@ # Template file for 'jid' pkgname=jid version=0.7.2 -revision=9 +revision=10 build_style=go go_import_path="github.com/simeji/jid" go_package="github.com/simeji/jid/cmd/jid" diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template index a056eb360e7..68202f56da6 100644 --- a/srcpkgs/json-c++/template +++ b/srcpkgs/json-c++/template @@ -1,6 +1,6 @@ # Template file for 'json-c++' pkgname=json-c++ -version=3.1.2 +version=3.2.0 revision=1 wrksrc="json-${version}" build_style=cmake @@ -9,7 +9,7 @@ maintainer="maxice8 " license="MIT" homepage="https://github.com/nlohmann/json" distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz" -checksum=e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54 +checksum=2de558ff3b3b32eebfb51cf2ceb835a0fa5170e6b8712b02be9c2c07fcfe52a1 post_install() { vlicense LICENSE.MIT diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index bf3a41cd4fe..63c1bc6906f 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,6 +1,6 @@ # Template file for 'k3b' pkgname=k3b -version=18.04.2 +version=18.08.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake" @@ -12,7 +12,7 @@ short_desc="CD/DVD Kreator for Linux" depends="cdrdao cdrtools dvd+rw-tools" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="https://github.com/KDE/k3b" -distfiles="https://github.com/KDE/k3b/archive/v${version}.tar.gz" -checksum=66f92df41b145c5da58e3278e687947f409a658582a469f921f98279d500fe69 +homepage="https://www.kde.org/applications/multimedia/k3b/" +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=ad9e60654b132d41d2c5931cebc72214e2b18cae7313e6bf0eb816d60109a9d2 diff --git a/srcpkgs/kbfs/template b/srcpkgs/kbfs/template index 61e4cb8e0c1..ea60e5ce22d 100644 --- a/srcpkgs/kbfs/template +++ b/srcpkgs/kbfs/template @@ -1,7 +1,7 @@ # Template file for 'kbfs'. pkgname=kbfs version=2.5.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/keybase/kbfs" go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool" diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template index 2feb6d0dc9c..88e6da89098 100644 --- a/srcpkgs/kcalc/template +++ b/srcpkgs/kcalc/template @@ -1,6 +1,6 @@ # Template file for 'kcalc' pkgname=kcalc -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -9,6 +9,6 @@ makedepends="gmp-devel kinit-devel kparts-devel qt5-devel" short_desc="A simple and scientific calculator" maintainer="Norbert Vegh " license="GPL-2.0-or-later" -homepage="http://utils.kde.org/projects/kcalc/" +homepage="https://www.kde.org/applications/utilities/kcalc/" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=3d6b7d143537c0b7069756b281cc93495c1f01325e94182aa65f9183f66a6a0a +checksum=66494c778cad6a422136cca755f04f79bf31854bdcd4d940347ed2c47c5b6d11 diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template index 1d37d9328be..29afd039a27 100644 --- a/srcpkgs/kcolorchooser/template +++ b/srcpkgs/kcolorchooser/template @@ -1,6 +1,6 @@ # Template file for 'kcolorchooser' pkgname=kcolorchooser -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="Michael Straube " license="MIT" homepage="https://www.kde.org/applications/graphics/kcolorchooser" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=dbe6b9266940b117bc36094ab3e4ab77d0db79d2c9e9f616ead5b55ffcd38fc6 +checksum=741cf9f7a6e59bcf2118f9eb69db7f35384d8153f886b9f2721ed46b99e9b4eb if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template index 9c466412346..53eb47bfe3b 100644 --- a/srcpkgs/kde5-baseapps/template +++ b/srcpkgs/kde5-baseapps/template @@ -1,6 +1,6 @@ # Template file for 'kde5-baseapps' pkgname=kde5-baseapps -version=18.04.3 +version=18.08.0 revision=1 build_style=meta depends=" diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 59569f29956..d00c3e98ee8 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,7 +1,7 @@ # Template file for 'keybase' pkgname=keybase version=2.5.0 -revision=1 +revision=2 wrksrc="client-${version}" build_style=go go_import_path="github.com/keybase/client" diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 0688d4dd368..278fb3541b6 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,7 +1,7 @@ # Template file for 'kicad' pkgname=kicad version=4.0.7 -revision=7 +revision=8 build_style=cmake configure_args="-DKICAD_BUILD_VERSION=$version -DKICAD_SKIP_BOOST=ON -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON" diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template index b02a659b817..65293f0c08c 100644 --- a/srcpkgs/kompare/template +++ b/srcpkgs/kompare/template @@ -1,6 +1,6 @@ # Template file for 'kompare' pkgname=kompare -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules" @@ -8,9 +8,9 @@ makedepends="ktexteditor-devel libkomparediff2-devel" short_desc="File difference viewer" maintainer="Norbert Vegh " license="GPL-2.0-only, GFDL-1.2-only" -homepage="http://www.caffeinated.me.uk/kompare/" +homepage="https://www.kde.org/applications/development/kompare/" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=dbd8ba4abc7026f1154e7c263159e2c6ce7426603dfe2ce720091e16b58552b3 +checksum=fd879cb6c2fb8e3b05f0389537091fc3b9d79ca16d2832c1d7b6169c04c7a455 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" diff --git a/srcpkgs/krusader/template b/srcpkgs/krusader/template index abdbe385358..f8dddecf25b 100644 --- a/srcpkgs/krusader/template +++ b/srcpkgs/krusader/template @@ -1,16 +1,13 @@ # Template file for 'krusader' pkgname=krusader -version=2.7.0 +version=2.7.1 revision=1 build_style=cmake -configure_args="-DQMAKE_EXECUTABLE:FILEPATH=/usr/lib/qt5/bin/qmake" -hostmakedepends="pkg-config qt5-qmake extra-cmake-modules kdoctools-devel" -makedepends="qt5-devel plasma-framework zlib-devel phonon-devel -kdoctools-devel kwallet-devel ksolid-devel kxmlgui-devel kio-devel kparts-devel" +hostmakedepends="extra-cmake-modules pkg-config kdoctools qt5-qmake qt5-host-tools" +makedepends="kparts-devel phonon-devel plasma-framework-devel" short_desc="Twin-panel (commander-style) file manager" -maintainer="Duncan Overbruck " -license="GPL-3.0-or-later" +maintainer="Piotr Wójcik " +license="GPL-2.0-or-later" homepage="https://www.krusader.org/" distfiles="${KDE_SITE}/krusader/${version}/krusader-${version}.tar.xz" -checksum=8b41522b3b1297d5f293f4fe9becaf255bc06b16d5b19b220653da5e951e9a27 -nocross="automoc fails to run" +checksum=d5c14d7e0698b84a1285efe7058074f760924d13d0823e1b5123fbe771907deb diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template index 31a9789bfad..ea1bd38d1d6 100644 --- a/srcpkgs/kubernetes-helm/template +++ b/srcpkgs/kubernetes-helm/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes-helm' pkgname=kubernetes-helm -version=2.9.1 +version=2.10.0 revision=1 hostmakedepends="go make git mercurial" short_desc="The Kubernetes Package Manager" @@ -8,7 +8,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://helm.sh/" distfiles="https://github.com/helm/helm/archive/v${version}.tar.gz" -checksum=2fee31764117024d1cc4f597d23791c60feef7c3ceedd143cfdbbafca7a7e126 +checksum=544511a814a0aefc4f74e196d96bea7930d83df059551d0b57c28439f6df4137 nopie=true conflicts="helm" wrksrc="helm-${version}" @@ -19,7 +19,7 @@ do_extract() { tar -xvzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${version}.tar.gz \ -C golib/src/k8s.io/helm \ --strip-components 1 \ - helm-2.9.1 + helm-${version} } pre_build() { diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 16a5e83cb65..2ba6b2eabb8 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,7 +1,7 @@ # Template file for 'kubernetes' pkgname=kubernetes version=1.11.2 -revision=1 +revision=2 build_style=go nocross=yes only_for_archs="x86_64 x86_64-musl" diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template index b0137ecd86c..7448a280458 100644 --- a/srcpkgs/kurly/template +++ b/srcpkgs/kurly/template @@ -1,7 +1,7 @@ # Template file for 'kurly' pkgname=kurly version=1.2.2 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=go go_import_path="gitlab.com/davidjpeacock/kurly" diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template index 5fa69fcaf6f..afc9ba446b8 100644 --- a/srcpkgs/kvantum/template +++ b/srcpkgs/kvantum/template @@ -1,6 +1,6 @@ # Template file for 'kvantum' pkgname=kvantum -version=0.10.7 +version=0.10.8 revision=1 build_style=qmake wrksrc=${pkgname^}-${version} @@ -12,7 +12,7 @@ maintainer="Giuseppe Fierro " license="GPL-3.0-or-later" homepage="https://github.com/tsujan/Kvantum" distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz" -checksum=dd7703be481907012823470f703e462db7339ad1ebd9b30c1848b7c6998b82d6 +checksum=a169a19a05985124a946ae638bee2729adad1544497693d911bb7d15160fd20c if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel qt5-x11extras-devel" diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template index 85577a75ac3..9ce044d6b73 100644 --- a/srcpkgs/lazygit/template +++ b/srcpkgs/lazygit/template @@ -1,7 +1,7 @@ # Template file for 'lazygit' pkgname=lazygit -version=0.1.70 -revision=1 +version=0.1.79 +revision=2 build_style=go go_import_path=github.com/jesseduffield/lazygit hostmakedepends="git" @@ -11,7 +11,7 @@ maintainer="maxice8 " license="MIT" homepage="https://github.com/jesseduffield/lazygit" distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz" -checksum=747e0b8b3768691a6ef2e583c7f9993662fc3f15007220eae0a017159aab917a +checksum=eed9516d1b944ce4528a5d308d1dd49ee7932cf1d8ec6955556cc4dfe737f9a3 post_install() { vlicense LICENSE diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 4c790fc9cc7..1490c7eb77a 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,7 +1,7 @@ # Template file for 'ldc' pkgname=ldc -version=1.10.0 -revision=2 +version=1.11.0 +revision=1 wrksrc="ldc-${version}-src" build_style=cmake configure_args="-DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc -DBUILD_SHARED_LIBS=ON" @@ -14,7 +14,7 @@ license="BSD-3-Clause, BSL-1.0" homepage="http://wiki.dlang.org/LDC" changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=99b6e2b8dcaf28a2947318fb25e43fa0b96dd3a6377995146f987c4d17dd8371 +checksum=85464fae47bc605308910afd6cfc6ddeafe95a8ad5b61e2c0c23caff82119f70 conf_files="/etc/ldc2.conf" nopie=yes nocross=yes diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template index bc2c70b6be8..3cec57e5817 100644 --- a/srcpkgs/lf/template +++ b/srcpkgs/lf/template @@ -1,7 +1,7 @@ # Template file for 'lf' pkgname=lf version=r7 -revision=1 +revision=2 build_style=go go_import_path="github.com/gokcehan/${pkgname}" go_ldflags="-X main.gVersion=$version" diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index b8e50848813..eb89b525b95 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,7 +1,7 @@ -# Template build file for 'libX11'. +# Template file for 'libX11' pkgname=libX11 -version=1.6.5 -revision=4 +version=1.6.6 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto --disable-static --enable-malloc0returnsnull" @@ -11,8 +11,8 @@ short_desc="Base X libraries from Xorg" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" -distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d +distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" +checksum=65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libtool automake xorgproto xtrans" diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template index b892dfbee4b..bcd86a9fa97 100644 --- a/srcpkgs/libXpresent/template +++ b/srcpkgs/libXpresent/template @@ -1,7 +1,7 @@ # Template file for 'libXpresent' pkgname=libXpresent version=1.0.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros" makedepends="libXfixes-devel libXrandr-devel" @@ -13,7 +13,8 @@ distfiles="${XORG_SITE}/lib/libXpresent-${version}.tar.gz" checksum=92f1bdfb67ae2ffcdb25ad72c02cac5e4912dc9bc792858240df1d7f105946fa libXpresent-devel_package() { - depends="libXpresent-${version}_${revision} xorgproto libX11-devel" + depends="${sourcepkg}-${version}_${revision} libX11-devel libXext-devel + libXfixes-devel libXrandr-devel presentproto xorgproto xproto" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template index 5950c5c79e8..b9198b1fa8a 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,7 +1,7 @@ # Template file for 'libblockdev' pkgname=libblockdev version=2.19 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel @@ -18,7 +18,7 @@ conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg /etc/libblockdev/conf.d/00-default.cfg" libblockdev-devel_package() { - depends="libblockdev-${version}_${revision}" + depends="libblockdev-${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template index d39a1e3e850..f309ec0deed 100644 --- a/srcpkgs/libcap-ng/template +++ b/srcpkgs/libcap-ng/template @@ -3,7 +3,7 @@ pkgname=libcap-ng version=0.7.9 revision=1 build_style=gnu-configure -configure_args="--without-python" +configure_args="--without-python --without-python3" short_desc="An alternate POSIX capabilities library" maintainer="Juan RP " homepage="http://people.redhat.com/sgrubb/libcap-ng/" @@ -16,7 +16,7 @@ subpackages="libcap-ng-devel libcap-ng-progs" if [ -z "$CROSS_BUILD" ]; then subpackages+=" libcap-ng-python libcap-ng-python3" hostmakedepends="python-devel python3-devel swig" - configure_args+=" --with-python" + configure_args+=" --with-python --with-python3" fi libcap-ng-devel_package() { diff --git a/srcpkgs/libcloudproviders/template b/srcpkgs/libcloudproviders/template index 4f2f6585930..8ca7dd067a5 100644 --- a/srcpkgs/libcloudproviders/template +++ b/srcpkgs/libcloudproviders/template @@ -1,7 +1,7 @@ # Template file for 'libcloudproviders' pkgname=libcloudproviders version=0.2.5 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-6fc78d1ac63400a098037d14984eaadba5ad6526" build_style=meson hostmakedepends="pkg-config glib-devel" @@ -14,7 +14,7 @@ distfiles="https://gitlab.gnome.org/Incubator/libcloudproviders/repository/${ver checksum=6fcce3bc523411980132d258befd1893dcddb08638551a6275606bcad1737bb0 libcloudproviders-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 9dbc7dc0f49..bd3516f8418 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,7 +1,8 @@ # Template file for 'libdrm' pkgname=libdrm -version=2.4.93 +version=2.4.94 revision=1 +wrksrc="drm-libdrm-${version}" build_style=meson configure_args="-Dudev=true -Dvalgrind=false" hostmakedepends="pkg-config" @@ -10,8 +11,8 @@ short_desc="Userspace interface to kernel DRM services" maintainer="maxice8 " license="MIT" homepage="https://dri.freedesktop.org/" -distfiles="https://dri.freedesktop.org/libdrm/${pkgname}-${version}.tar.bz2" -checksum=6e84d1dc9548a76f20b59a85cf80a0b230cd8196084f5243469d9e65354fcd3c +distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz" +checksum=a681c0458368eec79e5e12969023958542468b48bb8b868ae4464ae450a714eb post_install() { sed -n 9,25p < libsync.h > LICENSE diff --git a/srcpkgs/libdrm/update b/srcpkgs/libdrm/update new file mode 100644 index 00000000000..f99c4c84f1a --- /dev/null +++ b/srcpkgs/libdrm/update @@ -0,0 +1,2 @@ +site=https://gitlab.freedesktop.org/mesa/drm/tags +pkgname=drm-libdrm diff --git a/srcpkgs/libelogind b/srcpkgs/libelogind new file mode 120000 index 00000000000..49be2e0cf59 --- /dev/null +++ b/srcpkgs/libelogind @@ -0,0 +1 @@ +elogind \ No newline at end of file diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index dfc18a7ab93..4330c0e389b 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -4,8 +4,8 @@ version=2.3.0 revision=2 build_style=scons make_build_args="PREFIX=/usr MANDIR=/usr/share/man UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0 ENABLE_OPTIMIZATIONS=0 WILL_DEAL_WITH_XDG_MYSELF=1" -make_install_args="${make_build_args}" -hostmakedepends="scons pkg-config" +make_install_args="$make_build_args" +hostmakedepends="pkg-config" makedepends="libxml++-devel libdbus-c++-devel libsigc++-devel libconfig++-devel jack-devel libavc1394-devel libiec61883-devel libraw1394-devel alsa-lib-devel" short_desc="Library for accessing BeBoB IEEE1394 devices" diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index fcd1d0cdf3c..f339c8dacd1 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=2.3.1 -revision=1 +revision=3 wrksrc=gdal-${version} build_style=gnu-configure configure_args="--with-liblzma --with-poppler" diff --git a/srcpkgs/libkcapi/template b/srcpkgs/libkcapi/template index d9dbfed353d..6c6cb786939 100644 --- a/srcpkgs/libkcapi/template +++ b/srcpkgs/libkcapi/template @@ -25,7 +25,7 @@ post_install() { } libkcapi-devel_package() { - depends=${sourcepkg}>=${version}_${revision} + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - Development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template index fec3f44cdfc..04c22fc9d9c 100644 --- a/srcpkgs/libksane/template +++ b/srcpkgs/libksane/template @@ -1,6 +1,6 @@ # Template file for 'libksane' pkgname=libksane -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules" @@ -10,7 +10,11 @@ maintainer="travankor " license="LGPL-2.1-or-later" homepage="https://www.kde.org/applications/graphics/" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=92730bed392e2a87df9ab6a7724fc7e69b3823866831f7cf0e06af85daa0ca61 +checksum=6082188ecb7e21c161f232f5d421fda7fc9bbf580530019b643203ae14349d27 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-qmake qt5-host-tools" +fi libksane-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libmaxminddb-devel b/srcpkgs/libmaxminddb-devel new file mode 120000 index 00000000000..9b6b0f3096f --- /dev/null +++ b/srcpkgs/libmaxminddb-devel @@ -0,0 +1 @@ +libmaxminddb \ No newline at end of file diff --git a/srcpkgs/libmaxminddb/template b/srcpkgs/libmaxminddb/template new file mode 100644 index 00000000000..1bf9f18a1f1 --- /dev/null +++ b/srcpkgs/libmaxminddb/template @@ -0,0 +1,20 @@ +# Template file for 'libmaxminddb' +pkgname=libmaxminddb +version=1.3.2 +revision=1 +build_style=gnu-configure +short_desc="A library for working with MaxMind DB files" +maintainer="Elie ROUDNINSKI " +license="Apache-2.0" +homepage="https://maxmind.github.io/${pkgname}/" +distfiles="https://github.com/maxmind/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" +checksum=e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0 + +libmaxminddb-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/share/man/man3 + } +} diff --git a/srcpkgs/libmpack/template b/srcpkgs/libmpack/template index 1897b0e826e..d96dd3b358e 100644 --- a/srcpkgs/libmpack/template +++ b/srcpkgs/libmpack/template @@ -3,7 +3,9 @@ pkgname=libmpack version=1.0.5 revision=1 build_style=gnu-makefile -hostmakedepends="libtool" +make_build_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool" +make_install_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool" +makedepends="libtool" short_desc="Simple implementation of msgpack in C" maintainer="maxice8 " license="MTI" @@ -11,7 +13,6 @@ homepage="https://github.com/libmpack/libmpack" distfiles="https://github.com/libmpack/libmpack/archive/${version}.tar.gz" checksum=4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956 make_check_target=test -nocross="libtool usage doesn't support cross-compiling" libmpack-devel_package() { depends="libmpack-${version}_${revision}" diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template index e2b4970a854..14af5153b38 100644 --- a/srcpkgs/libopenraw/template +++ b/srcpkgs/libopenraw/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config curl" makedepends="glib-devel gdk-pixbuf-devel boost-devel libxml2-devel libjpeg-turbo-devel" -triggers="gtk-pixbuf-loaders" short_desc="Library for camera RAW files decoding" maintainer="Jürgen Buchmüller " license="LGPL-3.0-or-later" diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index 541de863a5f..883440a294c 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,7 +1,7 @@ # Template file for 'libplacebo' pkgname=libplacebo version=0.5.0 -revision=2 +revision=3 build_style=meson configure_args="-Dvulkan=true -Dglslang=true -Dshaderc=true" hostmakedepends="pkg-config" @@ -14,7 +14,7 @@ distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz" checksum=2cc7729a25cb1c265b96900cd22727d96ce984c16cf57bfb784c7f988a5e32a7 libplacebo-devel_package() { - depends="libplacebo-${version}_${revision}" + depends="libplacebo-${version}_${revision} vulkan-loader" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 480e92142d8..2a8e25131b6 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -24,7 +24,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel neon-devel nss-devel poppler-cpp-devel postgresql-libs-devel python3-devel redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel cppunit-devel" -depends+=" libreoffice-common>=${version}_${revision}" +depends="libreoffice-common>=${version}_${revision}" depends+=" libreoffice-base>=${version}_${revision}" depends+=" libreoffice-calc>=${version}_${revision}" depends+=" libreoffice-draw>=${version}_${revision}" diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index f3d9b1cdba9..facf7a73aa6 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,4 +1,4 @@ -# Template build file for 'librsvg'. +# Template file for 'librsvg' pkgname=librsvg version=2.40.20 revision=5 @@ -7,12 +7,11 @@ configure_args="--disable-static $(vopt_enable gir introspection) $(vopt_enable hostmakedepends="automake libtool pkg-config intltool python glib-devel gdk-pixbuf-devel gobject-introspection $(vopt_if vala vala-devel)" makedepends="libcroco-devel pango-devel gdk-pixbuf-devel" -triggers="gtk-pixbuf-loaders" short_desc="SVG library for GNOME" maintainer="Juan RP " homepage="https://wiki.gnome.org/Projects/LibRsvg" license="LGPL-2.1" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b # Package build options diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 832a90eb0b3..e16f1fd3a27 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,36 +1,35 @@ # Template file for 'libsearpc' pkgname=libsearpc -reverts="3.0.8_1" -version=3.0.7 -revision=2 +version=3.1.0 +revision=1 build_style=gnu-configure +pycompile_module="pysearpc" configure_args="--disable-static --disable-compile-demo" hostmakedepends="automake libtool pkg-config python" -makedepends="glib-devel jansson-devel" - +makedepends="libglib-devel jansson-devel" short_desc="Seafile RPC library" maintainer="yopito " -license="GPL-3" +license="LGPL-3.0-or-later, Apache-2.0" homepage="https://github.com/haiwen/${pkgname}" distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=efee6b495f93e70101c87849c78b135014dfd2f0e5c08dcfed9834def47cb939 +checksum=cbd86d3c37b54ca2060ca537a07940fe3e98498abf345b2f3e1cec488230231a pre_configure() { ./autogen.sh } post_install() { - vdoc "AUTHORS" - vdoc "README.markdown" + vdoc AUTHORS + vdoc README.markdown } libsearpc-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision} ${makedepends}" pkg_install() { - vmove "usr/include" + vmove usr/include vmove "usr/lib/*.so" - vmove "usr/lib/pkgconfig" + vmove usr/lib/pkgconfig } } @@ -39,8 +38,8 @@ libsearpc-codegen_package() { depends="python" noarch=yes pkg_install() { - vdoc "AUTHORS" - vdoc "README.markdown" - vmove "usr/bin/searpc-codegen.py" + vdoc AUTHORS + vdoc README.markdown + vmove usr/bin/searpc-codegen.py } } diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template index f415dfff6d5..86f08107ebd 100644 --- a/srcpkgs/libwaylandpp/template +++ b/srcpkgs/libwaylandpp/template @@ -1,7 +1,7 @@ # Template file for 'libwaylandpp' pkgname=libwaylandpp version=0.2.3 -revision=1 +revision=2 wrksrc="waylandpp-${version}" configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE -DBUILD_DOCUMENTATION=TRUE -DBUILD_EXAMPLES=TRUE @@ -42,7 +42,7 @@ wayland-scanner++_package() { } libwaylandpp-devel_package() { - depends="libwaylandpp>=${version}_${revision}" + depends="libwaylandpp>=${version}_${revision} wayland-devel" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch b/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch new file mode 100644 index 00000000000..fcb029f420d --- /dev/null +++ b/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch @@ -0,0 +1,28 @@ +--- src/player.c ++++ src/player.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + #include + +@@ -132,8 +133,14 @@ + } + } + +-/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); +- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); ++ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) ++ { ++ API->err = wmf_E_InsMem; ++ WMF_DEBUG (API,"bailing..."); ++ return (API->err); ++ } ++ ++ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); + + if (ERR (API)) + { WMF_DEBUG (API,"bailing..."); + diff --git a/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch b/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch new file mode 100644 index 00000000000..3066f8ab175 --- /dev/null +++ b/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch @@ -0,0 +1,11 @@ +--- src/font.c ++++ src/font.c +@@ -422,7 +422,6 @@ + + fontmap_data->FD.FI = 0; + +- if (API->flags & WMF_OPT_SYS_FONTS) + { if (API->flags & WMF_OPT_SYS_FONTMAP) + { wmf_ipa_font_map_xml (API,&(fontmap_data->FD),options->sys_fontmap_file); + } + diff --git a/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch b/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch new file mode 100644 index 00000000000..01f9a787b30 --- /dev/null +++ b/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch @@ -0,0 +1,11 @@ +--- src/font.c ++++ src/font.c +@@ -199,7 +199,7 @@ + unsigned int i = 0; + + while (font_data->cache[i].name) +- { if (strcmp (font_data->cache[i].path,entry->path) == 0) break; ++ { if (strcmp (font_data->cache[i].name,entry->name) == 0) break; + i++; + } + diff --git a/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch b/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch new file mode 100644 index 00000000000..01f0dd2795c --- /dev/null +++ b/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch @@ -0,0 +1,11 @@ +--- src/extra/gd/gd_clip.c ++++ src/extra/gd/gd_clip.c +@@ -70,6 +70,7 @@ + { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); + if (more == 0) return; + im->clip->max += 8; ++ im->clip->list = more; + } + im->clip->list[im->clip->count] = (*rect); + im->clip->count++; + diff --git a/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch b/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch new file mode 100644 index 00000000000..26b44ef76cb --- /dev/null +++ b/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch @@ -0,0 +1,186 @@ +--- src/player/meta.h ++++ src/player/meta.h +@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -2593,9 +2593,10 @@ static int meta_dc_restore (wmfAPI* API, + polyrect.BR = 0; + + polyrect.count = 0; ++ ++ if (FR->region_clip) FR->region_clip (API,&polyrect); + } + +- if (FR->region_clip) FR->region_clip (API,&polyrect); + + return (changed); + } +@@ -3067,7 +3068,7 @@ static int meta_pen_create (wmfAPI* API, + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3181,7 +3182,7 @@ static int meta_brush_create (wmfAPI* AP + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3288,7 +3289,7 @@ static int meta_font_create (wmfAPI* API + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3396,7 +3397,7 @@ static int meta_palette_create (wmfAPI* + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +--- src/ipa/ipa.h ++++ src/ipa/ipa.h +@@ -48,7 +48,7 @@ static int ReadBlobByte (BMPS + static unsigned short ReadBlobLSBShort (BMPSource*); + static unsigned long ReadBlobLSBLong (BMPSource*); + static long TellBlob (BMPSource*); +-static void DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); ++static int DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); + static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); + static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); + static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); +--- src/ipa/ipa/bmp.h ++++ src/ipa/ipa/bmp.h +@@ -859,7 +859,7 @@ static long TellBlob (BMPSource* src) + % + % + */ +-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) ++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) + { int byte; + int count; + int i; +@@ -870,12 +870,14 @@ static void DecodeImage (wmfAPI* API,wmf + U32 u; + + unsigned char* q; ++ unsigned char* end; + + for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0; + + byte = 0; + x = 0; + q = pixels; ++ end = pixels + bmp->width * bmp->height; + + for (y = 0; y < bmp->height; ) + { count = ReadBlobByte (src); +@@ -884,7 +886,10 @@ static void DecodeImage (wmfAPI* API,wmf + { /* Encoded mode. */ + byte = ReadBlobByte (src); + for (i = 0; i < count; i++) +- { if (compression == 1) ++ { ++ if (q == end) ++ return 0; ++ if (compression == 1) + { (*(q++)) = (unsigned char) byte; + } + else +@@ -896,13 +901,15 @@ static void DecodeImage (wmfAPI* API,wmf + else + { /* Escape mode. */ + count = ReadBlobByte (src); +- if (count == 0x01) return; ++ if (count == 0x01) return 1; + switch (count) + { + case 0x00: + { /* End of line. */ + x = 0; + y++; ++ if (y >= bmp->height) ++ return 0; + q = pixels + y * bmp->width; + break; + } +@@ -910,13 +917,20 @@ static void DecodeImage (wmfAPI* API,wmf + { /* Delta mode. */ + x += ReadBlobByte (src); + y += ReadBlobByte (src); ++ if (y >= bmp->height) ++ return 0; ++ if (x >= bmp->width) ++ return 0; + q = pixels + y * bmp->width + x; + break; + } + default: + { /* Absolute mode. */ + for (i = 0; i < count; i++) +- { if (compression == 1) ++ { ++ if (q == end) ++ return 0; ++ if (compression == 1) + { (*(q++)) = ReadBlobByte (src); + } + else +@@ -943,7 +957,7 @@ static void DecodeImage (wmfAPI* API,wmf + byte = ReadBlobByte (src); /* end of line */ + byte = ReadBlobByte (src); + +- return; ++ return 1; + } + + /* +@@ -1143,8 +1157,18 @@ static void ReadBMPImage (wmfAPI* API,wm + } + } + else +- { /* Convert run-length encoded raster pixels. */ +- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image); ++ { ++ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */ ++ { ++ if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image)) ++ { WMF_ERROR (API,"corrupt bmp"); ++ API->err = wmf_E_BadFormat; ++ } ++ } ++ else ++ { WMF_ERROR (API,"Unexpected pixel depth"); ++ API->err = wmf_E_BadFormat; ++ } + } + + if (ERR (API)) diff --git a/srcpkgs/libwmf/patches/CVE-2016-9011.patch b/srcpkgs/libwmf/patches/CVE-2016-9011.patch new file mode 100644 index 00000000000..5955784c2d8 --- /dev/null +++ b/srcpkgs/libwmf/patches/CVE-2016-9011.patch @@ -0,0 +1,34 @@ +--- src/player.c ++++ src/player.c +@@ -140,7 +140,30 @@ + return (API->err); + } + +- P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); ++ U32 nMaxRecordSize = (MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char); ++ if (nMaxRecordSize) ++ { ++ //before allocating memory do a sanity check on size by seeking ++ //to claimed end to see if its possible. We're constrained here ++ //by the api and existing implementations to not simply seeking ++ //to SEEK_END. So use what we have to skip to the last byte and ++ //try and read it. ++ const long nPos = WMF_TELL (API); ++ WMF_SEEK (API, nPos + nMaxRecordSize - 1); ++ if (ERR (API)) ++ { WMF_DEBUG (API,"bailing..."); ++ return (API->err); ++ } ++ int byte = WMF_READ (API); ++ if (byte == (-1)) ++ { WMF_ERROR (API,"Unexpected EOF!"); ++ API->err = wmf_E_EOF; ++ return (API->err); ++ } ++ WMF_SEEK (API, nPos); ++ } ++ ++ P->Parameters = (unsigned char*) wmf_malloc (API, nMaxRecordSize); + + if (ERR (API)) + { WMF_DEBUG (API,"bailing..."); diff --git a/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch b/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch new file mode 100644 index 00000000000..4b67ceaa8fd --- /dev/null +++ b/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch @@ -0,0 +1,15 @@ +Source: Debian https://sources.debian.org/src/libwmf/0.2.8.4-12/debian/patches/05_gdk-pixbuf-loader-dir.patch/ +Upstream: Unknown +Reason: Install gdk-pixbuf-loader into correct location + +--- configure.ac ++++ configure.ac +@@ -745,7 +745,7 @@ GDK_PIXBUF_DIR="" + if test $LIBWMF_BUILDSTYLE != lite; then + PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ + GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" ++ GDK_PIXBUF_DIR="gdk-pixbuf-2.0/$GTK_VERSION/loaders" + wmf_gdk_pixbuf=yes + ],[ wmf_gdk_pixbuf=no + ]) diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template index a13ed8b7517..ed051d5e3ef 100644 --- a/srcpkgs/libwmf/template +++ b/srcpkgs/libwmf/template @@ -1,21 +1,20 @@ -# Template build file for 'libwmf'. +# Template file for 'libwmf' pkgname=libwmf version=0.2.8.4 -revision=17 +revision=18 build_style=gnu-configure configure_args="--with-gsfontdir=/usr/share/fonts/Type1 ---with-fontdir=/usr/share/fonts/Type1 --disable-static ---with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS" + --with-fontdir=/usr/share/fonts/Type1 --disable-static + --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS" hostmakedepends="automake libtool pkg-config gsfonts freetype-devel" makedepends="zlib-devel freetype-devel libjpeg-turbo-devel libpng-devel expat-devel glib-devel gtk+-devel gd-devel gsfonts" depends="gsfonts" -triggers="gtk-pixbuf-loaders" short_desc="Library for reading and converting WMF (Windows Meta Files)" maintainer="Juan RP " homepage="http://wvware.sourceforge.net/libwmf.html" license="LGPL-2.1" -distfiles="${SOURCEFORGE_SITE}/wvware/$pkgname-$version.tar.gz" +distfiles="${SOURCEFORGE_SITE}/wvware/${pkgname}-${version}.tar.gz" checksum=5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 pre_configure() { diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template index efbdabd53d7..691dc956863 100644 --- a/srcpkgs/licensechecker/template +++ b/srcpkgs/licensechecker/template @@ -1,7 +1,7 @@ # Template file for 'licensechecker' pkgname=licensechecker version=1.3.1 -revision=3 +revision=4 wrksrc="lc-${version}" build_style=go go_import_path="github.com/boyter/lc" diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index b21f9788c52..18589e8429c 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,6 +1,6 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.63 +version=4.14.66 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=cd2e52f0e7ba861afa91cf487b2f45e5174115870f256a1d65996647b7bcc6d3 +checksum=a38061ca4c864d11a72beb3dc5918a99f13372fe9ee35508d004fdfabd460413 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.17/template b/srcpkgs/linux4.17/template index 866dd32ee1e..2c4bac694a4 100644 --- a/srcpkgs/linux4.17/template +++ b/srcpkgs/linux4.17/template @@ -1,6 +1,6 @@ # Template file for 'linux4.17' pkgname=linux4.17 -version=4.17.16 +version=4.17.18 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=2ff039eaf28b52b0644f4ff4da64c48c4b551841c00f16db213e45858463a1b5 +checksum=4d8b5e3772771b60c9c6d875af8e59fbcd34d4291827c110501611da09b79b0f nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.18/template b/srcpkgs/linux4.18/template index 64b3b3e2adf..33a7425d32c 100644 --- a/srcpkgs/linux4.18/template +++ b/srcpkgs/linux4.18/template @@ -1,6 +1,6 @@ # Template file for 'linux4.18' pkgname=linux4.18 -version=4.18.2 +version=4.18.5 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ maintainer="cr6git " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=d56082dd9d895c32ab5d898096abb3e7f5525bb0a603e5c3be9f83921484eda5 +checksum=fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index 13b087f35c8..a0418fb7c12 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,6 +1,6 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.145 +version=4.4.152 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -8,7 +8,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=ce9d0dbe2c8b5d8fc1c9f477c8459f57049fd8599ee57c5d6e36f8b042035dd5 +checksum=1bee76891686a03e3129e84a9b17f2a3c659481bfccdbb4a37e7abc5c8f1d3cb nocross=yes nodebug=yes @@ -21,9 +21,10 @@ export CCACHE_DISABLE=1 only_for_archs="i686 i686-musl x86_64 x86_64-musl armv7l armv7l-musl aarch64 aarch64-musl" hostmakedepends="bc perl kmod uboot-mkimage libressl-devel" -triggers="kernel-hooks" +triggers="kernel-hooks" _kernver="${version}_${revision}" + # These files could be modified when an external module is built. mutable_files=" /usr/lib/modules/${_kernver}/modules.builtin.bin @@ -46,9 +47,9 @@ do_configure() { i686*) arch=i386;; x86_64*) arch=x86_64;; armv7*) arch=arm - $XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x15/patch-${version}-armv7-x15.diff.gz - gunzip patch-${version}-armv7-x15.diff.gz - patch -Np1 -i patch-${version}-armv7-x15.diff + $XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x16/patch-${version}-armv7-x16.diff.gz + gunzip patch-${version}-armv7-x16.diff.gz + patch -Np1 -i patch-${version}-armv7-x16.diff ;; aarch64*) arch=arm64;; esac diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 1a7c452842a..b22ac32d650 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.119 +version=4.9.124 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=49e17f01a1a607b4b1ab28dc7177e103943151866c3956fd83edc8a4aae60b35 +checksum=5ca6b0d48c8dd1265005169f1b97149a4e893668c0d8aa566a73c7663c8e4311 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/log4cplus/template b/srcpkgs/log4cplus/template index e0664c37d30..704a80af792 100644 --- a/srcpkgs/log4cplus/template +++ b/srcpkgs/log4cplus/template @@ -1,7 +1,7 @@ # Template file for 'log4cplus' pkgname=log4cplus -version=2.0.1 -revision=2 +version=2.0.2 +revision=1 build_style=gnu-configure configure_args="--with-working-locale" short_desc="C++ logger very close to Java's log4j" @@ -10,7 +10,7 @@ license="Apache-2.0" homepage="https://github.com/log4cplus/log4cplus" #changelog="https://raw.githubusercontent.com/log4cplus/log4cplus/master/ChangeLog" distfiles="https://github.com/log4cplus/log4cplus/releases/download/REL_${version//./_}/log4cplus-${version}.tar.xz" -checksum=813580059fd91260376e411b3e09c740aa86dedc5f6a0bd975b9b39d5c4370e6 +checksum=8ff4055be749f17f3648694bd5778bfd86d33158cceaa616a50c0299d6035b41 # Reduce log spamming for deprecated auto_ptr # CXXFLAGS="-Wno-deprecated-declarations" diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template index 634bc5b31ac..6981b74cba3 100644 --- a/srcpkgs/lsp/template +++ b/srcpkgs/lsp/template @@ -1,7 +1,7 @@ # Template file for 'lsp' pkgname=lsp version=0.2.0 -revision=8 +revision=9 build_style=go go_import_path="github.com/dborzov/lsp" hostmakedepends="git" diff --git a/srcpkgs/lttng-modules-dkms/template b/srcpkgs/lttng-modules-dkms/template index e4ec0acca31..e8756df7c91 100644 --- a/srcpkgs/lttng-modules-dkms/template +++ b/srcpkgs/lttng-modules-dkms/template @@ -10,7 +10,6 @@ homepage="https://lttng.org" distfiles="${homepage}/files/lttng-modules/lttng-modules-${version}.tar.bz2" checksum=f049428d3d131e103a7a7038d184731bf7bcdce00503fc19a2c9b5693ecbb3b5 -triggers="dkms" dkms_modules="lttng-modules ${version}" depends="dkms" diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template index 6277d6712ce..fee58442f4f 100644 --- a/srcpkgs/lttng-ust/template +++ b/srcpkgs/lttng-ust/template @@ -1,15 +1,16 @@ -# template file for 'lttng-ust' +# Template file for 'lttng-ust' pkgname=lttng-ust -version=2.10.1 -revision=3 +version=2.10.2 +revision=1 build_style=gnu-configure +makedepends="liburcu-devel" short_desc="Low-overhead tracing capabilities for userspace" maintainer="Simon Thoby " -license="LGPL-2.1" +license="LGPL-2.1-only" homepage="http://lttng.org" +changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog" distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=07cc3c0b71e7b77f1913d5b7f340a78a9af414440e4662712aef2d635b88ee9d -makedepends="liburcu-devel" +checksum=c4ca22b904eb08817b313a73d499e1b217ffee1f862156d0d52865317486c045 lttng-ust-devel_package() { depends="${sourcepkg}>=${version}_${revision} liburcu-devel" diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template index 0bb309b5db3..6afc9d33db3 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,9 +1,10 @@ +broken="failing to compile with go-1.11" # Template file for 'lxd' pkgname=lxd version=3.2 -revision=1 +revision=2 build_style=go -go_import_path="github.com/lxc/lxd" +go_import_path=github.com/lxc/lxd go_package="${go_import_path}/lxd ${go_import_path}/lxc" hostmakedepends="git bzr pkg-config" makedepends="lxc-devel acl-devel" diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template new file mode 100644 index 00000000000..554efb0c411 --- /dev/null +++ b/srcpkgs/madonctl/template @@ -0,0 +1,17 @@ +# Template file for 'madonctl' +pkgname=madonctl +version=2.3.1 +revision=2 +build_style=go +go_import_path=github.com/McKael/madonctl +hostmakedepends="git" +short_desc="CLI client for the Mastodon social network API" +maintainer="travankor " +license="MIT" +homepage="https://github.com/McKael/madonctl" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=f97707a4f96b15a8331a0b3725a43c7717bf068bf9e6c5e885a13dd3016d5cf6 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/marvin/template b/srcpkgs/marvin/template index 7009546b88f..6592bdfabf4 100644 --- a/srcpkgs/marvin/template +++ b/srcpkgs/marvin/template @@ -1,6 +1,6 @@ # Template for Marvin pkgname=marvin -version=18.19.0 +version=18.20.0 revision=1 noarch=yes maintainer="Brenton Horne " @@ -14,7 +14,7 @@ restricted=yes nostrip=yes _filename="marvin_linux_${version%.*}.deb" distfiles="https://dl.chemaxon.com/marvin/${version}/${_filename}" -checksum=f498405166821e6f2f8e75b1357c10fca9b1834cca5ca14d56c7921ed4fb5bcf +checksum=bbb25cbd8307f1f081136397c9f82be114426b96f973b8079980c46e6d62aadc do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template index 5a418d0c109..db3941c7170 100644 --- a/srcpkgs/massren/template +++ b/srcpkgs/massren/template @@ -1,7 +1,7 @@ # Template file for 'massren' pkgname=massren version=1.5.4 -revision=6 +revision=7 build_style=go hostmakedepends="git" short_desc="Massive renamer from command line" diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template index e440ac528b7..6c1cc4b5fc9 100644 --- a/srcpkgs/master-pdf-editor/template +++ b/srcpkgs/master-pdf-editor/template @@ -1,6 +1,6 @@ # Template file for 'master-pdf-editor' pkgname=master-pdf-editor -version=5.0.36 +version=5.1.12 revision=1 wrksrc="${pkgname}-5" only_for_archs="x86_64" @@ -12,7 +12,7 @@ maintainer="Giuseppe Fierro " license="Proprietary" homepage="https://code-industry.net/free-pdf-editor/" distfiles="https://code-industry.net/public/${pkgname}-${version}_qt5.amd64.tar.gz" -checksum=826cc4c6a307fa04f1efc70891c5d28e6094db8418d06e4f1484d9cacb88ffc9 +checksum=1892412e6ec0767a2b6c4571b41c7bf192b48c16443f332abc06486a616e77c4 do_install() { vlicense license.txt diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template index 5119991a1c0..3d0b2a2a73b 100644 --- a/srcpkgs/mdBook/template +++ b/srcpkgs/mdBook/template @@ -1,6 +1,6 @@ # Template file for 'mdBook' pkgname=mdBook -version=0.2.0 +version=0.2.1 revision=1 hostmakedepends="cargo" short_desc="Create book from markdown files. Like Gitbook but implemented in Rust" @@ -8,7 +8,7 @@ maintainer="Huidong Hwang " license="MPL-2.0" homepage="https://github.com/rust-lang-nursery/${pkgname}" distfiles="https://github.com/rust-lang-nursery/${pkgname}/archive/v${version}.tar.gz" -checksum=eefb437f9fc3961edeb54f0f3fbea05390472fa362d6cf641556e91a96a25780 +checksum=2d3d57120a082d973fded27ac1e9fb36078a1e24692ceebb887a11567552642d nocross="This cannot be cross compiled due to limitations in cargo." do_build() { diff --git a/srcpkgs/media-player-info/template b/srcpkgs/media-player-info/template index 0febbafee46..7557f0070d1 100644 --- a/srcpkgs/media-player-info/template +++ b/srcpkgs/media-player-info/template @@ -1,17 +1,18 @@ # Template file for 'media-player-info' pkgname=media-player-info -version=23 +version=24 revision=1 noarch=yes build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="eudev-libudev-devel" -homepage="http://cgit.freedesktop.org/$pkgname/" short_desc="Data files describing media player capabilities, for post-HAL systems" +license="BSD-3-Clause" maintainer="Juan RP " -license="BSD" -distfiles="${FREEDESKTOP_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=a9ab6de0b497f6e13efc2cbe45a4fe06982145d786674c24274c3ed909ecc8cb +homepage="https://www.freedesktop.org/wiki/Software/media-player-info/" +changelog="https://cgit.freedesktop.org/media-player-info/plain/NEWS" +distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=e6cf46db0b503e9929407ec6aa3fcd2becc9e2ca945b4ff787c98c8db63a1134 post_install() { vlicense COPYING diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template index 050b5eaa404..ecbf47a306d 100644 --- a/srcpkgs/mediainfo/template +++ b/srcpkgs/mediainfo/template @@ -1,7 +1,7 @@ # Template file for 'mediainfo' pkgname=mediainfo version=18.05 -revision=2 +revision=3 wrksrc="MediaInfo" hostmakedepends="automake libtool pkg-config" makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-devel)" diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template index 27bcbd603cf..62510750c73 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -1,7 +1,7 @@ # Template file for 'micro' pkgname=micro version=1.4.0 -revision=4 +revision=5 # This will need to be updated along with version as it cannot currently be # obtained from git before fetching, and is necessary if the user is to make # error reports upsteam. diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template index fc22d7dd495..1cb52a9a1cc 100644 --- a/srcpkgs/microhookd/template +++ b/srcpkgs/microhookd/template @@ -1,7 +1,7 @@ # Template file for 'microhookd' pkgname=microhookd version=0.0.1 -revision=3 +revision=4 build_style=go go_import_path=github.com/the-maldridge/microhookd short_desc="Simplest possible webhook daemon" diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template index cbbd81ea6bd..1ae7006aad4 100644 --- a/srcpkgs/miniflux/template +++ b/srcpkgs/miniflux/template @@ -1,7 +1,7 @@ # Template file for 'miniflux' pkgname=miniflux version=2.0.10 -revision=1 +revision=2 build_style=go go_import_path="github.com/miniflux/miniflux" system_accounts="${pkgname}" diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 96416b369c0..d3a56e27392 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,7 +1,7 @@ # Template file for 'minify' pkgname=minify version=2.3.5 -revision=1 +revision=2 build_style=go go_import_path="github.com/tdewolff/minify" go_package="github.com/tdewolff/minify/cmd/minify" diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index 4a50478b408..a77a8bdd884 100644 --- a/srcpkgs/minikube/template +++ b/srcpkgs/minikube/template @@ -1,7 +1,7 @@ # Template file for 'minikube' pkgname=minikube version=0.28.1 -revision=1 +revision=2 only_for_archs="x86_64 x86_64-musl" build_style=go hostmakedepends="git go-bindata python pkg-config" diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index f94eed0eba2..0e0ac0defb4 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -1,8 +1,8 @@ # Template file for 'minio' pkgname=minio -version=2018.08.02 +version=2018.08.25 revision=1 -_version="${version//./-}T23-11-36Z" +_version="${version//./-}T01-56-38Z" wrksrc=${pkgname}-RELEASE.${_version} build_style=go hostmakedepends="git" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://github.com/minio/minio" go_import_path="github.com/minio/minio" distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz" -checksum=bd73aa0652c746b36faf72d0d9d5770a666e7b6611f779dcb3d73f4826e242f5 +checksum=8c4a985edb8e315e50275296528d3bd14cb4b970494f90e8a0b519cad2b5a741 system_accounts="_minio" _minio_homedir="/var/lib/minio" _minio_descr="Minio Daemon User" diff --git a/srcpkgs/mirrorbits/template b/srcpkgs/mirrorbits/template index 07a40fe2494..886d6d76121 100644 --- a/srcpkgs/mirrorbits/template +++ b/srcpkgs/mirrorbits/template @@ -1,7 +1,7 @@ # Template file for 'mirrorbits' pkgname=mirrorbits version=0.4 -revision=1 +revision=2 build_style=go go_import_path="github.com/etix/mirrorbits" # from Makefile diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index fb9497d1e08..f57a8d89fc7 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,12 +1,12 @@ # Template file for 'mixxx' pkgname=mixxx -version=2.1.1 -revision=4 +version=2.1.3 +revision=1 wrksrc="mixxx-release-${version}" hostmakedepends="pkg-config scons" makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel - opus-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel + opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel vamp-plugin-sdk-devel" depends="qt5-plugin-sqlite" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.mixxx.org" distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" -checksum=f92f8d9fd34b2b2e7e71dd8c7fd2ce0911180bbbd28407906afeab4db9195236 +checksum=1eded6750b1b1c83e5a9375fb24e4e9b99433a3954e2b6912dc41a6141fb08c7 _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio diff --git a/srcpkgs/mongo-tools/template b/srcpkgs/mongo-tools/template index e4b817b9151..5c81ca8234a 100644 --- a/srcpkgs/mongo-tools/template +++ b/srcpkgs/mongo-tools/template @@ -1,7 +1,7 @@ # Template file for 'mongo-tools' pkgname=mongo-tools version=3.5.13 -revision=8 +revision=9 wrksrc="${pkgname}-r${version}" build_style=go go_import_path="github.com/mongodb/mongo-tools" diff --git a/srcpkgs/monocypher/template b/srcpkgs/monocypher/template index 66572f95364..d78ef9f89de 100644 --- a/srcpkgs/monocypher/template +++ b/srcpkgs/monocypher/template @@ -1,6 +1,6 @@ # Template file for 'monocypher' pkgname=monocypher -version=2.0.4 +version=2.0.5 revision=1 build_style=gnu-makefile short_desc="Easy to use crypto library inspired by libsodium and TweetNaCl" @@ -8,7 +8,7 @@ maintainer="cr6git " license="BSD-2-Clause" homepage="https://monocypher.org" distfiles="https://monocypher.org/download/monocypher-${version}.tar.gz" -checksum=a1e820c30abcc351dba5709ebf80a35a10c3cc97ffea0b0ece2a5834d2f88165 +checksum=4fc0496ee89c5a1f00e9fd4a87051137561cdbb6f1aeafd1cbf11a87288bca5b post_install() { vlicense LICENCE.md diff --git a/srcpkgs/msgpack/template b/srcpkgs/msgpack/template index 2d46a14c3bd..5ccb09cef11 100644 --- a/srcpkgs/msgpack/template +++ b/srcpkgs/msgpack/template @@ -1,8 +1,8 @@ # Template file for 'msgpack' pkgname=msgpack -version=3.0.1 +version=3.1.0 revision=1 -wrksrc="msgpack-${version}" +wrksrc="msgpack-c-cpp-${version}" build_style=cmake makedepends="zlib-devel" checkdepends="gtest-devel" @@ -10,9 +10,9 @@ short_desc="Binary-based efficient object serialization library" maintainer="maxice8 " license="Apache-2.0" homepage="https://msgpack.org/" -#changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md" -distfiles="https://github.com/msgpack/msgpack-c/releases/download/cpp-${version}/msgpack-${version}.tar.gz" -checksum=9859d44d336f9b023a79a3026bb6a558b2ea346107ab4eadba58236048650690 +changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md" +distfiles="https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz" +checksum=6d451d2ad6ffcd5073f56765a3a96a103a92cb148ab49f2f2e5d8db3d6676a54 msgpack-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 29bc198736b..237675cd4bc 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,7 +1,7 @@ # Template file for 'mutter' pkgname=mutter version=3.28.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --enable-egl-device" hostmakedepends="glib-devel gobject-introspection pkg-config zenity" diff --git a/srcpkgs/ncdns/template b/srcpkgs/ncdns/template index c0f3ec0cdbd..e87595486b8 100644 --- a/srcpkgs/ncdns/template +++ b/srcpkgs/ncdns/template @@ -1,7 +1,7 @@ # Template file for 'ncdns' pkgname=ncdns version=0.0.2 -revision=11 +revision=12 build_style=go hostmakedepends="git" makedepends="libcap-devel" diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template index 35c6b892137..ea481f891a7 100644 --- a/srcpkgs/neovim-qt/template +++ b/srcpkgs/neovim-qt/template @@ -1,6 +1,6 @@ # Template file for 'neovim-qt' pkgname=neovim-qt -version=0.2.9 +version=0.2.10 revision=1 build_style=cmake makedepends="qt5-devel neovim" @@ -10,7 +10,7 @@ maintainer="Dominic Monroe " license="ISC" homepage="https://github.com/equalsraf/neovim-qt" distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz" -checksum=0142a75f39a5fc19a7198673600d2612ef970bf59a02157b3a639a1d58bee008 +checksum=42e3205f3fa9924e4970aed8ff28d17d9aefeb394bb40493d37f8a0afba40c34 post_install() { vlicense LICENSE diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index 759fb37f014..2e3de8c3979 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -1,7 +1,7 @@ # Template file for 'nncp' pkgname=nncp version=3.4 -revision=1 +revision=2 build_style=go go_import_path=cypherpunks.ru/nncp short_desc="Node to Node copy, utilities for secure store-and-forward" diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template index 69178cf858c..9137f14b8e2 100644 --- a/srcpkgs/node_exporter/template +++ b/srcpkgs/node_exporter/template @@ -1,7 +1,7 @@ # Template file for 'node_exporter' pkgname=node_exporter version=0.16.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/prometheus/node_exporter" go_ldflags="-X ${go_import_path}/version.Version=${version} diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template index 179f1d13e79..4e296fc839e 100644 --- a/srcpkgs/nomad/template +++ b/srcpkgs/nomad/template @@ -1,7 +1,7 @@ # Template file for 'nomad' pkgname=nomad version=0.8.4 -revision=1 +revision=2 build_style=go go_import_path="github.com/hashicorp/nomad" short_desc="Cluster scheduler designed to easily integrate into existing workflows" @@ -10,3 +10,5 @@ license="MPL-2.0" homepage="https://www.nomadproject.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" checksum=8dfacd578f2be1ae6cc7af6b2749952f1646344cb95bde17f35eeb78faacd616 + +broken="go-1.11/runtime.support_avx2" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 47431eb95f9..9ef3876cf84 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)" pkgname=nvidia version=390.77 -revision=1 +revision=2 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -236,6 +236,14 @@ do_install() { sed -e "s/__PKGVER/${version}/g" \ -e "s/__MAKEJOBS/-j$(nproc)/g" \ -i ${DESTDIR}/usr/src/nvidia-${version}/dkms.conf + if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then + # nvidia no longer builds "uvm" submodule for 32-bit + # Remove 2 lines for "nvidia-uvm" and repair consecutive enumeration following. + sed -e '/nvidia-uvm/,+1d' \ + -e 's/\[2\]/[1]/g' \ + -e 's/\[3\]/[2]/g' \ + -i ${DESTDIR}/usr/src/nvidia-${version}/dkms.conf + fi # Blacklist nouveau vmkdir usr/lib/modprobe.d @@ -266,7 +274,6 @@ nvidia-libs_package() { } nvidia-dkms_package() { short_desc="${_desc} - DKMS kernel module" - triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" pkg_install() { diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index 2500f590108..0e952ba62cb 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -9,7 +9,7 @@ license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" nopie=yes -repository="nonfree" +repository=nonfree create_wrksrc=yes only_for_archs="i686 x86_64" short_desc="${_desc} - Libraries and Utilities" @@ -81,7 +81,7 @@ do_install() { # CUDA vbin nvidia-cuda-proxy-control vbin nvidia-cuda-proxy-server - vinstall nvidia-cuda-proxy-control.1.gz 644 usr/share/man/man1 + vman nvidia-cuda-proxy-control.1.gz vinstall libcuda.so.${version} 755 usr/lib ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so @@ -93,11 +93,11 @@ do_install() { # nvidia-xconfig vbin nvidia-xconfig - vinstall nvidia-xconfig.1.gz 644 usr/share/man/man1 + vman nvidia-xconfig.1.gz # nvidia-settings vbin nvidia-settings - vinstall nvidia-settings.1.gz 644 usr/share/man/man1 + vman nvidia-settings.1.gz vinstall nvidia-settings.desktop 644 usr/share/applications vinstall nvidia-settings.png 644 usr/share/pixmaps sed -e 's:__UTILS_PATH__:/usr/bin:' \ @@ -110,7 +110,7 @@ do_install() { # nvidia-smi vbin nvidia-smi - vinstall nvidia-smi.1.gz 644 usr/share/man/man1 + vman nvidia-smi.1.gz # License and documentation. vlicense LICENSE @@ -155,7 +155,6 @@ do_install() { nvidia304-dkms_package() { short_desc="${_desc} - DKMS kernel module" depends="dkms" - triggers="dkms" dkms_modules="nvidia ${version}" provides="nvidia-dkms-${version}_${revision}" replaces="nvidia-dkms>=0" diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index 1456ed4f38d..36407215494 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -1,4 +1,4 @@ -# Template file for 'nvidia' +# Template file for 'nvidia340' _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" @@ -11,7 +11,7 @@ homepage="http://www.nvidia.com" only_for_archs="i686 x86_64" nopie=yes -repository="nonfree" +repository=nonfree create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" depends="${pkgname}-dkms-${version}_${revision} pkg-config" @@ -95,8 +95,7 @@ do_install() { # CUDA vbin nvidia-cuda-mps-control vbin nvidia-cuda-mps-server - gzip -d nvidia-cuda-mps-control.1.gz - vman nvidia-cuda-mps-control.1 + vman nvidia-cuda-mps-control.1.gz vinstall libcuda.so.${version} 755 usr/lib ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so @@ -108,13 +107,11 @@ do_install() { # nvidia-xconfig vbin nvidia-xconfig - gzip -d nvidia-xconfig.1.gz - vman nvidia-xconfig.1 + vman nvidia-xconfig.1.gz # nvidia-settings vbin nvidia-settings - gzip -d nvidia-settings.1.gz - vman nvidia-settings.1 + vman nvidia-settings.1.gz vinstall nvidia-settings.desktop 644 usr/share/applications vinstall nvidia-settings.png 644 usr/share/pixmaps sed -e 's:__UTILS_PATH__:/usr/bin:' \ @@ -127,8 +124,7 @@ do_install() { # nvidia-smi vbin nvidia-smi - gzip -d nvidia-smi.1.gz - vman nvidia-smi.1 + vman nvidia-smi.1.gz # License and documentation. vlicense LICENSE @@ -179,7 +175,6 @@ do_install() { nvidia340-dkms_package() { short_desc="${_desc} - DKMS kernel module" - triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" provides="nvidia-dkms-${version}_${revision}" diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 8d51676a84d..d477ce8d4c8 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,7 +1,7 @@ # Template file for 'obs' pkgname=obs -version=21.1.2 -revision=2 +version=22.0.1 +revision=1 wrksrc=obs-studio-${version} only_for_archs="i686 x86_64 i686-musl x86_64-musl" build_style=cmake @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://obsproject.com" changelog="https://github.com/obsproject/obs-studio/releases" distfiles="https://github.com/jp9000/obs-studio/archive/${version}.tar.gz" -checksum=d6eb32d4ff65879945fc19a639b3ae14a55e6034a45b036e00e5f3dbce0e3d4d +checksum=6b1248623f6c0ca6f196769445491d27dd0230c88f03e6472a219ee0fa9b1afb obs-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 2d15fb375ba..d87178c8d3c 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,10 +1,9 @@ # Template file for 'octave' pkgname=octave -version=4.4.0 +version=4.4.1 revision=4 build_style=gnu-configure -configure_args=" --with-blas=openblas --with-lapack=openblas - $(vopt_if largearrays --enable-64)" +configure_args=" --with-blas=openblas --with-lapack=openblas" hostmakedepends="perl gcc-fortran pkg-config gnuplot" makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel lcms2-devel glpk-devel" @@ -14,7 +13,7 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later" homepage="https://gnu.org/software/octave/" distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz" -checksum=72f846379fcec7e813d46adcbacd069d72c4f4d8f6003bcd92c3513aafcd6e96 +checksum=09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97 # Package build options # TODO: some options are still missing, such as @@ -28,7 +27,6 @@ build_options=" gui hdf5 imagemagick - largearrays opengl openmp qhull @@ -45,7 +43,6 @@ desc_option_gui="Graphical User Interface." desc_option_graphicsmagick="Provides 'imread' and 'imwrite' functions." desc_option_hdf5="Support for HDF data files." desc_option_imagemagick="Provides 'imread' and 'imwrite' functions." -desc_option_largearrays="Enable large array (64bit pointers)." #req. 64bit BLAS desc_option_qhull="Provides 'convhull{,n}', 'delaunay{,n}' and 'voronoi{,n}' functions." desc_option_openmp="Enable support for OpenMP SMP multi-threading" desc_option_zlib="Support for compressed data." diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template index a1cd505f3ae..c3d04d5ff9a 100644 --- a/srcpkgs/openbabel/template +++ b/srcpkgs/openbabel/template @@ -1,7 +1,7 @@ # Template file for 'openbabel' pkgname=openbabel version=2.4.1 -revision=4 +revision=5 _ver=${version//./-} wrksrc=${pkgname}-${pkgname}-${_ver} build_style=cmake diff --git a/srcpkgs/openblas/patches/init.patch b/srcpkgs/openblas/patches/init.patch new file mode 100644 index 00000000000..172cc34add9 --- /dev/null +++ b/srcpkgs/openblas/patches/init.patch @@ -0,0 +1,60 @@ +--- driver/others/init.c.orig ++++ driver/others/init.c +@@ -857,56 +857,13 @@ + common -> shmid = pshmid; + + if (common -> magic != SH_MAGIC) { +- cpu_set_t *cpusetp; +- int nums; +- int ret; +- + #ifdef DEBUG + fprintf(stderr, "Shared Memory Initialization.\n"); + #endif + + //returns the number of processors which are currently online + +- nums = sysconf(_SC_NPROCESSORS_CONF); +- +-#if !defined(__GLIBC_PREREQ) +- common->num_procs = nums; +-#else +- +-#if !__GLIBC_PREREQ(2, 3) +- common->num_procs = nums; +-#elif __GLIBC_PREREQ(2, 7) +- cpusetp = CPU_ALLOC(nums); +- if (cpusetp == NULL) { +- common->num_procs = nums; +- } else { +- size_t size; +- size = CPU_ALLOC_SIZE(nums); +- ret = sched_getaffinity(0,size,cpusetp); +- if (ret!=0) +- common->num_procs = nums; +- else +- common->num_procs = CPU_COUNT_S(size,cpusetp); +- } +- CPU_FREE(cpusetp); +-#else +- ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); +- if (ret!=0) { +- common->num_procs = nums; +- } else { +-#if !__GLIBC_PREREQ(2, 6) +- int i; +- int n = 0; +- for (i=0;inum_procs = n; +- } +-#else +- common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp); +- } +-#endif +- +-#endif ++ common -> num_procs = sysconf(_SC_NPROCESSORS_CONF); + #endif + if(common -> num_procs > MAX_CPUS) { + fprintf(stderr, "\nOpenBLAS Warning : The number of CPU/Cores(%d) is beyond the limit(%d). Terminated.\n", common->num_procs, MAX_CPUS); diff --git a/srcpkgs/openblas/patches/v0.2.20-memory.patch b/srcpkgs/openblas/patches/memory.patch similarity index 55% rename from srcpkgs/openblas/patches/v0.2.20-memory.patch rename to srcpkgs/openblas/patches/memory.patch index 8c73a039ebd..3b0173bf698 100644 --- a/srcpkgs/openblas/patches/v0.2.20-memory.patch +++ b/srcpkgs/openblas/patches/memory.patch @@ -1,41 +1,50 @@ ---- driver/others/memory.c.orig 2017-07-30 17:33:01.590217775 +0200 -+++ driver/others/memory.c 2017-07-30 17:07:26.933137836 +0200 -@@ -178,5 +177,0 @@ int get_num_procs(void) { +--- driver/others/memory.c.orig ++++ driver/others/memory.c +@@ -185,47 +185,8 @@ + #else + int get_num_procs(void) { + static int nums = 0; -cpu_set_t *cpusetp; -size_t size; -int ret; -int i,n; - -@@ -184,32 +178,0 @@ int i,n; + if (!nums) nums = sysconf(_SC_NPROCESSORS_CONF); -#if !defined(OS_LINUX) -- return nums; + return nums; -#endif -- +- -#if !defined(__GLIBC_PREREQ) - return nums; --#endif --#if !__GLIBC_PREREQ(2, 3) +-#else +- #if !__GLIBC_PREREQ(2, 3) - return nums; --#endif +- #endif - --#if !__GLIBC_PREREQ(2, 7) +- #if !__GLIBC_PREREQ(2, 7) - ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); - if (ret!=0) return nums; - n=0; --#if !__GLIBC_PREREQ(2, 6) +- #if !__GLIBC_PREREQ(2, 6) - for (i=0;i 0 && ret < nums) nums = ret; - CPU_FREE(cpusetp); +- return nums; +- #endif +-#endif + } + #endif + #endif diff --git a/srcpkgs/openblas/patches/v0.2.20-init.patch b/srcpkgs/openblas/patches/v0.2.20-init.patch deleted file mode 100644 index ed2806bab3b..00000000000 --- a/srcpkgs/openblas/patches/v0.2.20-init.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- driver/others/init.c.orig 2017-07-30 17:32:46.798217004 +0200 -+++ driver/others/init.c 2017-07-30 17:07:26.933137836 +0200 -@@ -781 +781 @@ void gotoblas_affinity_init(void) { --#ifndef USE_OPENMP -+#ifndef USE_OPENMP -@@ -785 +785 @@ void gotoblas_affinity_init(void) { -- -+ -@@ -829,4 +828,0 @@ void gotoblas_affinity_init(void) { -- cpu_set_t *cpusetp; -- int nums; -- int ret; -- -@@ -838,36 +834 @@ void gotoblas_affinity_init(void) { -- -- nums = sysconf(_SC_NPROCESSORS_CONF); -- --#if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 3) -- common->num_procs = nums; --#elif __GLIBC_PREREQ(2, 7) -- cpusetp = CPU_ALLOC(nums); -- if (cpusetp == NULL) { -- common->num_procs = nums; -- } else { -- size_t size; -- size = CPU_ALLOC_SIZE(nums); -- ret = sched_getaffinity(0,size,cpusetp); -- if (ret!=0) -- common->num_procs = nums; -- else -- common->num_procs = CPU_COUNT_S(size,cpusetp); -- } -- CPU_FREE(cpusetp); --#else -- ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); -- if (ret!=0) { -- common->num_procs = nums; -- } else { --#if !__GLIBC_PREREQ(2, 6) -- int i; -- int n = 0; -- for (i=0;inum_procs = n; -- } --#else -- common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp); --#endif -- --#endif -+ common -> num_procs = sysconf(_SC_NPROCESSORS_CONF);; -@@ -876 +837 @@ void gotoblas_affinity_init(void) { -- fprintf(stderr, "\nOpenBLAS Warning : The number of CPU/Cores(%d) is beyond the limit(%d). Terminated.\n", common->num_procs, MAX_CPUS); -+ fprintf(stderr, "\nOpenBLAS Warining : The number of CPU/Cores(%d) is beyond the limit(%d). Terminated.\n", common->num_procs, MAX_CPUS); -@@ -889 +850 @@ void gotoblas_affinity_init(void) { -- for(i = 0; i < common -> avail_count; i++) common -> final_num_procs += rcount(common -> avail[i]) + 1; //Make the max cpu number. -+ for(i = 0; i < common -> avail_count; i++) common -> final_num_procs += rcount(common -> avail[i]) + 1; //Make the max cpu number. diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template index e2b52bd10ac..6b6d7d0bc86 100644 --- a/srcpkgs/openblas/template +++ b/srcpkgs/openblas/template @@ -1,19 +1,18 @@ # Template file for 'openblas' pkgname=openblas -version=0.2.20 -revision=3 +version=0.3.2 +revision=1 wrksrc="OpenBLAS-${version}" build_style=gnu-makefile -make_install_args="PREFIX=/usr" make_build_args=" HOSTCC=gcc USE_OPENMP=1" hostmakedepends="perl gcc-fortran" makedepends="libgomp-devel" short_desc="Basic Linear Algebra Subprograms based on GotoBLAS2" maintainer="Julien Dehos " -homepage="http://www.openblas.net/" -license="3-clause-BSD" +homepage="https://www.openblas.net/" +license="BSD-3-Clause" distfiles="https://github.com/xianyi/${pkgname}/archive/v${version}.tar.gz" -checksum="5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394" +checksum=e8ba64f6b103c511ae13736100347deb7121ba9b41ba82052b1a018a65c0cb15 case "${XBPS_TARGET_MACHINE}" in armv5*) make_build_args+=" TARGET=ARMV5" ;; diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template index 121e481eb3c..19fe9a51eda 100644 --- a/srcpkgs/openjpeg2/template +++ b/srcpkgs/openjpeg2/template @@ -1,14 +1,14 @@ # Template file for 'openjpeg2' pkgname=openjpeg2 version=2.3.0 -revision=1 +revision=2 wrksrc="openjpeg-${version}" build_style=cmake -maintainer="Orphaned " -homepage="http://www.openjpeg.org/" -license="2-clause-BSD" -short_desc="Open-source JPEG 2000 codec written in C language (Version 2)" makedepends="libpng-devel lcms2-devel tiff-devel" +maintainer="Orphaned " +short_desc="Open-source JPEG 2000 codec written in C language (Version 2)" +homepage="http://www.openjpeg.org/" +license="BSD-2-Clause" distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz" checksum=3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a @@ -18,17 +18,18 @@ post_install() { libopenjpeg2-devel_package() { short_desc+=" - development files" - depends="libopenjpeg2>=${version}_${revision}" + depends="libopenjpeg2>=${version}_${revision} ${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/openjpeg-2.* + vmove "usr/lib/*.so" + vmove "usr/lib/openjpeg-2.*" + vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } libopenjpeg2_package() { short_desc+=" - library files" pkg_install() { - vmove usr/lib/*.so.* + vmove "usr/lib/*.so.*" } } diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template index 0edbd7ddf0b..14f2cb1a4c1 100644 --- a/srcpkgs/openrazer-meta/template +++ b/srcpkgs/openrazer-meta/template @@ -34,7 +34,6 @@ openrazer-daemon_package() { openrazer-driver-dkms_package() { short_desc="Kernel driver for Razer devices (DKMS-variant)" depends="dkms" - triggers="dkms" dkms_modules="openrazer-driver 1.0.0" system_groups="plugdev" pkg_install() { diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index de56ed1c49c..6b36b139057 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -41,7 +41,7 @@ case $XBPS_TARGET_MACHINE in esac if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then - CFLAGS+=" -Wno-format-truncation" + CFLAGS+=" -Wno-format-truncation -Wno-stringop-truncation" fi pre_configure() { diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 8e25a58c897..2d24b2bd636 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,21 +1,17 @@ # Template file for 'opera' pkgname=opera -version=54.0.2952.71 -revision=2 +version=55.0.2994.44 +revision=1 only_for_archs="x86_64" repository="nonfree" nostrip=yes -depends="ffmpeg desktop-file-utils hicolor-icon-theme libGLES" +depends="ffmpeg desktop-file-utils hicolor-icon-theme" short_desc="Fast, secure, easy to use browser" maintainer="Diogo Leal " license="Proprietary" homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=ccccec959a331713ad296bb69163844ae92ff14c498a652357058f7a374c2fa3 - -# This soname is wrong and is only available on rpi-userland, the correct one is -# libGLESv2.so.2, skip checking this and add libGLES explicitly to depends= -skiprdeps="/usr/lib/opera/libGLESv2.so" +checksum=0a671ab36088939fcafd74979f7733c6c6e94f19dc8806cd77d87b8e5a9fbd4a do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index f8dcf313e0f..eed592247c2 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -2,7 +2,7 @@ pkgname=osg reverts=3.6.0_1 version=3.4.1 -revision=5 +revision=7 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake # don't use /usr/lib64 on 64bit platforms diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index 464c9bb010b..5bdb32c1d63 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -1,7 +1,7 @@ # Template file for 'packer' pkgname=packer version=1.2.5 -revision=1 +revision=2 replaces="packer-bin>=0" short_desc="Create identical multiplatform machine images from a single source" maintainer="Andrea Brancaleoni " @@ -13,6 +13,8 @@ go_import_path="github.com/mitchellh/packer" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" checksum=86408d212a0e0b9c7a0dc93e4835a900569ad7e7bfc45cd633d7c6560f2f8d2b +broken="_build-packer-xbps/src/github.com/mitchellh/packer/commands.go:39:12: undefined: command.PushCommand" + case "$XBPS_TARGET_MACHINE" in i686*|arm*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/9375/steps/shell_3/logs/stdio";; esac diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template index e5656b43a7a..baf41b9568e 100644 --- a/srcpkgs/pam_netauth/template +++ b/srcpkgs/pam_netauth/template @@ -1,7 +1,7 @@ # Template file for 'pam_netauth' pkgname=pam_netauth version=0.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/NetAuth/pam_netauth" hostmakedepends="dep" diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index b6d6d10f3fc..dfdbeb65f34 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,19 +1,18 @@ # Template file for 'pango' pkgname=pango -version=1.42.3 +version=1.42.4 revision=1 configure_args="$(vopt_enable gir introspection) --disable-gtk-doc" build_style=gnu-configure # switch to meson when possible hostmakedepends="glib-devel help2man pkg-config $(vopt_if gir 'gobject-introspection')" makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel" -triggers="pango-modules" short_desc="Library for layout and rendering of text" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://www.pango.org/" distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fb3d875305d5143f02cde5c72fec3903e60dc35844759dc14b2df4955b5dde3a +checksum=1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d # Package build options build_options="gir" diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template index d58229cfc84..5e896792415 100644 --- a/srcpkgs/paper-icon-theme/template +++ b/srcpkgs/paper-icon-theme/template @@ -1,17 +1,13 @@ # Template file for 'paper-icon-theme' pkgname=paper-icon-theme -version=1.4.0 +version=1.5.0 revision=1 +wrksrc="${pkgname}-v.${version}" noarch=yes +build_style=meson short_desc="A modern freedesktop icon theme" -build_style=gnu-configure -maintainer="Satoshi Amemiya " -license="LGPL-3, CC-BY-SA-4.0" -hostmakedepends="autoconf automake" +maintainer="travankor " +license="CC-BY-SA-4.0" homepage="https://github.com/snwh/${pkgname}" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=b90f3a84634572bcba76cdd0c2a0d305a5c521c2054d3d390edffda5f233928b - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} +distfiles="${homepage}/archive/v.${version}.tar.gz" +checksum=62f21dfe95ece481e5c635480f32347f1ad27ea66b2ef0526fe799090b298ece diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 5bf944f030a..beeff64f501 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20180722 +version=20180822 revision=1 noarch=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/parallel/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=cf0d421cd78c58741395f94f568c33a0fe409bd5f4bd45f1ae804ec2d32dc318 +checksum=752538c4e49ae0267278fbc8b0dab8aac084e19946a521c12e4bcab6af3b5a4a pre_configure() { # no html and pdf doc diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index ad5382e4538..dcd27bf677f 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,7 +1,7 @@ # Template file for 'passwordsafe' pkgname=passwordsafe -version=1.05BETA -revision=2 +version=1.06BETA +revision=1 wrksrc="pwsafe-${version}" build_style=cmake configure_args="-DNO_GTEST=ON" @@ -14,7 +14,7 @@ maintainer="Rui Abreu Ferreira " license="Artistic-2.0" homepage="https://pwsafe.org" distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz>pwsafe-${version}.tar.gz" -checksum=5e998e439fb0f95e54b0ea78565c4ca5ec28c37fa9ba452114750d171b12fc54 +checksum=901ca5178c3254c750bdcbf13c0d2382269490b5de7be790b79f41cdd6297b2b pre_configure() { # ykpers-1 includes are hardcoded, add cross base diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template index c10b37a08f6..2dbc6dfd339 100644 --- a/srcpkgs/pcsx2/template +++ b/srcpkgs/pcsx2/template @@ -5,7 +5,7 @@ nopie=yes pkgname=pcsx2 version=1.4.0 -revision=4 +revision=5 build_style=cmake configure_args="-DGLSL_API=1 -DSDL2_API=0 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1 -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1" diff --git a/srcpkgs/pdf2htmlEX/template b/srcpkgs/pdf2htmlEX/template deleted file mode 100644 index 4595792e7ca..00000000000 --- a/srcpkgs/pdf2htmlEX/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'pdf2htmlEX' -pkgname=pdf2htmlEX -version=0.14.6 -revision=13 -build_style=cmake -hostmakedepends="pkg-config" -makedepends="poppler-devel cairo-devel fontforge-devel python-devel pango-devel libspiro-devel" -short_desc="Renders PDF files in HTML" -maintainer="Logen K " -license="GPL-3" -homepage="http://coolwanglu.github.io/pdf2htmlEX/" -distfiles="https://github.com/coolwanglu/${pkgname}/archive/v${version}.tar.gz" -checksum="320ac2e1c2ea4a2972970f52809d90073ee00a6c42ef6d9833fb48436222f0e5" - -# pdf2htmlEX is no longer under active development. -# https://github.com/coolwanglu/pdf2htmlEX/issues/733 -# https://github.com/coolwanglu/pdf2htmlEX/pull/735 segfaults -broken="incompatible with poppler-0.59" diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template index f6911178e3c..5c2a6917570 100644 --- a/srcpkgs/pdfgrep/template +++ b/srcpkgs/pdfgrep/template @@ -1,7 +1,7 @@ # Template file for 'pdfgrep' pkgname=pdfgrep version=2.1.1 -revision=2 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libgcrypt-devel poppler-cpp-devel" diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template index a5976085cf3..f6e81d1b852 100644 --- a/srcpkgs/pdfpc/template +++ b/srcpkgs/pdfpc/template @@ -1,7 +1,7 @@ # Template file for 'pdfpc' pkgname=pdfpc version=4.1.2 -revision=1 +revision=3 build_style=cmake hostmakedepends="pkg-config vala" makedepends="gst-plugins-base1-devel gtk+3-devel libgee08-devel diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template index c182f24d327..4fc8ec53b3a 100644 --- a/srcpkgs/peco/template +++ b/srcpkgs/peco/template @@ -1,7 +1,7 @@ # Template file for 'peco' pkgname=peco version=0.5.3 -revision=3 +revision=4 build_style=go go_import_path="github.com/peco/peco" go_package="${go_import_path}/cmd/peco" diff --git a/srcpkgs/perl-Archive-Zip/template b/srcpkgs/perl-Archive-Zip/template index 817c45cf5ff..dc3bf70b5ce 100644 --- a/srcpkgs/perl-Archive-Zip/template +++ b/srcpkgs/perl-Archive-Zip/template @@ -1,17 +1,17 @@ # Template file for 'perl-Archive-Zip' pkgname=perl-Archive-Zip -version=1.60 +version=1.63 revision=1 noarch=yes wrksrc="Archive-Zip-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends}" +makedepends="$hostmakedepends" checkdepends="perl-Test-MockModule" -depends="${makedepends}" +depends="$makedepends" short_desc="Provide a perl interface to ZIP archive files" maintainer="Juan RP " -license="Artistic, GPL-1" +license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Archive-Zip" distfiles="${CPAN_SITE}/Archive/Archive-Zip-${version}.tar.gz" -checksum=eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b +checksum=f12023b0e27c9504b7cf698426c726f4421707ef77c863ace98efc7692afe933 diff --git a/srcpkgs/perl-XML-Parser-Lite/template b/srcpkgs/perl-XML-Parser-Lite/template index 28d3319471c..24e495281ba 100644 --- a/srcpkgs/perl-XML-Parser-Lite/template +++ b/srcpkgs/perl-XML-Parser-Lite/template @@ -1,7 +1,7 @@ # Template file for 'perl-XML-Parser-Lite' pkgname=perl-XML-Parser-Lite -version=0.721 -revision=2 +version=0.722 +revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -14,4 +14,4 @@ maintainer="maxice8 " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/XML-Parser-Lite" distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz" -checksum=5862a36ecab9db9aad021839c847e8d2f4ab5a7796c61d0fb069bb69cf7908ba +checksum=6f90a027e1531a0e5406cf1de13c709b5216966df8f73d0bab9ab919209763ee diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template index 44ec34433e5..9767dc41138 100644 --- a/srcpkgs/pgadmin3/template +++ b/srcpkgs/pgadmin3/template @@ -1,7 +1,7 @@ # Template file for 'pgadmin3' pkgname=pgadmin3 version=1.22.2 -revision=7 +revision=8 build_style=gnu-configure configure_args="ac_cv_path_WX_CONFIG=wx-config-3.0 --with-wx-version=3.0" makedepends="postgresql-libs-devel wxWidgets-devel libxslt-devel libressl-devel" diff --git a/srcpkgs/pingus/template b/srcpkgs/pingus/template index 1732c6200d6..d540ea71b4a 100644 --- a/srcpkgs/pingus/template +++ b/srcpkgs/pingus/template @@ -4,7 +4,7 @@ version=0.7.6 revision=11 wrksrc="pingus-v${version}" build_style=scons -hostmakedepends="scons pkg-config" +hostmakedepends="pkg-config" makedepends="SDL_image-devel SDL_mixer-devel boost-devel libpng-devel" depends="${pkgname}-data" short_desc="Free Lemmings-like puzzle game" diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 470c33157ca..2ca01a2b26f 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=2.1.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="Lucene++-devel boost-devel cld2-devel db-devel gtkspell-devel diff --git a/srcpkgs/polkit-elogind/template b/srcpkgs/polkit-elogind/template index bc4f2d87ead..a19ae980f99 100644 --- a/srcpkgs/polkit-elogind/template +++ b/srcpkgs/polkit-elogind/template @@ -1,7 +1,7 @@ # Template file for 'polkit-elogind' pkgname=polkit-elogind version=0.115 -revision=1 +revision=2 wrksrc="polkit-${version}" build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-static diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template index 54c630f7f39..e5b24b023e5 100644 --- a/srcpkgs/pong-command/template +++ b/srcpkgs/pong-command/template @@ -1,7 +1,7 @@ # Template file for 'pong-command' pkgname=pong-command version=2.02 -revision=1 +revision=2 build_style=go go_import_path=github.com/kurehajime/pong-command go_package="${go_import_path}/pong" diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index 3c40b490df8..f9510aa38fc 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,7 +4,7 @@ # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=0.63.0 +version=0.68.0 revision=1 wrksrc="poppler-${version}" build_style=cmake @@ -17,11 +17,11 @@ short_desc="PDF rendering library - Qt5 bindings" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" -distfiles="${homepage}/poppler-$version.tar.xz" -checksum=27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111 +distfiles="${homepage}/poppler-${version}.tar.xz" +checksum=f90d04f0fb8df6923ecb0f106ae866cf9f8761bb537ddac64dfb5322763d0e58 if [ "$CROSS_BUILD" ]; then - configure_args+=" -DTHREADS_PTHREAD_ARG=2" + configure_args+=" -DTHREADS_PTHREAD_ARG=2" fi post_install() { diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index ae270bc5908..e3594b4a720 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=0.63.0 -revision=2 +version=0.68.0 +revision=1 build_style=cmake configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on) -DENABLE_QT4=off -DENABLE_QT5=off" @@ -16,11 +16,11 @@ short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" -distfiles="${homepage}/$pkgname-$version.tar.xz" -checksum=27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111 +distfiles="${homepage}/${pkgname}-${version}.tar.xz" +checksum=f90d04f0fb8df6923ecb0f106ae866cf9f8761bb537ddac64dfb5322763d0e58 if [ "$CROSS_BUILD" ]; then - configure_args+=" -DTHREADS_PTHREAD_ARG=2" + configure_args+=" -DTHREADS_PTHREAD_ARG=2" fi # Package build options diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template index bdac48740a2..489d0c58420 100644 --- a/srcpkgs/print-manager/template +++ b/srcpkgs/print-manager/template @@ -1,6 +1,6 @@ # Template file for 'print-manager' pkgname=print-manager -version=18.04.3 +version=18.08.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="Giuseppe Fierro " license="GPL-2.0-or-later" homepage="https://github.com/KDE/print-manager" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=7358b2394f1944a5e68c7f6ffa26aec528338efeab8076597eb001f36f9383d6 +checksum=7647d8196900c05ca7606cb29e9bbdd029ff15ec734a351fb534c702355622d6 if [ "$CROSS_BUILD" ]; then configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template index 898b6102200..e429bdb5276 100644 --- a/srcpkgs/prometheus/template +++ b/srcpkgs/prometheus/template @@ -1,7 +1,7 @@ # Template file for 'prometheus' pkgname=prometheus version=2.3.2 -revision=1 +revision=2 build_style=go go_import_path="github.com/prometheus/prometheus" go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool" diff --git a/srcpkgs/pscircle/template b/srcpkgs/pscircle/template index 76cbe39e3e4..1b0e980e83e 100644 --- a/srcpkgs/pscircle/template +++ b/srcpkgs/pscircle/template @@ -1,6 +1,6 @@ # Template file for 'pscircle' pkgname=pscircle -version=1.2.1 +version=1.2.2 revision=1 wrksrc="pscircle-v${version}" build_style=meson @@ -11,4 +11,4 @@ maintainer="SolitudeSF " license="GPL-2.0-or-later" homepage="https://gitlab.com/mildlyparallel/pscircle" distfiles="${homepage}/-/archive/v${version}/pscircle-v${version}.tar.gz" -checksum=13191a418f414606ee776219c9ba249abea4a6f4fc90b231b26da73dcee70fe7 +checksum=d774db5a050efe539ab0b02a45b24054ec4e253c1b662aaadb2aa13e21296ff8 diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template index 17a0c55224f..b51457544e9 100644 --- a/srcpkgs/pup/template +++ b/srcpkgs/pup/template @@ -1,7 +1,7 @@ # Template file for 'pup' pkgname=pup version=0.4.0 -revision=11 +revision=12 build_style=go go_import_path="github.com/ericchiang/pup" short_desc="Command line tool for processing HTML" diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template index ecd35b7ba98..edfdad32910 100644 --- a/srcpkgs/python-BeautifulSoup4/template +++ b/srcpkgs/python-BeautifulSoup4/template @@ -1,6 +1,6 @@ # Template file for 'python-BeautifulSoup4' pkgname=python-BeautifulSoup4 -version=4.6.1 +version=4.6.3 revision=1 noarch=yes wrksrc="beautifulsoup4-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://www.crummy.com/software/BeautifulSoup/" license="MIT" distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz" -checksum=bd43a3b26d2886acd63070c43da821b60dea603eb6d45bab0294aac6129adbfa +checksum=90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template index 1e5f3bcb710..ae765b38dbe 100644 --- a/srcpkgs/python-CherryPy/template +++ b/srcpkgs/python-CherryPy/template @@ -1,6 +1,6 @@ # Template file for 'python-CherryPy' pkgname=python-CherryPy -version=17.0.0 +version=17.3.0 revision=1 noarch=yes wrksrc="CherryPy-${version}" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="BSD-3-Clause" homepage="https://cherrypy.org/" distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz" -checksum=3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7 +checksum=c3e4d76232ade4c47666b9008f92556465df517b8dca833ece3bed027028ae7d alternatives="cherrypy:cherryd:/usr/bin/cherryd2" pre_build() { diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template index d2718e1787d..4877230a550 100644 --- a/srcpkgs/python-Sphinx/template +++ b/srcpkgs/python-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python-Sphinx' pkgname=python-Sphinx -version=1.7.6 +version=1.7.7 revision=1 noarch=yes wrksrc="Sphinx-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="http://sphinx-doc.org/" license="BSD-2-Clause" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=217ad9ece2156ed9f8af12b5d2c82a499ddf2c70a33c5f81864a08d8c67b9efc +checksum=71531900af3f68625a29c4e00381bee8f85255219a3d500a3e255076a45b735e alternatives=" sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2 diff --git a/srcpkgs/python-bleach/template b/srcpkgs/python-bleach/template index 03bb5f6f952..fc82fbebae7 100644 --- a/srcpkgs/python-bleach/template +++ b/srcpkgs/python-bleach/template @@ -1,6 +1,6 @@ # Template file for 'python-bleach' pkgname=python-bleach -version=2.1.3 +version=2.1.4 revision=1 noarch=yes wrksrc="bleach-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/mozilla/bleach" license="Apache-2.0" distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz" -checksum=eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44 +checksum=0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8 python3-bleach_package() { noarch=yes diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index 1849aaa3b5d..a43dc687516 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,6 +1,6 @@ # Template file for 'python-cryptography' pkgname=python-cryptography -version=2.3 +version=2.3.1 revision=1 wrksrc="cryptography-${version}" build_style=python-module @@ -16,7 +16,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pyca/cryptography" license="BSD-3-Clause, Apache-2.0" distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" -checksum=c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6 +checksum=8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-decorator/template b/srcpkgs/python-decorator/template index a1709461bc3..a716e1595bc 100644 --- a/srcpkgs/python-decorator/template +++ b/srcpkgs/python-decorator/template @@ -1,19 +1,20 @@ # Template file for 'python-decorator' pkgname=python-decorator -version=4.3.0 +version=4.3.1 revision=1 noarch=yes wrksrc="decorator-${version}" build_style=python-module +pycompile_module="decorator.py" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="decorator.py" short_desc="Python2 decorator module" maintainer="Juan RP " -homepage="https://github.com/micheles/decorator" license="BSD-2-Clause" -distfiles="${PYPI_SITE}/d/decorator/decorator-${version}.tar.gz" -checksum=c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c +homepage="https://github.com/micheles/decorator" +changelog="https://raw.githubusercontent.com/micheles/decorator/master/CHANGES.md" +distfiles="https://github.com/micheles/decorator/archive/${version}.tar.gz" +checksum=c1aab27d3f44ce8d3cb8c8c034180b2053d0cea4a011d2a58b9f85129bc3c7b0 post_install() { vlicense LICENSE.txt LICENSE diff --git a/srcpkgs/python-fishnet/template b/srcpkgs/python-fishnet/template index 789d6daba8d..460e03b6cc6 100644 --- a/srcpkgs/python-fishnet/template +++ b/srcpkgs/python-fishnet/template @@ -1,6 +1,6 @@ # Template file for 'python-fishnet' pkgname=python-fishnet -version=1.15.13 +version=1.15.14 revision=1 noarch=yes wrksrc="fishnet-${version}" @@ -14,7 +14,7 @@ maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://github.com/niklasf/fishnet" distfiles="https://github.com/niklasf/fishnet/archive/v${version}.tar.gz" -checksum=549a1881672c62b3126cbc694381668ad0864b77ac0b20281a9d9e6b57e836e6 +checksum=19693df6e7f458ad8b642e82139c51ec69f008d7d0896b2fe79e230af5f19c1f do_check() { python3 setup.py test diff --git a/srcpkgs/python-flaky/template b/srcpkgs/python-flaky/template index b5e1191d5a8..e6c91c0ccdb 100644 --- a/srcpkgs/python-flaky/template +++ b/srcpkgs/python-flaky/template @@ -1,11 +1,11 @@ # Template file for 'python-flaky' pkgname=python-flaky version=3.4.0 -revision=2 +revision=3 noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module -pycompile_modules="flaky" +pycompile_module="flaky" hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python2)" @@ -18,7 +18,7 @@ checksum=4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2 python3-flaky_package() { noarch=yes depends="python3" - pycompile_modules="flaky" + pycompile_module="flaky" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-gevent/template b/srcpkgs/python-gevent/template index c5b40d3c399..0fa1aff1395 100644 --- a/srcpkgs/python-gevent/template +++ b/srcpkgs/python-gevent/template @@ -1,19 +1,19 @@ # Template file for 'python-gevent' pkgname=python-gevent -version=1.3.5 +version=1.3.6 revision=1 wrksrc="gevent-${version}" build_style=python-module +pycompile_module="gevent" hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython" makedepends="python-devel python3-devel libev-devel c-ares-devel" depends="python-greenlet" -pycompile_module="gevent" short_desc="Coroutine-based Python2 networking library" maintainer="Alessio Sergi " homepage="http://www.gevent.org/" license="MIT" distfiles="https://github.com/gevent/gevent/archive/${version}.tar.gz" -checksum=7e3ee7661eddf837a0cfc6cee68f7da6aff915e13f3980288789a8cf4d45bae6 +checksum=ba67149d58a0c7958a2992983ba537d98717899c922a7228092b178ae95b4d8b export LIBEV_EMBED=0 export CARES_EMBED=0 diff --git a/srcpkgs/python-github3/template b/srcpkgs/python-github3/template index ccc4372423d..10e7b8b8d01 100644 --- a/srcpkgs/python-github3/template +++ b/srcpkgs/python-github3/template @@ -1,6 +1,6 @@ # Template file for 'python-github3' pkgname=python-github3 -version=1.1.0 +version=1.2.0 revision=1 noarch=yes wrksrc="github3.py-${version}" @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://github3py.readthedocs.org" changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst" distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz" -checksum=ee91e7e1fc5fa5237f7660c6d57c7ee0ba81cef6527006985382a75f71c3aab3 +checksum=35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af post_install() { vlicense LICENSE diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template index c9c9fdc104c..270b4a1f0d5 100644 --- a/srcpkgs/python-hypothesis/template +++ b/srcpkgs/python-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python-hypothesis' pkgname=python-hypothesis -version=3.68.0 +version=3.69.2 revision=1 noarch=yes wrksrc="hypothesis-hypothesis-python-${version}" @@ -15,8 +15,9 @@ short_desc="Python2 library for property based testing" maintainer="Orphaned " license="MPL-2.0" homepage="https://hypothesis.works/" +changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=86e526166ce9eb99c90e8da4519662a2eca0e8a554fa2595da95507ce1701b0b +checksum=ccb204616cb53fccc7dc2af4a85403ced791e70cb92f351ae06f26c9faf8406e do_check() { # pytest doesn't recognize -n switch diff --git a/srcpkgs/python-jupyter_qtconsole/template b/srcpkgs/python-jupyter_qtconsole/template index d7ba5a3cba6..4342d655f35 100644 --- a/srcpkgs/python-jupyter_qtconsole/template +++ b/srcpkgs/python-jupyter_qtconsole/template @@ -1,25 +1,25 @@ # Template file for 'python-jupyter_qtconsole' pkgname=python-jupyter_qtconsole -version=4.3.1 -revision=2 +version=4.4.1 +revision=1 noarch=yes wrksrc="qtconsole-${version}" build_style=python-module +pycompile_module="qtconsole" hostmakedepends="python-setuptools python3-setuptools" depends="python-traitlets python-jupyter_core python-jupyter_client python-Pygments python-ipython_ipykernel python-ipython_genutils python-PyQt5-svg" -pycompile_module="qtconsole" short_desc="Jupyter Qt console (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/jupyter/qtconsole" -license="3-clause-BSD" +license="BSD-3-Clause" distfiles="${PYPI_SITE}/q/qtconsole/qtconsole-${version}.tar.gz" -checksum=eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c +checksum=7870b19e6a6b0ab3acc09ee65463c0ca7568b3a01a6902d7c4e1ed2c4fc4e176 alternatives="jupyter-qtconsole:jupyter-qtconsole:/usr/bin/jupyter-qtconsole2" post_install() { - vlicense COPYING.md LICENSE + vlicense LICENSE } python3-jupyter_qtconsole_package() { @@ -33,6 +33,6 @@ python3-jupyter_qtconsole_package() { pkg_install() { vmove usr/bin/jupyter-qtconsole3 vmove usr/lib/python3* - vlicense COPYING.md LICENSE + vlicense LICENSE } } diff --git a/srcpkgs/python-llfuse/patches/xattr.patch b/srcpkgs/python-llfuse/patches/xattr.patch new file mode 100644 index 00000000000..c91f24629fc --- /dev/null +++ b/srcpkgs/python-llfuse/patches/xattr.patch @@ -0,0 +1,21 @@ +See https://bitbucket.org/nikratio/python-llfuse/commits/cec107981b03c6c3e263f21009757dec76d129e2 + +--- src/xattr.h 2016-05-24 02:53:33.000000000 +0200 ++++ src/xattr.h 2018-08-22 17:12:52.990555934 +0200 +@@ -25,7 +25,15 @@ + * Linux + */ + #if PLATFORM == PLATFORM_LINUX +-#include ++#include ++/* ++ * Newer versions of attr deprecate attr/xattr.h which defines ENOATTR as a ++ * synonym for ENODATA. To keep compatibility with the old style and the new, ++ * define this ourselves. ++ */ ++#ifndef ENOATTR ++#define ENOATTR ENODATA ++#endif + + #define EXTATTR_NAMESPACE_USER 0 + #define EXTATTR_NAMESPACE_SYSTEM 0 diff --git a/srcpkgs/python-llfuse/template b/srcpkgs/python-llfuse/template index 26036f5950f..69b016e0408 100644 --- a/srcpkgs/python-llfuse/template +++ b/srcpkgs/python-llfuse/template @@ -1,7 +1,7 @@ # Template file for 'python-llfuse' pkgname=python-llfuse version=1.3 -revision=1 +revision=2 wrksrc="llfuse-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools pkg-config" diff --git a/srcpkgs/python-matplotlib/template b/srcpkgs/python-matplotlib/template index 8d5257dbf4c..29d76c8044b 100644 --- a/srcpkgs/python-matplotlib/template +++ b/srcpkgs/python-matplotlib/template @@ -1,6 +1,6 @@ # Template file for 'python-matplotlib' pkgname=python-matplotlib -version=2.2.2 +version=2.2.3 revision=1 wrksrc="matplotlib-${version}" build_style=python-module @@ -24,7 +24,7 @@ maintainer="Alessio Sergi " homepage="https://matplotlib.org/" license="matplotlib, BSD-3-Clause, MIT" distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz" -checksum=3a8236e6747dbb48c342ee194a8ced2805205cbd718899b284e4d617189cd397 +checksum=da5b804222864a8e854ed68f16dcbc8b2fa096537d84f879cc8289db368735c8 export XDG_RUNTIME_DIR=/tmp diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template index de40a23fc3d..b92867b96f9 100644 --- a/srcpkgs/python-nose/template +++ b/srcpkgs/python-nose/template @@ -1,11 +1,11 @@ # Template file for 'python-nose' pkgname=python-nose version=1.3.7 -revision=2 +revision=3 noarch=yes wrksrc="nose-${version}" build_style=python-module -pycompile_modules="nose" +pycompile_module="nose" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" short_desc="The nicer testing for Python2" diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template index 35a32f2f371..e162a39172d 100644 --- a/srcpkgs/python-numexpr/template +++ b/srcpkgs/python-numexpr/template @@ -1,6 +1,6 @@ # Template file for 'python-numexpr' pkgname=python-numexpr -version=2.6.6 +version=2.6.8 revision=1 wrksrc="numexpr-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pydata/numexpr" license="MIT" distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz" -checksum=97c1f7fa409439ae933494014cd41d43de84cfe6c98b7f93392f94d54de1b453 +checksum=ee8bc7201aa2f1962c67d27c326a11eef9df887d7b87b1278a1d4e722bf44375 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python-podcastparser/template b/srcpkgs/python-podcastparser/template index 69d3429c9f1..7d837c4f736 100644 --- a/srcpkgs/python-podcastparser/template +++ b/srcpkgs/python-podcastparser/template @@ -1,6 +1,6 @@ # Template file for 'python-podcastparser' pkgname=python-podcastparser -version=0.6.3 +version=0.6.4 revision=1 noarch=yes wrksrc=podcastparser-${version} @@ -14,7 +14,7 @@ maintainer="bra1nwave " license="ISC" homepage="https://github.com/gpodder/podcastparser" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=5cd36182bf0c8ec5b36fb309b23bb1c67b507909d94ef402f04f08e64e545489 +checksum=fac02a56b755f81c11f186bec5a6f813671e600f413ade7ea9690e47eb27bd69 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template index 987d583f6b5..ac8976a669a 100644 --- a/srcpkgs/python-psutil/template +++ b/srcpkgs/python-psutil/template @@ -1,6 +1,6 @@ # Template file for 'python-psutil' pkgname=python-psutil -version=5.4.6 +version=5.4.7 revision=1 wrksrc="psutil-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/giampaolo/psutil" license="BSD-3-Clause" distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz" -checksum=686e5a35fe4c0acc25f3466c32e716f2d498aaae7b7edc03e2305b682226bcf6 +checksum=5b6322b167a5ba0c5463b4d30dfd379cd4ce245a1162ebf8fc7ab5c5ffae4f3b post_install() { vlicense LICENSE diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template index a33e273fbe3..892c6da0a85 100644 --- a/srcpkgs/python-pycryptodome/template +++ b/srcpkgs/python-pycryptodome/template @@ -1,6 +1,6 @@ # Template file for 'python-pycryptodome' pkgname=python-pycryptodome -version=3.6.4 +version=3.6.6 revision=1 wrksrc="pycryptodome-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Wietse Kuipers " homepage="https://www.pycryptodome.org/" license="Public Domain, BSD-2-Clause" distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz" -checksum=9c7790ffd291c81b934fe0ca8155a67235d33f70d4914bbf7467a447d9dbcb09 +checksum=b3cb4af317d9b84f6df50f0cfa6840ba69556af637a83fd971537823e13d601a provides="python-crypto-${version}_1" replaces="python-crypto>=0" @@ -22,7 +22,7 @@ do_check() { } post_install() { - vlicense LICENSE.rst LICENSE + vlicense LICENSE.rst } python3-pycryptodome_package() { @@ -32,6 +32,6 @@ python3-pycryptodome_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* - vlicense LICENSE.rst LICENSE + vlicense LICENSE.rst } } diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python-pyzmq/template index aeba60b8999..e0e4909d1ff 100644 --- a/srcpkgs/python-pyzmq/template +++ b/srcpkgs/python-pyzmq/template @@ -1,6 +1,6 @@ # Template file for 'python-pyzmq' pkgname=python-pyzmq -version=17.1.0 +version=17.1.2 revision=1 wrksrc="pyzmq-${version}" build_style=python-module @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="https://pyzmq.readthedocs.io/" license="LGPL-3.0-or-later, BSD-3-Clause" distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz" -checksum=9f4240db69c07ec6ab6a6fa4ea6b0cb4c0ca4be21ed469323ea26d5d3fddeb39 +checksum=77a32350440e321466b1748e6063b34a8a73768b62cb674e7d799fbc654b7c45 pre_build() { cat > setup.cfg <<-EOF diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template index d6428931e14..075619920ae 100644 --- a/srcpkgs/python-regex/template +++ b/srcpkgs/python-regex/template @@ -1,6 +1,6 @@ # Template file for 'python-regex' pkgname=python-regex -version=2018.07.11 +version=2018.08.17 revision=1 wrksrc="regex-${version}" build_style=python2-module @@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni " license="PSF" homepage="https://pypi.org/project/regex/" distfiles="${PYPI_SITE}/r/regex/regex-$version.tar.gz" -checksum=9308dbce8e5ff4ee06b172a777f6c7f650a5835a5ad41a6080eb501639c27a2f +checksum=56494baf1ed525deea426d3676b1ae3fdcc906b55eccfcb4ea928453e11f2a43 diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template index 6c7dfe7805a..4763a6f8327 100644 --- a/srcpkgs/python-reportlab/template +++ b/srcpkgs/python-reportlab/template @@ -1,7 +1,7 @@ # Template file for 'python-reportlab' pkgname=python-reportlab -version=3.5.2 -revision=2 +version=3.5.6 +revision=1 wrksrc="reportlab-$version" build_style=python-module pycompile_module="reportlab" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://www.reportlab.com/" distfiles="${PYPI_SITE}/r/reportlab/reportlab-${version}.tar.gz" -checksum=08986267eaf25d62c3802512f0a97dc3426d0c82f52c8beb576689582eb85b7f +checksum=3836a49e7ea7bce458f437cbc094633c7fd4ac027180565875c18ecc726f261e post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python-requests-mock/template b/srcpkgs/python-requests-mock/template index 81a90aa8b7f..1bde9648bc3 100644 --- a/srcpkgs/python-requests-mock/template +++ b/srcpkgs/python-requests-mock/template @@ -1,11 +1,11 @@ # Template file for 'python-requests-mock' pkgname=python-requests-mock version=1.5.2 -revision=1 +revision=2 noarch=yes wrksrc="requests-mock-${version}" build_style=python-module -pycompile_modules="requests_mock" +pycompile_module="requests_mock" hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr" depends="python-requests python-six" short_desc="Python2 module to test mocked responses from requests" @@ -17,7 +17,7 @@ checksum=7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb python3-requests-mock_package() { noarch=yes - pycompile_modules="requests_mock" + pycompile_module="requests_mock" depends="python3-requests python3-six" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-ruamel.yaml/template b/srcpkgs/python-ruamel.yaml/template index 1d47e837c45..54dfc64bc7b 100644 --- a/srcpkgs/python-ruamel.yaml/template +++ b/srcpkgs/python-ruamel.yaml/template @@ -1,6 +1,6 @@ # Template file for 'python-ruamel.yaml' pkgname=python-ruamel.yaml -version=0.15.59 +version=0.15.61 revision=1 wrksrc="ruamel.yaml-${version}" build_style=python-module @@ -13,7 +13,7 @@ license="MIT" homepage="https://bitbucket.org/ruamel/yaml" changelog="https://bitbucket.org/ruamel/yaml/raw/default/CHANGES" distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz" -checksum=e84e7f7f38b795c6f9f12a3126038ff47946f69397620179e117db3ed2d2e721 +checksum=87fc16ae28015605834745f0c5684d1b274e926ff93e2dc95bb253b4ea483866 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template index 06fdf29bba1..a680a81cc55 100644 --- a/srcpkgs/python-scandir/template +++ b/srcpkgs/python-scandir/template @@ -1,18 +1,18 @@ # Template file for 'python-scandir' pkgname=python-scandir -version=1.8 +version=1.9.0 revision=1 wrksrc="scandir-${version}" build_style=python2-module pycompile_module="scandir.py" -hostmakedepends="python-devel" -makedepends="${hostmakedepends}" +hostmakedepends="python-setuptools" +makedepends="python-devel" short_desc="Backport of the scandir module from Python 3.5+" maintainer="Alessio Sergi " homepage="https://github.com/benhoyt/scandir" license="BSD-3-Clause" distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz" -checksum=8d5011d3a99042c4d90e8adda0052d4475aae3d57bb927012267a6c59186d870 +checksum=44975e209c4827fc18a3486f257154d34ec6eaec0f90fef0cca1caa482db7064 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template index ea9f11a9343..7fae4155a75 100644 --- a/srcpkgs/python-setuptools/template +++ b/srcpkgs/python-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python-setuptools' pkgname=python-setuptools -version=40.0.0 +version=40.1.0 revision=1 noarch=yes wrksrc="setuptools-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pypa/setuptools" license="MIT" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip" -checksum=012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f +checksum=664500268e4d649ce5b9f9dc0af0edc2b144666b1544d64af0453da94aa72b70 alternatives="setuptools:easy_install:/usr/bin/easy_install2" export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 diff --git a/srcpkgs/python-unittest-mixins/template b/srcpkgs/python-unittest-mixins/template index e1197b4323e..199401fc33d 100644 --- a/srcpkgs/python-unittest-mixins/template +++ b/srcpkgs/python-unittest-mixins/template @@ -1,19 +1,19 @@ # Template file for 'python-unittest-mixins' pkgname=python-unittest-mixins -version=1.4 +version=1.6 revision=1 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="unittest_mixins" hostmakedepends="python-setuptools python3-setuptools" depends="python-six" short_desc="Helpul mixins for unittest classes in Python2" -maintainer="maxice8 " +maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/nedbat/unittest-mixins" distfiles="${PYPI_SITE}/u/unittest-mixins/unittest-mixins-${version}.tar.gz" -checksum=3979159f81e379416b8f10c3db7bbe9aaaefb7ebb8dcf778e6e5de5150c8281b -noarch=yes +checksum=05363abe099f0724b7bb6d71d0ce1046078c868cb10b3f1ebdf3ca6593c52507 python3-unittest-mixins_package() { noarch=yes diff --git a/srcpkgs/python-websocket-client/template b/srcpkgs/python-websocket-client/template index 76713881de1..7a40ae9f2a6 100644 --- a/srcpkgs/python-websocket-client/template +++ b/srcpkgs/python-websocket-client/template @@ -1,6 +1,6 @@ # Template file for 'python-websocket-client' pkgname=python-websocket-client -version=0.49.0 +version=0.51.0 revision=1 noarch=yes wrksrc="websocket_client-${version}" @@ -13,7 +13,7 @@ maintainer="Sergi Alvarez " license="LGPL-2.1-or-later" homepage="https://github.com/websocket-client/websocket-client" distfiles="${PYPI_SITE}/w/websocket-client/websocket_client-${version}.tar.gz" -checksum=bf36b4b4726cab3bf93e842deef3c5bf12bd9c134e45e9a852c76140309f5ae2 +checksum=030bbfbf29ac9e315ffb207ed5ed42b6981b5038ea00d1e13b02b872cc95e8f6 alternatives="websocket-client:wsdump:/usr/bin/wsdump.py2" pre_build() { diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template index c8ab6fcb804..e8ecf7cb639 100644 --- a/srcpkgs/python3-mpv/template +++ b/srcpkgs/python3-mpv/template @@ -1,11 +1,11 @@ # Template file for 'python3-mpv' pkgname=python3-mpv version=0.3.9 -revision=1 +revision=2 noarch=yes wrksrc="python-mpv-${version}" build_style=python3-module -pycompile_modules="mpv.py" +pycompile_module="mpv.py" hostmakedepends="python3-setuptools" depends="python3 mpv" short_desc="Python3 interface to the MPV media player" diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template new file mode 100644 index 00000000000..27d3711472d --- /dev/null +++ b/srcpkgs/python3-pulsectl/template @@ -0,0 +1,20 @@ +# Template file for 'python3-pulsectl' +pkgname=python3-pulsectl +version=18.8.0 +revision=1 +noarch=yes +wrksrc="pulsectl-${version}" +build_style=python3-module +pycompile_module="pulsectl" +hostmakedepends="python3-setuptools" +short_desc="Python3 high-level interfaces and ctypes bindings for libpulse" +maintainer="maxice8 " +license="MIT" +homepage="https://github.com/mk-fg/python-pulse-control" +changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst" +distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz" +checksum=119d419c66b373a69628219641a6cf14d5dc3c33be82f6b38198db5633d14353 + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/python3-pulsectl/update b/srcpkgs/python3-pulsectl/update new file mode 100644 index 00000000000..d674958c7d5 --- /dev/null +++ b/srcpkgs/python3-pulsectl/update @@ -0,0 +1 @@ +pkgname=pulsectl diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index 924d52e9e2c..493442707f3 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -1,7 +1,7 @@ # Template file for 'qpdf' pkgname=qpdf version=8.1.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="perl" makedepends="pcre-devel libjpeg-turbo-devel" diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template index 5547498a237..747c57efaac 100644 --- a/srcpkgs/qt5ct/template +++ b/srcpkgs/qt5ct/template @@ -1,19 +1,19 @@ # Template file for 'qt5ct' pkgname=qt5ct -version=0.35 +version=0.36 revision=1 build_style=qmake -hostmakedepends="qt5-tools qt5-qmake" +hostmakedepends="qt5-qmake qt5-tools" makedepends="qt5-devel" -depends="qt5 qt5-svg" +depends="qt5-svg" short_desc="Qt5 Configuration Tool" maintainer="Yuusha Spacewolf " license="BSD-2-Clause" homepage="https://sourceforge.net/projects/qt5ct/" distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2" -checksum=1ceb5097bf48a313a6f9a50088825b863855db8fa62b8ce8f79bd4cd4468ef77 +checksum=8fc3942f34d377af5533a0953cca633a7babc60c0476fd4318b617702183ee89 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi diff --git a/srcpkgs/quassel-shared b/srcpkgs/quassel-shared deleted file mode 120000 index 416c90438d7..00000000000 --- a/srcpkgs/quassel-shared +++ /dev/null @@ -1 +0,0 @@ -quassel \ No newline at end of file diff --git a/srcpkgs/quassel/template b/srcpkgs/quassel/template index 2b24617e00b..a718054ab38 100644 --- a/srcpkgs/quassel/template +++ b/srcpkgs/quassel/template @@ -1,7 +1,7 @@ # Template file for 'quassel' pkgname=quassel version=0.12.5 -revision=1 +revision=2 build_style=cmake configure_args="-DEMBED_DATA=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DWANT_CORE=ON -DUSE_QT5=ON" @@ -17,7 +17,6 @@ license="GPL-2.0, GPL-3.0" homepage="https://www.quassel-irc.org" distfiles="https://quassel-irc.org/pub/quassel-${version}.tar.bz2" checksum=1894574dfd79654152a5b7427e7df592b055ae908230504f98a4cb48961e74e2 -system_accounts="quassel" post_install() { vsv quasselcore @@ -40,6 +39,7 @@ quassel-core_package() { conflicts="quasselcore>=0" depends="qt5-plugin-sqlite" short_desc="${_desc} - server" + system_accounts="quassel" pkg_install() { vmove /usr/bin/quasselcore vmove /etc/sv diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template index 612db5bb9ee..22667e80865 100644 --- a/srcpkgs/rancher-compose/template +++ b/srcpkgs/rancher-compose/template @@ -1,7 +1,7 @@ # Template file for 'rancher-compose' pkgname=rancher-compose version=0.12.5 -revision=5 +revision=6 build_style=go go_import_path="github.com/rancher/$pkgname" short_desc="Docker compose compatible client to deploy to Rancher" diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template index e7a66554edd..926eb37ae1b 100644 --- a/srcpkgs/rclone/template +++ b/srcpkgs/rclone/template @@ -1,7 +1,7 @@ # Template file for 'rclone' pkgname=rclone version=1.42 -revision=1 +revision=2 build_style=go go_import_path="github.com/ncw/rclone" short_desc="A rsync for cloud storage" diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template index d683f64d941..af8e79fea09 100644 --- a/srcpkgs/rednotebook/template +++ b/srcpkgs/rednotebook/template @@ -1,6 +1,6 @@ # Template file for 'rednotebook' pkgname=rednotebook -version=2.5 +version=2.6.1 revision=1 noarch=yes build_style=python3-module @@ -13,4 +13,4 @@ maintainer="cr6git " license="GPL-2.0-or-later" homepage="https://rednotebook.sourceforge.io" distfiles="https://github.com/jendrikseipp/rednotebook/archive/v${version}.tar.gz" -checksum=8d23951d3865cda53c2f65b03fa1e94a213c0ffeabad01ea48f357991713aede +checksum=608e151a9f0e6e3f1cfdd239214fa5d9d7f64042f856d22ab2f6f367c1694c87 diff --git a/srcpkgs/remmina/patches/remove-libssh-threads.patch b/srcpkgs/remmina/patches/remove-libssh-threads.patch deleted file mode 100644 index 0c14549e274..00000000000 --- a/srcpkgs/remmina/patches/remove-libssh-threads.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/FindLIBSSH.cmake 2018-07-31 14:53:53.000000000 +0200 -+++ cmake/FindLIBSSH.cmake 2018-08-12 05:19:14.943145715 +0200 -@@ -42,16 +42,11 @@ - PATHS ${PC_LIBSSH_PKGCONF_LIBRARY_DIRS} - ) - --find_library(LIBSSH_THREADS_LIBRARY -- NAMES ssh_threads -- PATHS ${PC_LIBSSH_LIBDIR} ${PC_LIBSSH_LIBRARY_DIRS} --) -- - include(FindPackageHandleStandardArgs) - - find_package_handle_standard_args(LIBSSH DEFAULT_MSG LIBSSH_LIBRARY LIBSSH_INCLUDE_DIR) - --set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY}) -+set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY}) - set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR}) - - mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY) diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index 2f98753895c..d75b50868b8 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,7 +1,7 @@ # Template file for 'remmina' pkgname=remmina -version=1.2.31.2 -revision=2 +version=1.2.31.4 +revision=1 wrksrc="Remmina-${version}" build_style=cmake configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON" @@ -16,7 +16,7 @@ maintainer="cr6git " license="GPL-2.0-or-later" homepage="http://www.remmina.org/wp/" distfiles="https://github.com/FreeRDP/Remmina/archive/v${version}.tar.gz" -checksum=26307915297d1c7731902d46e90a4a4ab26d7f9ad5d700477c32b2f47f3092be +checksum=b9adc23ac84630607f219cbae4c3ce89239aebaaae023e13d5423da56ae74173 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" ;; diff --git a/srcpkgs/reop/template b/srcpkgs/reop/template index df3a51031b1..a62040f78f2 100644 --- a/srcpkgs/reop/template +++ b/srcpkgs/reop/template @@ -1,6 +1,6 @@ # Template file for 'reop' pkgname=reop -version=2.1.0 +version=2.1.1 revision=2 makedepends="libsodium-devel" short_desc="Create and verify cryptographic signatures" @@ -8,7 +8,7 @@ maintainer="Duncaen " license="ISC, BSD" homepage="http://www.tedunangst.com/flak/post/reop" distfiles="http://www.tedunangst.com/flak/files/reop-${version}.tgz" -checksum=e429c7ff47f130bd465eaa0c23a1783b476bc484d32793592b54a568b55e49af +checksum=fa8ae058c51efec5bde39fab15b4275e6394d9ab1dd2190ffdba3cf9983fdcac pre_fetch() { # 301 redirect to https://www.tedunangst.com/flak/files/reop-2.1.0.tgz @@ -16,7 +16,6 @@ pre_fetch() { # Certificate verification failed for /C=US/ST=PA/O=tedunangst.com/CN=www.tedunangst.com/emailAddress=tedu@tedunangst.com export SSL_NO_VERIFY_PEER=1 } - do_build() { make -f GNUmakefile \ CC="$CC" CFLAGS="$CFLAGS" \ @@ -24,6 +23,9 @@ do_build() { LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lsodium ${LDFLAGS}" sed -n '2,14p' reop.c | cut -b4- > LICENSE } +do_check() { + (cd tests && ./test.sh) +} do_install() { vbin reop vman reop.1 diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template index a68499c15ad..8dc070ec9b9 100644 --- a/srcpkgs/rest-server/template +++ b/srcpkgs/rest-server/template @@ -1,7 +1,7 @@ # Template file for 'rest-server' pkgname=rest-server version=0.9.7 -revision=2 +revision=3 build_style=go go_import_path="github.com/restic/rest-server" go_package="${go_import_path}/cmd/rest-server" diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template index 2141ff1c866..1b093a255d3 100644 --- a/srcpkgs/restic/template +++ b/srcpkgs/restic/template @@ -1,7 +1,7 @@ # Template file for 'restic' pkgname=restic version=0.9.2 -revision=1 +revision=2 build_style=go go_import_path=github.com/restic/restic go_package="${go_import_path}/cmd/restic" diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index daeea9a8103..ad10e5dbb2a 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -3,14 +3,14 @@ pkgname=rmlint version=2.7.0 revision=1 build_style=scons -hostmakedepends="scons pkg-config python3-Sphinx glib-devel" +hostmakedepends="pkg-config python3-Sphinx glib-devel" makedepends="libblkid-devel elfutils-devel json-glib-devel" pycompile_module="shredder" short_desc="Extremely fast tool to remove duplicates" maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://rmlint.rtfd.org/" -distfiles="https://github.com/sahib/$pkgname/archive/v$version.tar.gz" +distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz" checksum=174aaf4a3fd4c2911b7ddffd2804c6b940e38bedbb5cf2a6ec51b552cf919c33 do_install() { diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template index 5e2ee6f72b0..47be81a015a 100644 --- a/srcpkgs/rocker/template +++ b/srcpkgs/rocker/template @@ -1,7 +1,7 @@ # Template file for 'rocker' pkgname=rocker version=1.3.1 -revision=7 +revision=8 build_style=go depends="docker" short_desc="Docker based build environment" diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 6b991b36ae6..55c691ecacd 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -5,11 +5,11 @@ # # https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=197689 -_githash="1f89ad77bf9b204c18fb6fdd167b4ee92d064f95" +_githash="ceeaae1f33060be3fc26344a0a73c8c0c74db086" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.14.62 +version=4.14.66 revision=1 wrksrc="linux-${_githash}" maintainer="Juan RP " @@ -17,7 +17,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=153deef35bf1895fb0825395c0f9fb61832dcf0131987fce99449beb17afa173 +checksum=308e5d76a316d02220df852adce94e069d2b50809d5a13fb2af5ae730a2dff44 _kernver="${version}_${revision}" diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 1113fd9d95a..491f8d5fd0f 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,9 +1,10 @@ # Template file for 'rpm' pkgname=rpm -version=4.14.1 +version=4.14.2 revision=1 build_style=gnu-configure -configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python2" +configure_args="--with-lua --with-cap --with-acl --with-external-db + --enable-python PYTHON=python2" hostmakedepends="automake gettext-devel libtool nss-devel pkg-config python-setuptools" makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel @@ -14,7 +15,7 @@ license="GPL-2.0-or-later" homepage="http://rpm.org" changelog="http://rpm.org/wiki/Releases/${version}.html" distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2" -checksum=43f40e2ccc3ca65bd3238f8c9f8399d4957be0878c2e83cba2746d2d0d96793b +checksum=80cbc2c1e8e24e67c6f88b41d8ab5633b653a9a79d50d4750474a18cdb69352b conflicts="rpmextract>=0" # Both provide rpm2cpio CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" diff --git a/srcpkgs/rtl8812au-dkms/template b/srcpkgs/rtl8812au-dkms/template index 722301075a7..e6dd8ba1919 100644 --- a/srcpkgs/rtl8812au-dkms/template +++ b/srcpkgs/rtl8812au-dkms/template @@ -8,7 +8,6 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.dlink.com" -triggers="dkms" dkms_modules="rtl8812au 4.3.14" hostmakedepends="git" depends="dkms" diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index cfcf78968d9..1d50920c48e 100644 --- a/srcpkgs/runc/template +++ b/srcpkgs/runc/template @@ -1,7 +1,7 @@ # Template file for 'runc' pkgname=runc version=1.0.0 -revision=5 +revision=6 _subver="rc5" _ver="$version-$_subver" build_style=go diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template index f7762caf1a6..ac83561a6f6 100644 --- a/srcpkgs/ryzen-stabilizator/template +++ b/srcpkgs/ryzen-stabilizator/template @@ -1,7 +1,7 @@ # Template file for 'ryzen-stabilizator' pkgname=ryzen-stabilizator version=0.0.0.20180309 -revision=2 +revision=3 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8 wrksrc="${pkgname}-${_commit}" build_style=go diff --git a/srcpkgs/searchfile/template b/srcpkgs/searchfile/template index 181f4642703..df713c21508 100644 --- a/srcpkgs/searchfile/template +++ b/srcpkgs/searchfile/template @@ -1,7 +1,7 @@ # Template file for 'searchfile' pkgname=searchfile version=0.0.0.20180623 -revision=1 +revision=2 _commit=b0413998217ae397e0642cc5d3666ed89e866f0c wrksrc="${pkgname}-${_commit}" build_style=go diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index 20e97a61af7..a0ac42b5419 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -3,7 +3,9 @@ pkgname=serf version=1.3.9 revision=8 nocross=yes -hostmakedepends="scons libressl-devel apr-util-devel" +build_style=scons +make_build_args="PREFIX=/usr" +hostmakedepends="libressl-devel apr-util-devel" makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel" short_desc="High-performance asynchronous HTTP client library" maintainer="Juan RP " @@ -12,11 +14,7 @@ homepage="http://serf.apache.org" distfiles="https://archive.apache.org/dist/serf/serf-${version}.tar.bz2" checksum=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc -do_build() { - scons ${makejobs} CC="$CC" CFLAGS="$CFLAGS" PREFIX=/usr -} do_install() { - vmkdir usr scons PREFIX=${DESTDIR}/usr install } @@ -26,7 +24,7 @@ serf-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so - vmove usr/lib/*.a + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" } } diff --git a/srcpkgs/shadowsocks-libev-devel b/srcpkgs/shadowsocks-libev-devel new file mode 120000 index 00000000000..bd02a4225c4 --- /dev/null +++ b/srcpkgs/shadowsocks-libev-devel @@ -0,0 +1 @@ +shadowsocks-libev \ No newline at end of file diff --git a/srcpkgs/shadowsocks-libev/INSTALL b/srcpkgs/shadowsocks-libev/INSTALL new file mode 100644 index 00000000000..4bbc9fe071a --- /dev/null +++ b/srcpkgs/shadowsocks-libev/INSTALL @@ -0,0 +1,8 @@ +case "${ACTION}" in +post) + setcap cap_net_bind_service+ep usr/bin/ss-local + setcap cap_net_bind_service+ep usr/bin/ss-server + setcap cap_net_bind_service+ep usr/bin/ss-tunnel + setcap cap_net_bind_service,cap_net_admin+ep usr/bin/ss-redir + ;; +esac diff --git a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run new file mode 100755 index 00000000000..846ca47cf97 --- /dev/null +++ b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -u shadowsocks:shadowsocks ss-local -c /etc/shadowsocks-libev/config.json 1>/dev/null diff --git a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run new file mode 100755 index 00000000000..0fd1074671c --- /dev/null +++ b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -u shadowsocks:shadowsocks ss-server -c /etc/shadowsocks-libev/config.json 1>/dev/null diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template new file mode 100644 index 00000000000..50aff0462a4 --- /dev/null +++ b/srcpkgs/shadowsocks-libev/template @@ -0,0 +1,32 @@ +# Template file for 'shadowsocks-libev' +pkgname=shadowsocks-libev +version=3.2.0 +revision=2 +build_style=gnu-configure +configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr" +hostmakedepends="pkg-config asciidoc xmlto" +makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel" +short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes" +maintainer="whoami " +license="GPL-3.0-or-later" +homepage="https://github.com/shadowsocks/shadowsocks-libev" +distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 + +system_accounts="shadowsocks" +make_dirs="/etc/${pkgname} 0750 shadowsocks shadowsocks" + +post_install() { + vsv ${pkgname}-server + vsv ${pkgname}-client + vsconf debian/config.json +} + +shadowsocks-libev-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib + } +} diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template index 3df08586cb9..0216e965f54 100644 --- a/srcpkgs/shfmt/template +++ b/srcpkgs/shfmt/template @@ -1,7 +1,7 @@ # Template file for 'shfmt' pkgname=shfmt version=2.5.1 -revision=1 +revision=2 build_style=go go_import_path=mvdan.cc/sh go_package="${go_import_path}/cmd/shfmt" diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template index a34c74aa2ea..adf4b95b79f 100644 --- a/srcpkgs/sift/template +++ b/srcpkgs/sift/template @@ -1,7 +1,7 @@ # Template file for 'sift' pkgname=sift version=0.9.0 -revision=11 +revision=12 build_style=go hostmakedepends="git" short_desc="A fast and powerful open source alternative to grep" diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template index 34f8910e1e0..f45ea553ef4 100644 --- a/srcpkgs/sigil/template +++ b/srcpkgs/sigil/template @@ -1,13 +1,13 @@ # Template file for 'sigil' pkgname=sigil -version=0.9.8 -revision=2 -create_wrksrc=yes +version=0.9.10 +revision=1 +wrksrc="Sigil-${version}" build_style=cmake # Can use system zlib, minizip and hunspell; can't use system pcre configure_args="-DUSE_SYSTEM_LIBS=ON" hostmakedepends="pkg-config unzip qt5-qmake" -makedepends="zlib-devel minizip-devel qt5-tools-devel qt5-svg-devel +makedepends="zlib-devel qt5-tools-devel qt5-svg-devel qt5-webkit-devel qt5-xmlpatterns-devel qt5-multimedia-devel qt5-sensors-devel qt5-declarative-devel qt5-location-devel qt5-webchannel-devel qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds @@ -15,10 +15,10 @@ makedepends="zlib-devel minizip-devel qt5-tools-devel qt5-svg-devel depends="desktop-file-utils python3-lxml" short_desc="A multi-platform EPUB ebook editor" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/Sigil-Ebook/Sigil" -distfiles="${homepage}/releases/download/${version}/Sigil-${version}-Code.zip" -checksum=78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=294954c4c2b3f1f9348d4f1bff18edebaba44afae901be3900154778b2f877ed if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel" diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template index 02af525b45d..e0b573c200c 100644 --- a/srcpkgs/skopeo/template +++ b/srcpkgs/skopeo/template @@ -1,7 +1,7 @@ # Template file for 'skopeo' pkgname=skopeo version=0.1.31 -revision=1 +revision=3 build_style=go go_import_path="github.com/projectatomic/${pkgname}" go_package="${go_import_path}/cmd/${pkgname}" @@ -13,10 +13,17 @@ license="Apache-2.0" homepage="https://github.com/containers/skopeo" distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz" checksum=f41121044ddca07afa63788302caf3582a653269c9601f7528003693d9807726 +make_dirs="/var/lib/atomic/sigstore 0755 root root" + +post_build() { + go-md2man -in docs/skopeo.1.md -out docs/skopeo.1 +} post_install() { - go-md2man -in docs/skopeo.1.md -out docs/skopeo.1 vman docs/skopeo.1 - vinstall completions/bash/skopeo 644 usr/share/bash-completion/completions + vmkdir etc/containers + vinstall default-policy.json 644 etc/containers policy.json + vmkdir etc/containers/registries.d + vinstall default.yaml 644 etc/containers/registries.d } diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index b3c3a38b839..5c954e5b620 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,7 +1,7 @@ # Template file for 'skype' # This just repackages the debian package. pkgname=skype -version=8.28.76.42 +version=8.29.76.16 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -12,7 +12,7 @@ maintainer="Lon Willett " license="skype" homepage="https://www.skype.com" distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=b3814b7a0844980d924b9972bf2ff712743486999555a860cab31d8397468eba +checksum=0323599694f293c7063b785ad533ac1cf8981bfd875cce896df956e63004c72f do_extract() { ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template index 76565bc9c91..17a66d321c2 100644 --- a/srcpkgs/slack-term/template +++ b/srcpkgs/slack-term/template @@ -1,7 +1,7 @@ # Template file for 'drive' pkgname=slack-term version=0.4.0 -revision=2 +revision=3 build_style=go short_desc="Slack client for your terminal" maintainer="Gerardo Di Iorio " diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template index d8a2ab206b8..a79c3aefc55 100644 --- a/srcpkgs/slit/template +++ b/srcpkgs/slit/template @@ -1,7 +1,7 @@ # Template file for 'slit' pkgname=slit version=1.2.0 -revision=2 +revision=3 build_style=go go_import_path=github.com/tigrawap/slit go_package="${go_import_path}/cmd/slit" diff --git a/srcpkgs/smali/template b/srcpkgs/smali/template index 4cbe2992682..ae0fd7b7889 100644 --- a/srcpkgs/smali/template +++ b/srcpkgs/smali/template @@ -1,33 +1,30 @@ # Template file for 'smali' pkgname=smali -version=2.2.2 +version=2.2.4 revision=1 -short_desc="An assembler/disassembler for Android's dex format" -maintainer="Juan RP " -license="Simplified BSD" -homepage="https://github.com/JesusFreke/smali" +build_style=fetch depends="virtual?java-runtime" +short_desc="Assembler/disassembler for Android's dex format" +maintainer="Juan RP " +license="BSD-3-Clause" +homepage="https://github.com/JesusFreke/smali" distfiles=" https://bitbucket.org/JesusFreke/smali/downloads/smali-${version}.jar https://bitbucket.org/JesusFreke/smali/downloads/baksmali-${version}.jar https://raw.githubusercontent.com/JesusFreke/smali/v${version}/NOTICE" -checksum="5ec0ce98146d36c5826f1fbf362180a0a264ce0a31d50b8c24833975b47d98e6 - cf7484d8c090fedfa9cd35215144ffabda43c30afd35e00b57c1cf53bde4c66f +checksum="67b5d4e6dc9e663610bd06d307ecc5087cf862fc1c255704ef1f7b755dc9e634 + 75a82ea60c014614fa62696115dc72ceae77167ae6b110f5435569bd98f9b6d7 2fdfd360744a49b461eaf016088205c45926596f0106c26553cb90b1adc5a046" nocross=yes -do_extract() { - : -} - do_install() { vmkdir usr/share/smali - vcopy ${XBPS_SRCDISTDIR}/${pkgname}-${version}/smali-${version}.jar usr/share/smali - vcopy ${XBPS_SRCDISTDIR}/${pkgname}-${version}/baksmali-${version}.jar usr/share/smali + vcopy smali-${version}.jar usr/share/smali + vcopy baksmali-${version}.jar usr/share/smali vmkdir usr/bin for f in smali baksmali; do sed -e "s,@VERSION@,${version},g" ${FILESDIR}/${f} > ${DESTDIR}/usr/bin/${f} chmod 0755 ${DESTDIR}/usr/bin/${f} done - vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/NOTICE + vlicense NOTICE } diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template new file mode 100644 index 00000000000..2f080b28ce7 --- /dev/null +++ b/srcpkgs/soundkonverter/template @@ -0,0 +1,20 @@ +# Template file for 'soundkonverter' +pkgname=soundkonverter +version=3.0.1 +revision=1 +build_wrksrc=src +build_style=cmake +hostmakedepends="extra-cmake-modules" +makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel + qt5-devel taglib-devel" +depends="hicolor-icon-theme" +short_desc="Frontend to various audio converters" +maintainer="travankor " +license="GPL-2.0-only" +homepage="https://github.com/dfaust/soundkonverter" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-qmake qt5-host-tools" +fi diff --git a/srcpkgs/spl/template b/srcpkgs/spl/template index 444be7b22cb..4599500ad86 100644 --- a/srcpkgs/spl/template +++ b/srcpkgs/spl/template @@ -13,7 +13,6 @@ homepage="http://zfsonlinux.org/" distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz" checksum=432b2ef0ca1f5cf7c1a64dec643ab5d92681a5097bf95b336aabaa252bad96e1 -triggers="dkms" dkms_modules="spl ${version/r/-}" depends="dkms>=2.2.0.3_9 ${pkgname}-devel>=${version}_${revision}" diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index cc90d1ece66..7b54a018542 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,7 +1,7 @@ # Template file for 'spotify' pkgname=spotify -version=1.0.80 -revision=1 +version=1.0.88 +revision=2 short_desc="Proprietary music streaming client" maintainer="Stefan Mühlinghaus " homepage="https://www.spotify.com" @@ -11,8 +11,8 @@ only_for_archs="x86_64" repository=nonfree build_style=fetch depends="binutils gtk+ nss GConf libXScrnSaver libatomic" -_sversion=".480.g51b03ac3-13_amd64" -_schecksum=e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea +_sversion=".353.g15c26ea1-14_amd64" +_schecksum=75cb915931e0b5d6480dde9d109f450e7e75bea036dda66332ce838286197c85 do_install() { vbin ${FILESDIR}/spotify diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template index 6bce1a8e153..855c02ef2bd 100644 --- a/srcpkgs/spreed-webrtc/template +++ b/srcpkgs/spreed-webrtc/template @@ -1,7 +1,7 @@ # Template file for 'spreed-webrtc' pkgname=spreed-webrtc version=0.29.7 -revision=7 +revision=8 build_style=go go_import_path="github.com/strukturag/spreed-webrtc" go_package="${go_import_path}/src/app/spreed-webrtc-server" diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template index 2c00daae982..462c6cb9f33 100644 --- a/srcpkgs/steam/template +++ b/srcpkgs/steam/template @@ -1,19 +1,17 @@ # Template file for 'steam' -# -only_for_archs="i686 x86_64" - pkgname=steam -version=1.0.0.54 +version=1.0.0.55 revision=1 wrksrc=steam +only_for_archs="i686 x86_64" depends="zenity xterm xz curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils liberation-fonts-ttf" repository="nonfree" short_desc="Digital distribution client bootstrap package - Valve's steam client" maintainer="Juan RP " license="Proprietary license" -homepage="http://steampowered.com/" -distfiles="http://repo.steampowered.com/$pkgname/pool/$pkgname/s/steam/steam_${version}.tar.gz" -checksum=42531bf2615afed54c333ae9afeebe8cb68a31304ddfcf90e61b3532a5597386 +homepage="https://steampowered.com/" +distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz" +checksum=c303a610ebd7e392f5027b22ee0b64bf178344bd979bef473046c57c3599a1af do_install() { make DESTDIR=${DESTDIR} install diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index 2f08ec0fc46..03c2b992cc1 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -1,7 +1,7 @@ # Template file for 'stellarium' pkgname=stellarium -version=0.18.1 -revision=3 +version=0.18.2 +revision=1 build_style=cmake hostmakedepends="perl qt5-qmake qt5-host-tools" makedepends="qt5-location-devel qt5-multimedia-devel qt5-script-devel @@ -10,9 +10,9 @@ depends="desktop-file-utils ${pkgname}-data" short_desc="An Open Source Planetarium" maintainer="Juan RP " license="GPL-2.0-or-later" -homepage="http://www.stellarium.org/" +homepage="https://www.stellarium.org/" distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz" -checksum=38d34538f3dc87943bc2977aeb1c099339b0ea1da63a3565e36409e165e6536e +checksum=7582a8ef96ab673a17a248b97bc9deb69b9d65f07e9689f1761c284e36b028db stellarium-data_package() { short_desc+=" - data files" diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index a1c454d1f31..9af5f03d133 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -1,6 +1,6 @@ -# Template build file for 'sudo'. +# Template file for 'sudo' pkgname=sudo -version=1.8.23 +version=1.8.24 revision=1 build_style=gnu-configure configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor @@ -11,10 +11,11 @@ hostmakedepends="groff" makedepends="zlib-devel pam-devel" short_desc="Allow others to run commands as root" maintainer="Juan RP " -homepage="https://www.sudo.ws/" license="ISC" +homepage="https://www.sudo.ws/" +changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS" distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz" -checksum=d863d29b6fc87bc784a3223350e2b28a2ff2c4738f0fb8f1c92bb38c3017e679 +checksum=b488557a198ecef30b7ad4011b59a66232dec2364ad956e11d8e17906c225be8 conf_files="/etc/pam.d/sudo /etc/sudoers" lib32disabled=yes diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template index ce433aa7962..006c398759f 100644 --- a/srcpkgs/svctl/template +++ b/srcpkgs/svctl/template @@ -1,7 +1,7 @@ # Template file for 'svctl' pkgname=svctl version=1 -revision=6 +revision=7 build_style=go go_import_path="github.com/KenjiTakahashi/svctl" go_ldflags="-X main.Version=v${version}" diff --git a/srcpkgs/swiften/patches/fix-gcc8.patch b/srcpkgs/swiften/patches/fix-gcc8.patch new file mode 100644 index 00000000000..f7522ea2e01 --- /dev/null +++ b/srcpkgs/swiften/patches/fix-gcc8.patch @@ -0,0 +1,10 @@ +--- Sluift/main.cpp ++++ Sluift/main.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_EDITLINE + #include + #endif diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index a4d4ed61441..a1982291f50 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -2,8 +2,8 @@ pkgname=swiften version=3.0 revision=8 +wrksrc="swift-${version}" build_style=scons -hostmakedepends="scons" makedepends="boost-devel libressl-devel libxml2-devel libidn-devel" short_desc="XMPP library for C++" maintainer="John Regan " @@ -11,8 +11,6 @@ license="GPL-3" homepage="http://swift.im/" distfiles="http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2" checksum=2e48f081d337f471b4eba7c0c807a7b640216a76ed3568ced55abb5b927c7fd2 -wrksrc="swift-${version}" -make_build_targets="Swiften" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2 -DBOOST_FILESYSTEM_VERSION=3 -DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1" _scons_options="assertions=1 build_examples=1 max_jobs=1 optimize=1 debug=0 swiften_dll=1" diff --git a/srcpkgs/syncthing-inotify/template b/srcpkgs/syncthing-inotify/template index f2c84df06db..ed4c71c2f65 100644 --- a/srcpkgs/syncthing-inotify/template +++ b/srcpkgs/syncthing-inotify/template @@ -1,7 +1,7 @@ # Template file for 'syncthing-inotify' pkgname=syncthing-inotify version=0.8.7 -revision=6 +revision=7 build_style=go go_import_path="github.com/syncthing/syncthing-inotify" go_ldflags="-X main.Version=v${version}" diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 68fa19030d4..766ed48f5ae 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,7 +1,7 @@ # Template file for 'syncthing' pkgname=syncthing version=0.14.49 -revision=1 +revision=2 build_style=go go_import_path="github.com/syncthing/syncthing" go_package="${go_import_path}/cmd/strelaysrv ${go_import_path}/cmd/syncthing" diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index fce0c238c74..98c229a9a32 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -9,7 +9,6 @@ hostmakedepends="wget" makedepends="jsoncpp-devel libcurl-devel libressl-devel LuaJIT-devel ncurses-devel zlib-devel elfutils-devel" depends="dkms" -triggers="dkms" dkms_modules="sysdig ${version}" short_desc="Open source system-level exploration and troubleshooting tool" maintainer="Leah Neukirchen " diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 1902f3bc95c..f39b477c2b8 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,7 +1,7 @@ # Template file for 'sysprof' pkgname=sysprof version=3.28.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config itstool glib-devel" makedepends="gtk+3-devel polkit-devel glib-devel elogind-devel" @@ -9,14 +9,17 @@ short_desc="A system-wide profiler for Linux" maintainer="Juan RP " license="GPL-2" homepage="http://sysprof.com/" -distfiles="https://download.gnome.org/sources/sysprof/${version%.*}/$pkgname-$version.tar.xz" +distfiles="https://download.gnome.org/sources/sysprof/${version%.*}/${pkgname}-${version}.tar.xz" checksum=65437778af2fc3bab05bf9c1871fbd8726a4bd6471f1288d7b7a7e3429cee436 configure_args="-Denable-gtk=true -Dsystemdunitdir=/DELETEME" + case "$XBPS_TARGET_MACHINE" in - x64_64-musl|aarch64-musl) CFLAGS="-D__WORDSIZE=64" ;; - *-musl) CFLAGS="-D__WORDSIZE=32" ;; + aarch64-musl|x86_64-musl) broken="__WORDSIZE definitions aren't recognized" ;; + x64_64-musl|aarch64-musl) CFLAGS="-D__WORDSIZE=64" ;; + *-musl) CFLAGS="-D__WORDSIZE=32" ;; esac -CFLAGS+=" -Wno-error -Wno-error=undef" + +CFLAGS=" -Wno-error -Wno-error=undef" pre_build() { export SHELL=/bin/bash @@ -33,6 +36,5 @@ sysprof-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" - vmove usr/share } } diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template index f429510be18..01cb65857ec 100644 --- a/srcpkgs/tab/template +++ b/srcpkgs/tab/template @@ -1,14 +1,14 @@ # Template file for 'tab' pkgname=tab -version=6.2.3 -revision=2 -wrksrc="tkatchev-tab-3afe351a9c65" +version=6.2.4 +revision=1 +wrksrc="tkatchev-tab-5f844032197b" short_desc="Shell language for text/number manipulation" maintainer="Leah Neukirchen " license="Boost Software License 1.0" homepage="http://tkatchev.bitbucket.io/tab/" distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2" -checksum=61cdc47f86e150bbdb47b0d7d8a930f17238ebea92b8af9a7aa9c26e12e7a3ec +checksum=3c3fbdf8d735316c64a654505e44a28baa75d6a7ff4d3065dfcc72bf2cea8411 do_build() { ${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template index 67996b1fb9a..1363f7118a8 100644 --- a/srcpkgs/tag/template +++ b/srcpkgs/tag/template @@ -1,7 +1,7 @@ # Template file for 'tag' pkgname=tag version=1.4.0 -revision=6 +revision=7 build_style=go hostmakedepends="git mercurial" go_import_path="github.com/aykamko/${pkgname}" diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index 07b9907ef22..4bce90fcd76 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,6 +1,6 @@ # Template file for 'terraform' pkgname=terraform -version=0.11.7 +version=0.11.8 revision=2 build_style=go short_desc="A tool for building, changing, and combining infrastructure" @@ -9,4 +9,4 @@ license="MPL-2.0" homepage="https://www.terraform.io/" go_import_path="github.com/hashicorp/$pkgname" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=f9a2730dcd68dad754cf0efa017d51929a7f333a89d07ddff3c6ff7b2d1e8be3 +checksum=c0d7a0b726579574bcfee2ae141be4e82d1c9ab4a339cc6f86f9ec38de9130fb diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index 7db3a62af66..2fef921244e 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -1,7 +1,7 @@ # Template file for 'terragrunt' pkgname=terragrunt -version=0.16.5 -revision=1 +version=0.16.7 +revision=2 build_style=go short_desc="A thin wrapper for Terraform that provides extra tools" maintainer="Andrea Brancaleoni " @@ -11,7 +11,7 @@ license="MIT" go_import_path="github.com/gruntwork-io/$pkgname" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=6a237e5b7e51e0af328fa182875c5bd98a4e7370bfdaa6bbebde2d2bf2d92ef0 +checksum=16d0524f10649312834eef46d082316876811404b6a7a706beddd0d86b588ecf pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template index 2abc74aefd4..178223ce9b4 100644 --- a/srcpkgs/tinycron/template +++ b/srcpkgs/tinycron/template @@ -1,7 +1,7 @@ # Template file for 'tinycron' pkgname=tinycron version=0.4 -revision=11 +revision=12 build_style=go go_import_path="github.com/bcicen/tinycron" hostmakedepends="git" diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template index b357b923b46..48e589e370f 100644 --- a/srcpkgs/tp_smapi-dkms/template +++ b/srcpkgs/tp_smapi-dkms/template @@ -11,7 +11,6 @@ homepage="http://www.thinkwiki.org/wiki/Tp_smapi" distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz" checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110 -triggers="dkms" dkms_modules="tp_smapi ${version}" depends="dkms" diff --git a/srcpkgs/treesheets/template b/srcpkgs/treesheets/template index 5b1a56f2fb5..400f9e19d6d 100644 --- a/srcpkgs/treesheets/template +++ b/srcpkgs/treesheets/template @@ -1,7 +1,7 @@ # Template file for 'treesheets' pkgname=treesheets version=1.0.0 -revision=3 +revision=4 build_style=gnu-makefile makedepends="wxWidgets-devel" short_desc="Free Form Data Organizer" diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template index 6e7aa5796a4..7a85284c7e7 100644 --- a/srcpkgs/tryton/template +++ b/srcpkgs/tryton/template @@ -1,7 +1,7 @@ # Template file for 'tryton' pkgname=tryton -version=4.8.4 -revision=2 +version=4.8.5 +revision=1 noarch=yes build_style=python2-module pycompile_module="tryton" @@ -12,7 +12,7 @@ maintainer="cr6git " license="GPL-3.0-or-later" homepage="https://www.tryton.org" distfiles="${PYPI_SITE}/t/tryton/tryton-${version}.tar.gz" -checksum=6cf3091424853e1270d61f3a9b15ad8e6b36a44c28becf216c324ca8dc1474b0 +checksum=43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4 post_install() { vinstall tryton.desktop 644 usr/share/applications diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template index 098828a597e..d852220d55a 100644 --- a/srcpkgs/tumbler/template +++ b/srcpkgs/tumbler/template @@ -1,7 +1,7 @@ # Template file for 'tumbler'. pkgname=tumbler version=0.2.1 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-gstreamer-thumbnailer" hostmakedepends="intltool pkg-config glib-devel" diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template index de06b86569a..845d36076e8 100644 --- a/srcpkgs/umoci/template +++ b/srcpkgs/umoci/template @@ -1,7 +1,7 @@ # Template file for 'umoci' pkgname=umoci version=0.4.0 -revision=1 +revision=2 build_style=go go_import_path=github.com/openSUSE/umoci go_package="${go_import_path}/cmd/${pkgname}" diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index ca9cc486eb8..d34fd9ea31d 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,7 +1,7 @@ # Template file for 'vala' pkgname=vala -version=0.40.8 -revision=2 +version=0.40.9 +revision=1 build_style=gnu-configure hostmakedepends="flex libxslt pkg-config automake libtool" makedepends="libfl-devel libglib-devel" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://live.gnome.org/Vala" changelog="https://raw.githubusercontent.com/GNOME/vala/0.40/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=5c35e087a7054e9f0a514a0c1f1d0a0d7cf68d3e43c1dbeb840f9b0d815c0fa5 +checksum=c7ff0480779b2d78d6ff78f5fd165b3ba972e4fa9e9da1b411ff4375a78c6a7b pre_configure() { # https://gitlab.gnome.org/GNOME/vala/issues/596 diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 5938216de69..3689292d162 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,7 +2,7 @@ pkgname=vba-m reverts=1292_2 version=2.1.0 -revision=2 +revision=3 _subversion=Beta-3 wrksrc="visualboyadvance-m-${_subversion}" build_style=cmake diff --git a/srcpkgs/vdrift/template b/srcpkgs/vdrift/template index 2a6d38d3ab4..e3164ecb601 100644 --- a/srcpkgs/vdrift/template +++ b/srcpkgs/vdrift/template @@ -1,12 +1,12 @@ # Template file for 'vdrift' pkgname=vdrift version=2014.10.20 -revision=6 -wrksrc="${pkgname}" +revision=7 +wrksrc="$pkgname" build_style=scons -make_build_args="release=1 force_feedback=1 extbullet=1 datadir=share/$pkgname" -make_install_args="${make_build_args}" -hostmakedepends="pkg-config scons" +make_build_args="release=1 force_feedback=1 extbullet=1 datadir=share/${pkgname}" +make_install_args="$make_build_args" +hostmakedepends="pkg-config" makedepends="asio libcurl-devel bullet-devel SDL2_image-devel glew-devel libvorbis-devel libarchive-devel MesaLib-devel" depends="vdrift-data-${version}_${revision}" @@ -29,7 +29,7 @@ post_install() { usr/share/icons/hicolor/${f}x${f}/apps vdrift.png done vinstall data/textures/icons/vdrift-64x64.png 644 \ - usr/share/pixmapgs vdrift.png + usr/share/pixmaps vdrift.png } vdrift-data_package() { diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template index 718e160025a..5837725294f 100644 --- a/srcpkgs/vhba-module-dkms/template +++ b/srcpkgs/vhba-module-dkms/template @@ -11,7 +11,6 @@ homepage="http://cdemu.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.bz2" checksum=7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec -triggers="dkms" dkms_modules="vhba-module ${version}" depends="dkms" diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template index d4c8d6247c5..8c2f3f7c04c 100644 --- a/srcpkgs/vndr/template +++ b/srcpkgs/vndr/template @@ -1,7 +1,7 @@ # Template file for 'vndr' pkgname=vndr version=0.0.2 -revision=3 +revision=4 build_style=go go_import_path=github.com/LK4D4/vndr short_desc="Stupid vendoring tool" diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template index 281c4337a63..c1cb0b678a5 100644 --- a/srcpkgs/webcat/template +++ b/srcpkgs/webcat/template @@ -1,7 +1,7 @@ # Template file for 'webcat' pkgname=webcat version=1.0 -revision=14 +revision=15 go_import_path="github.com/thypon/webcat" build_style=go hostmakedepends="git" diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template index 402873630d7..cd92da5988b 100644 --- a/srcpkgs/websocketd/template +++ b/srcpkgs/websocketd/template @@ -1,7 +1,7 @@ # Template file for 'websocketd' pkgname=websocketd version=0.3.0 -revision=5 +revision=6 build_style=go hostmakedepends="git" short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server" diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template index 78b4ca240c8..9decaaac70b 100644 --- a/srcpkgs/wego/template +++ b/srcpkgs/wego/template @@ -1,7 +1,7 @@ # Template file for 'wego' pkgname=wego version=2.0 -revision=12 +revision=13 hostmakedepends="git" build_style=go go_import_path=github.com/schachmat/wego diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template index 09c9e9c85c9..5ee25d00f28 100644 --- a/srcpkgs/winetricks/template +++ b/srcpkgs/winetricks/template @@ -1,6 +1,6 @@ # Template file for 'winetricks' pkgname=winetricks -version=20180603 +version=20180815 revision=1 noarch=yes build_style=gnu-makefile @@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://wiki.winehq.org/$pkgname" distfiles="https://github.com/Winetricks/$pkgname/archive/$version.tar.gz" -checksum=66d8b48e001136d6d68b4c467c740753c56becceab9138632b479cb6c559074f +checksum=6dc22357ea1f857b7283250f7c6a68b9dee97e672bbea9a9c45c573d73634200 diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template index 83cca0ce838..38ac8dc9d22 100644 --- a/srcpkgs/winusb/template +++ b/srcpkgs/winusb/template @@ -1,16 +1,16 @@ # Template file for 'winusb' pkgname=winusb version=1.0.11 -revision=7 +revision=8 only_for_archs="i686 x86_64 i686-musl x86_64-musl" build_style=gnu-configure configure_args="--with-wx-config=wx-config-3.0" hostmakedepends="pkg-config" makedepends="wxWidgets-devel ntfs-3g parted desktop-file-utils hicolor-icon-theme" -short_desc="Simple tool that enable you to create your own usb stick windows installer" +short_desc="Simple tool to create your own usb stick windows installer" depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://en.congelli.eu/prog_info_winusb.html" distfiles="https://mirror.netcologne.de/gentoo/distfiles/winusb-${version}.tar.gz" checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9 diff --git a/srcpkgs/wireguard-go/template b/srcpkgs/wireguard-go/template index 07e01d4b1f0..3093ad512f1 100644 --- a/srcpkgs/wireguard-go/template +++ b/srcpkgs/wireguard-go/template @@ -1,7 +1,7 @@ # Template file for 'wireguard-go' pkgname=wireguard-go version=0.0.20180613 -revision=1 +revision=2 build_style=go go_import_path="git.zx2c4.com/wireguard-go" hostmakedepends="git dep" diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index ffeee0478bf..feee9ad7b19 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -15,7 +15,6 @@ homepage="https://www.wireguard.com/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" checksum=3e351c42d22de427713f1da06d21189c5896a694a66cf19233a7c33295676f19 -triggers="dkms" dkms_modules="wireguard ${version}" post_extract() { diff --git a/srcpkgs/wireshark/patches/musl.patch b/srcpkgs/wireshark/patches/musl.patch deleted file mode 100644 index bf8ef1cafda..00000000000 --- a/srcpkgs/wireshark/patches/musl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- extcap/androiddump.c.orig 2017-07-24 08:03:06.774036710 +0200 -+++ extcap/androiddump.c 2017-07-24 08:03:14.366030335 +0200 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "ui/failure_message.h" - ---- extcap/udpdump.c.orig 2017-07-19 18:55:06.000000000 +0200 -+++ extcap/udpdump.c 2017-07-24 10:37:17.432127817 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_SYS_SOCKET_H - #include diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 877770e457a..24da5eaa1cd 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.4.8 +version=2.6.2 revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua @@ -15,7 +15,7 @@ maintainer="Enno Boland " homepage="https://www.wireshark.org" license="GPL-2.0-or-later" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=db8ed7828c157e4ffb91fb8c41fa5a2f37fd44259175951a5c37848bf641f5e8 +checksum=49b2895ee3ba17ef9ef0aebfdc4d32a778e0f36ccadde184516557d5f3357094 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" @@ -30,7 +30,7 @@ post_install() { # Headers vmkdir $_includeDir - vcopy "config.h register.h ws_symbol_export.h" $_includeDir + vcopy "config.h ws_symbol_export.h" $_includeDir for i in wiretap wsutil; do vmkdir $_includeDir/$i diff --git a/srcpkgs/wxMaxima/template b/srcpkgs/wxMaxima/template index 5b476825c4c..19614a00e5b 100644 --- a/srcpkgs/wxMaxima/template +++ b/srcpkgs/wxMaxima/template @@ -1,7 +1,7 @@ # Template file for 'wxMaxima' pkgname=wxMaxima version=16.12.2 -revision=3 +revision=4 wrksrc="wxmaxima-${version}" build_style=gnu-configure configure_args="--with-wx-config=wx-config-3.0 --enable-printing" diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index 6a9403888bf..fcbc2e4d7c4 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -1,7 +1,7 @@ # Template file for 'wxPython' pkgname=wxPython version=3.0.2.0 -revision=7 +revision=8 wrksrc="${pkgname}-src-${version}" hostmakedepends="pkg-config" makedepends=" diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index 8fc8528915b..bb7cefc2d23 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,13 +1,13 @@ # Template file for 'wxWidgets' pkgname=wxWidgets version=3.0.4 -revision=3 +revision=5 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify --enable-mediactrl" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel - libXinerama-devel libmspack-devel SDL-devel glu-devel webkitgtk2-devel + libXinerama-devel libmspack-devel SDL2-devel glu-devel webkitgtk2-devel gstreamer1-devel gst-plugins-base1-devel" short_desc="The wxWidgets GUI toolkit library (version 3)" maintainer="Martin Riese " diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template index 4b33fa0c495..f9f98b63775 100644 --- a/srcpkgs/xboxdrv/template +++ b/srcpkgs/xboxdrv/template @@ -3,7 +3,7 @@ pkgname=xboxdrv version=0.8.8 revision=1 build_style=scons -hostmakedepends="scons unzip pkg-config glib-devel dbus-glib-devel" +hostmakedepends="unzip pkg-config glib-devel dbus-glib-devel" makedepends="boost-devel libX11-devel eudev-libudev-devel libusb-devel dbus-glib-devel glib-devel" short_desc="Xbox Gamepad Userspace Driver" maintainer="Andrea Brancaleoni " diff --git a/srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders b/srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders new file mode 100755 index 00000000000..8520253d79d --- /dev/null +++ b/srcpkgs/xbps-triggers/files/gdk-pixbuf-loaders @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Updates's GDK Pixbuf loaders cache with gdk-pixbuf-query-loaders(1). +# +# Arguments: $ACTION = [run/targets] +# $TARGET = [post-install/post-remove] +# $PKGNAME +# $VERSION +# $UPDATE = [yes/no] +# +ACTION="$1" +TARGET="$2" +PKGNAME="$3" +VERSION="$4" +UPDATE="$5" + +export PATH="$PATH:/usr/local/bin" + +pixbuf_bin=usr/bin/gdk-pixbuf-query-loaders +pixbuf_cache=usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + +case "$ACTION" in +targets) + echo "post-install pre-remove post-remove" + ;; +run) + [ ! -x ${pixbuf_bin} ] && exit 0 + + if [ "$TARGET" = "pre-remove" -a "${PKGNAME}" = "gdk-pixbuf" ]; then + [ -f ${pixbuf_cache} ] && rm -f ${pixbuf_cache} + break + fi + case "$TARGET" in + post-*) + if [ -f etc/gtk-2.0/gdk-pixbuf.loaders ]; then + echo " Removing obsolete conf file: etc/gtk-2.0/gdk-pixbuf.loaders" + rm -f etc/gtk-2.0/gdk-pixbuf.loaders + fi + if [ -x ${pixbuf_bin} ]; then + echo "Updating GDK Pixbuf loaders cache..." + ${pixbuf_bin} --update-cache + fi + ;; + esac + ;; +*) + exit 1 + ;; +esac + +exit 0 diff --git a/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders b/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders index 8520253d79d..802b4898996 100755 --- a/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders +++ b/srcpkgs/xbps-triggers/files/gtk-pixbuf-loaders @@ -1,51 +1,6 @@ #!/bin/sh # -# Updates's GDK Pixbuf loaders cache with gdk-pixbuf-query-loaders(1). +# This trigger retains the old name of the current 'gdk-pixbuf-loaders' trigger +# and redirects all args there # -# Arguments: $ACTION = [run/targets] -# $TARGET = [post-install/post-remove] -# $PKGNAME -# $VERSION -# $UPDATE = [yes/no] -# -ACTION="$1" -TARGET="$2" -PKGNAME="$3" -VERSION="$4" -UPDATE="$5" - -export PATH="$PATH:/usr/local/bin" - -pixbuf_bin=usr/bin/gdk-pixbuf-query-loaders -pixbuf_cache=usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - -case "$ACTION" in -targets) - echo "post-install pre-remove post-remove" - ;; -run) - [ ! -x ${pixbuf_bin} ] && exit 0 - - if [ "$TARGET" = "pre-remove" -a "${PKGNAME}" = "gdk-pixbuf" ]; then - [ -f ${pixbuf_cache} ] && rm -f ${pixbuf_cache} - break - fi - case "$TARGET" in - post-*) - if [ -f etc/gtk-2.0/gdk-pixbuf.loaders ]; then - echo " Removing obsolete conf file: etc/gtk-2.0/gdk-pixbuf.loaders" - rm -f etc/gtk-2.0/gdk-pixbuf.loaders - fi - if [ -x ${pixbuf_bin} ]; then - echo "Updating GDK Pixbuf loaders cache..." - ${pixbuf_bin} --update-cache - fi - ;; - esac - ;; -*) - exit 1 - ;; -esac - -exit 0 +exec usr/libexec/xbps-triggers/gdk-pixbuf-loaders "$@" diff --git a/srcpkgs/xbps-triggers/files/pango-modules b/srcpkgs/xbps-triggers/files/pango-modules index 608e9716754..b4c52d6e31d 100755 --- a/srcpkgs/xbps-triggers/files/pango-modules +++ b/srcpkgs/xbps-triggers/files/pango-modules @@ -1,12 +1,18 @@ #!/bin/sh # -# Updates the list of pango modules with pango-querymodules(1). +# This is a reduced version for the pango-modules trigger which is now +# obsolete upstream. +# The pango-modulesquery binary was removed from upstream and isn't provided +# anymore by our 'pango' package # -# Arguments: $ACTION = [run/targets] -# $TARGET = [post-install/post-remove] -# $PKGNAME -# $VERSION -# $UPDATE = [yes/no] +# This reduced version just removes the pango.modules file if it exists during +# the removal of the 'pango' package +# +# Arguments: $ACTION = [run/targets] +# $TARGET = [post-remove] +# $PKGNAME +# $VERSION +# $UPDATE = [yes/no] # ACTION="$1" TARGET="$2" @@ -16,12 +22,11 @@ UPDATE="$5" export PATH="$PATH:/usr/local/bin" -pango_bin=usr/bin/pango-querymodules pango_modules=etc/pango/pango.modules case "$ACTION" in targets) - echo "post-install post-remove" + echo "post-remove" ;; run) if [ "$TARGET" = "post-remove" -a "${PKGNAME}" = "pango" ]; then @@ -31,18 +36,9 @@ run) fi break fi - case "$TARGET" in - post-*) - if [ -x ${pango_bin} ]; then - echo "Updating pango modules file..." - mkdir -p etc/pango - ${pango_bin} > ${pango_modules} - fi - ;; - esac ;; *) - exit 1 + exit 0 ;; esac diff --git a/srcpkgs/xbps-triggers/files/virtualpkg b/srcpkgs/xbps-triggers/files/virtualpkg deleted file mode 100755 index e9d9f29e15b..00000000000 --- a/srcpkgs/xbps-triggers/files/virtualpkg +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# This trigger converts virtualpkg conf files to the XBPS 0.33 format. -# -# Arguments: $ACTION = [run/targets] -# $TARGET = [post-install/pre-remove] -# $PKGNAME -# $VERSION -# $UPDATE = [yes/no] -# -ACTION="$1" -TARGET="$2" -PKGNAME="$3" -VERSION="$4" -UPDATE="$5" -CONF_FILE="$6" - -export PATH="$PATH:/usr/local/bin" - -case "$ACTION" in -targets) - echo "post-install" - ;; -run) - for f in etc/xbps/virtualpkg.d/*.conf; do - if [ ! -r "${f}" ]; then - continue - fi - file=$(basename $f) - file=${file%.conf} - if [ -f etc/xbps/virtualpkg.d/${file}.vpkg ]; then - continue - fi - echo "Generating virtualpkg configuration file for: ${file} ..." - cat "$f" | while read line; do - pkg=$(echo "$line"|awk '{print $2}') - vpkg=$(echo "$line"|awk '{print $6}') - vpkg="$(echo $vpkg|sed 's,",,g')" - if [ "$pkg" = "Virtual" ]; then - echo "$line" > etc/xbps/virtualpkg.d/${file}.vpkg - else - echo "virtualpkg=${vpkg}:${pkg}" >> etc/xbps/virtualpkg.d/${file}.vpkg - fi - done - done - ;; -*) - exit 1 - ;; -esac - -exit 0 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index cc173798d5a..6b00b42f5d7 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.105 +version=0.108 revision=1 noarch=yes bootstrap=yes diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template index 8f4781275a4..ac1e2bd0556 100644 --- a/srcpkgs/xchm/template +++ b/srcpkgs/xchm/template @@ -1,7 +1,7 @@ # Template file for 'xchm' pkgname=xchm version=1.23 -revision=5 +revision=6 build_style=gnu-configure makedepends="libchmlib-devel wxWidgets-devel" short_desc="The CHM viewer for Unix" diff --git a/srcpkgs/xcircuit/template b/srcpkgs/xcircuit/template new file mode 100644 index 00000000000..0661e76b9f0 --- /dev/null +++ b/srcpkgs/xcircuit/template @@ -0,0 +1,23 @@ +# Template file for 'xcircuit' +pkgname=xcircuit +version=3.9.73 +revision=1 +build_style=gnu-configure +make_build_args="ACLOCAL=aclocal AUTOMAKE=automake" +hostmakedepends="automake pkg-config" +makedepends="cairo-devel libXpm-devel libXt-devel tk-devel" +short_desc="Drawing publishable-quality electrical circuit schematic diagrams" +maintainer="cr6git " +license="GPL-2.0-only" +homepage="http://opencircuitdesign.com/xcircuit/" +distfiles="http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz" +checksum=4f0e7c9630775a9624568ccd6e312941e2d6fa46a44f6012a99fde1bbd8249ce + +nocross="https://travis-ci.org/void-linux/void-packages/jobs/418553273#L1197 + https://travis-ci.org/void-linux/void-packages/jobs/418553274#L1184" + +post_install() { + vmkdir usr/share/man/man1 + mv ${DESTDIR}/usr/lib/xcircuit-${version%.*}/man/* ${DESTDIR}/usr/share/man/man1/ + rm -rf ${DESTDIR}/usr/lib/xcircuit-${version%.*}/man +} diff --git a/srcpkgs/xf86-video-vmware/patches/gcc82.patch b/srcpkgs/xf86-video-vmware/patches/gcc82.patch new file mode 100644 index 00000000000..f9ee9b0b631 --- /dev/null +++ b/srcpkgs/xf86-video-vmware/patches/gcc82.patch @@ -0,0 +1,157 @@ +--- src/vmware.h 2018-05-11 17:43:24.776710047 +0200 ++++ src/vmware.h.new 2018-05-11 17:45:16.599821536 +0200 +@@ -83,7 +83,7 @@ + + typedef struct { + EntityInfoPtr pEnt; +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + struct pci_device *PciInfo; + #else + pciVideoPtr PciInfo; +@@ -207,7 +207,7 @@ + /* Undefine this to kill all acceleration */ + #define ACCELERATE_OPS + +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + #define VENDOR_ID(p) (p)->vendor_id + #define DEVICE_ID(p) (p)->device_id + #define SUBVENDOR_ID(p) (p)->subvendor_id +--- src/vmware.c 2018-05-11 17:28:30.612158774 +0200 ++++ src/vmware.c.new 2018-05-11 17:38:40.108785284 +0200 +@@ -341,7 +341,7 @@ + SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32); + } else { + /* Note: This setting of valueReg causes unaligned I/O */ +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + pVMWARE->portIOBase = pVMWARE->PciInfo->regions[0].base_addr; + #else + pVMWARE->portIOBase = pVMWARE->PciInfo->ioBase[0]; +@@ -383,7 +383,7 @@ + } + pVMWARE->suspensionSavedRegId = id; + +-#if !XSERVER_LIBPCIACCESS ++#ifndef XSERVER_LIBPCIACCESS + pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device, + pVMWARE->PciInfo->func); + #endif +@@ -727,13 +727,13 @@ + VMWAREMapMem(ScrnInfoPtr pScrn) + { + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + int err; + struct pci_device *const device = pVMWARE->PciInfo; + void *fbBase; + #endif + +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + err = pci_device_map_range(device, + pVMWARE->memPhysBase, + pVMWARE->videoRam, +@@ -770,7 +770,7 @@ + + VmwareLog(("Unmapped: %p/%u\n", pVMWARE->FbBase, pVMWARE->videoRam)); + +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->FbBase, pVMWARE->videoRam); + #else + xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->FbBase, pVMWARE->videoRam); +@@ -1045,7 +1045,7 @@ + VMWAREInitFIFO(ScrnInfoPtr pScrn) + { + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + struct pci_device *const device = pVMWARE->PciInfo; + int err; + void *mmioVirtBase; +@@ -1058,7 +1058,7 @@ + + pVMWARE->mmioPhysBase = vmwareReadReg(pVMWARE, SVGA_REG_MEM_START); + pVMWARE->mmioSize = vmwareReadReg(pVMWARE, SVGA_REG_MEM_SIZE) & ~3; +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + err = pci_device_map_range(device, pVMWARE->mmioPhysBase, + pVMWARE->mmioSize, + PCI_DEV_MAP_FLAG_WRITABLE, +@@ -1099,7 +1099,7 @@ + TRACEPOINT + + vmwareWriteReg(pVMWARE, SVGA_REG_CONFIG_DONE, 0); +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); + #else + xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); +--- src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200 ++++ src/vmware_bootstrap.c.new 2018-05-11 21:02:11.228289137 +0200 +@@ -91,7 +91,7 @@ + VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \ + "." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL) + +-#if !XSERVER_LIBPCIACCESS ++#ifndef XSERVER_LIBPCIACCESS + static const char VMWAREBuildStr[] = "VMware Guest X Server " + VMWARE_DRIVER_VERSION_STRING " - build=$Name$\n"; + #else +@@ -127,7 +127,7 @@ + #define vmwareLegacyRes NULL + #endif + +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + #define VENDOR_ID(p) (p)->vendor_id + #define DEVICE_ID(p) (p)->device_id + #define SUBVENDOR_ID(p) (p)->subvendor_id +@@ -141,7 +141,7 @@ + #define CHIP_REVISION(p) (p)->chipRev + #endif + +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + + #define VMWARE_DEVICE_MATCH(d, i) \ + {PCI_VENDOR_ID_VMWARE, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) } +@@ -220,7 +220,7 @@ + static Bool + VMwarePreinitStub(ScrnInfoPtr pScrn, int flags) + { +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + struct pci_device *pciInfo; + #else + pciVideoPtr pciInfo; +@@ -270,7 +270,7 @@ + return (*pScrn->PreInit)(pScrn, flags); + }; + +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + static Bool + VMwarePciProbe (DriverPtr drv, + int entity_num, +@@ -520,7 +520,7 @@ + VMWARE_DRIVER_VERSION, + vmware_driver_name, + VMWAREIdentify, +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + NULL, + #else + VMWAREProbe, +@@ -532,7 +532,7 @@ + VMWareDriverFunc, + #endif + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 4 +-#if XSERVER_LIBPCIACCESS ++#ifdef XSERVER_LIBPCIACCESS + VMwareDeviceMatch, + VMwarePciProbe, + #else diff --git a/srcpkgs/xob/patches/0001-fix-linking-order.patch b/srcpkgs/xob/patches/0001-fix-linking-order.patch new file mode 100644 index 00000000000..8fef69b4d70 --- /dev/null +++ b/srcpkgs/xob/patches/0001-fix-linking-order.patch @@ -0,0 +1,21 @@ +From f9fc63952749b7bb9d03778dbe68666160a97e4b Mon Sep 17 00:00:00 2001 +From: Guillaume Babin <645219+gbabin@users.noreply.github.com> +Date: Wed, 22 Aug 2018 21:00:49 +0200 +Subject: [PATCH] Fix #4: Change position of LDFLAGS in Makefile + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- Makefile ++++ Makefile +@@ -16,7 +16,7 @@ MANPREFIX ?= $(PREFIX)/share/man + all: $(PROGRAM) + + $(PROGRAM): $(OBJECTS) +- $(CC) $(LDFLAGS) -o $@ $(OBJECTS) ++ $(CC) -o $@ $(OBJECTS) $(LDFLAGS) + + %.o: %.c %.h + $(CC) $(CFLAGS) -c -o $@ $< + diff --git a/srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch b/srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch new file mode 100644 index 00000000000..7d517eddd8c --- /dev/null +++ b/srcpkgs/xob/patches/0002-Set-a-WM_CLASS-for-the-bar-X-window.patch @@ -0,0 +1,40 @@ +From 1cadc7055718138f6ea31765970ca72b7414532e Mon Sep 17 00:00:00 2001 +From: Florent C +Date: Wed, 22 Aug 2018 17:02:05 +0200 +Subject: [PATCH] Fix #3: Set a WM_CLASS for the bar X window + +--- + src/display.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/display.c b/src/display.c +index db451e0..a229647 100644 +--- src/display.c ++++ src/display.c +@@ -17,6 +17,8 @@ + + #include "display.h" + ++#include ++ + /* Keep value in range */ + static int fit_in(int value, int min, int max) + { +@@ -133,6 +135,16 @@ display_context_t init(style_t conf) + DefaultVisual(dc.x.display, dc.x.screen_number), CWOverrideRedirect, + &window_attributes); + ++ /* Set a WM_CLASS for the window */ ++ XClassHint *class_hint = XAllocClassHint(); ++ if (class_hint != NULL) ++ { ++ class_hint->res_name = DEFAULT_CONFIG_APPNAME; ++ class_hint->res_class = DEFAULT_CONFIG_APPNAME; ++ XSetClassHint(dc.x.display, dc.x.window, class_hint); ++ XFree(class_hint); ++ } ++ + /* The new window is not mapped yet */ + dc.x.mapped = False; + + diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template new file mode 100644 index 00000000000..824683611bf --- /dev/null +++ b/srcpkgs/xob/template @@ -0,0 +1,15 @@ +# Template file for 'xob' +pkgname=xob +version=0.1 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="libX11-devel libconfig-devel" +short_desc="Lightweight overlay bar for the X Window System" +maintainer="maxice8 " +license="GPL-3.0-or-later" +homepage="https://github.com/florentc/xob" +distfiles="https://github.com/florentc/xob/archive/v${version}.tar.gz" +checksum=751d148fdf2bfa4779f05afa22673653b3475ab0418d4803162d2e4a3097f896 + +LDFLAGS="-lX11 -lconfig" diff --git a/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch new file mode 100644 index 00000000000..2bb22bee0b6 --- /dev/null +++ b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch @@ -0,0 +1,11 @@ +--- meson.build ++++ meson.build +@@ -507,7 +507,7 @@ glx_inc = include_directories('glx') + + top_srcdir_inc = include_directories('.') + +-serverconfigdir = join_paths(get_option('libdir'), 'xorg') ++serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg') + + manpage_config = configuration_data() + manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version())) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 6f216e8298e..94870ed8ee1 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.1 -revision=6 +revision=7 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template index 9df3b5ace97..7f98670765a 100644 --- a/srcpkgs/xournal/template +++ b/srcpkgs/xournal/template @@ -1,7 +1,7 @@ # Template file for 'xournal' pkgname=xournal version=0.4.8.2016 -revision=1 +revision=3 build_style=gnu-configure make_install_args="desktop-install" hostmakedepends="autoconf automake pkg-config" diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 9acc917f5b7..d8e27f0c7b6 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,7 +1,7 @@ # Template file for 'xpra' pkgname=xpra -version=2.3.2 -revision=2 +version=2.3.3 +revision=1 build_style=python2-module pycompile_module="xpra" hostmakedepends="pkg-config python-Cython" @@ -13,9 +13,9 @@ short_desc="Like screen(1) for X" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://xpra.org/" -#changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog" +changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog" distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz" -checksum=26da705a555f58b0e20b07333faaae824bbb66590dd50b95628ab7413ab5970b +checksum=01ec864d09dc342a17a4690da6abaff7382bf0a311d8556759f460275bdbfbab conf_files=" /etc/xpra/xpra.conf /etc/xpra/xorg.conf diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template index b7a0d9c2f37..a75ee034e82 100644 --- a/srcpkgs/xreader/template +++ b/srcpkgs/xreader/template @@ -1,7 +1,7 @@ # Template file for 'xreader' pkgname=xreader version=1.8.5 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-introspection --disable-thumbnailer" hostmakedepends="mate-common" diff --git a/srcpkgs/xsettingsd/template b/srcpkgs/xsettingsd/template index b2c1a1d95a6..3751553b78f 100644 --- a/srcpkgs/xsettingsd/template +++ b/srcpkgs/xsettingsd/template @@ -1,16 +1,16 @@ # Template file for 'xsettingsd' pkgname=xsettingsd version=1.0.0 -revision=1 +revision=2 build_style=scons -hostmakedepends="scons pkg-config libX11-devel" +hostmakedepends="pkg-config libX11-devel" makedepends="libX11-devel" short_desc="Daemon that implements the XSETTINGS specification" maintainer="Duncaen " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/derat/xsettingsd" distfiles="https://github.com/derat/xsettingsd/archive/v${version}.tar.gz" -checksum="fe0b895b999af94004dc2eabe6dd113c475e3464d548cfe4e545fc02978ba977" +checksum=fe0b895b999af94004dc2eabe6dd113c475e3464d548cfe4e545fc02978ba977 do_install() { vbin xsettingsd diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template index 5046fdd91dd..ae1d3c1b3db 100644 --- a/srcpkgs/xurls/template +++ b/srcpkgs/xurls/template @@ -1,7 +1,7 @@ # Template file for 'xurls' pkgname=xurls version=1.1.0 -revision=5 +revision=6 build_style=go go_import_path="github.com/mvdan/${pkgname}" go_package="${go_import_path}/cmd/${pkgname}" diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 20c9cc9bf14..14ababfe639 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2018.08.04 +version=2018.08.22 revision=1 noarch=yes wrksrc="$pkgname" @@ -14,7 +14,7 @@ license="Public Domain" homepage="http://rg3.github.io/youtube-dl/" changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=f582dc699e88699f0f9db9ba9188c1d072a10c630b319426622ffab5704a9dc1 +checksum=8042a70478eb62276eb752ab9196f9827b5a5f639307aa4a721d715a0b51c71b alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template index 0ea2948aaf7..7deb6c08f4e 100644 --- a/srcpkgs/youtube-viewer/template +++ b/srcpkgs/youtube-viewer/template @@ -1,7 +1,8 @@ # Template file for 'youtube-viewer' pkgname=youtube-viewer version=3.3.4 -revision=1 +revision=2 +noarch=yes build_style=perl-ModuleBuild hostmakedepends="perl-Module-Build" depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https" diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template index 057d749bc08..f8fad1bba7d 100644 --- a/srcpkgs/yq-go/template +++ b/srcpkgs/yq-go/template @@ -1,7 +1,7 @@ # Template file for 'yq-go' pkgname=yq-go version=2.1.2 -revision=1 +revision=2 wrksrc="yq-${version}" build_style=go go_import_path=github.com/mikefarah/yq diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template index 0b6685c56bb..0df50439fe2 100644 --- a/srcpkgs/zathura-pdf-poppler/template +++ b/srcpkgs/zathura-pdf-poppler/template @@ -1,18 +1,19 @@ # Template file for 'zathura-pdf-poppler' pkgname=zathura-pdf-poppler version=0.2.9 -revision=1 +revision=3 build_style=meson -maintainer="lemmi " hostmakedepends="pkg-config" makedepends="poppler-devel poppler-glib-devel zathura-devel" depends="zathura" -conflicts="zathura-pdf-mupdf>=0" -license="zlib" -homepage="http://pwmt.org/projects/zathura-pdf-poppler/" short_desc="PDF support for zathura (using poppler)" -distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=be0806116ea6e6c95495f5e244e0d70d2551a9058e5574b47d3e5a09bc6592dc +maintainer="lemmi " +license="Zlib" +homepage="http://pwmt.org/projects/zathura-pdf-poppler/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=34c5eb25f56cd01a3302d4bc8eb0b23e026e065d017405f3f2a30a02b9cd2530 + +conflicts="zathura-pdf-mupdf>=0" post_install() { vlicense LICENSE diff --git a/srcpkgs/zathura-pdf-poppler/update b/srcpkgs/zathura-pdf-poppler/update new file mode 100644 index 00000000000..30ff3e22a2f --- /dev/null +++ b/srcpkgs/zathura-pdf-poppler/update @@ -0,0 +1 @@ +site=https://git.pwmt.org/pwmt/zathura-pdf-poppler/tags diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 0d29ebfe074..f2289d8afef 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -18,7 +18,6 @@ homepage="http://zfsonlinux.org/" distfiles="https://github.com/zfsonlinux/zfs/archive/zfs-${version/r/-}.tar.gz" checksum=d17c57a5a06f476cd9658e8775a11ee8e1fc7d08cc99d74a5ef1509657c29a97 -triggers="dkms" dkms_modules="zfs ${version/r/-}" depends="dkms>=2.2.0.3_9 spl>=${version} perl"