From de298f79906479e65c2ce7f2256844dde057bfc4 Mon Sep 17 00:00:00 2001 From: Leonard Lorenz Date: Wed, 22 Jan 2020 23:21:59 +0100 Subject: [PATCH 1/7] sway: updated to 1.4. wlroots: updated to 0.10.0. wlroots-devel: updated to 0.10.0. --- common/shlibs | 2 +- srcpkgs/sway/template | 9 +++++---- srcpkgs/wlroots/template | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 35fcd4de243..1dc62e41f49 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3361,7 +3361,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1 -libwlroots.so.3 wlroots-0.6.0_1 +libwlroots.so.5 wlroots-0.10.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index a428a590d34..ea28b9f6a9a 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,19 +1,20 @@ # Template file for 'sway' pkgname=sway -version=1.2 -revision=2 +version=1.4 +revision=1 build_style=meson conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" makedepends="wlroots-devel wayland-devel wayland-protocols pcre-devel - json-c-devel pango-devel cairo-devel gdk-pixbuf-devel" + json-c-devel pango-devel cairo-devel gdk-pixbuf-devel xcb-util-errors-devel + xcb-util-wm-devel" depends="swaybg xorg-server-xwayland $(vopt_if elogind "elogind")" short_desc="Tiling Wayland compositor compatible with i3" maintainer="Juan RP " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=9f79382577ee132111c290b4d1a1a3e114ef485595c30cf5f181a11575bda846 +checksum=e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe build_options="elogind" desc_option_elogind="Uses elogind instead of setuid for privilege escalation" diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 75ddb338a15..cc6730bf5af 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,6 +1,6 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.8.1 +version=0.10.0 revision=1 build_style=meson configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind @@ -17,7 +17,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98 +checksum=9414ba761c321f9c2b3e0426e1bbed55443fa8f97d46643d1706d1ddd614f6cd post_install() { vlicense LICENSE From e6ea4e96db2ff447c6866fc4d0c0ac58e2ab46e0 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Wed, 22 Jan 2020 19:25:08 +0100 Subject: [PATCH 2/7] R-cran-farver: update to 2.0.3. --- srcpkgs/R-cran-farver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template index ef9114bae9e..5ee8f9ec269 100644 --- a/srcpkgs/R-cran-farver/template +++ b/srcpkgs/R-cran-farver/template @@ -1,13 +1,13 @@ # Template file for 'R-cran-farver' pkgname=R-cran-farver -version=2.0.2 +version=2.0.3 revision=1 build_style=R-cran short_desc="High Performance Colour Space Manipulation" maintainer="John " license="MIT" homepage="https://github.com/thomasp85/farver" -checksum=ddacbfb91e0dfc1283c6ffb94066d7e46baf8b42742a3172f1f6d70fe9cdd5cd +checksum=0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc post_install() { vlicense LICENSE From d7f697a96c2aa7d93f21f660b4c0849485b9840a Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Wed, 22 Jan 2020 20:16:59 +0100 Subject: [PATCH 3/7] DarkRadiant: update to 2.7.0. --- srcpkgs/DarkRadiant/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index 3e0530ff5ac..79251c17375 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant -version=2.6.0 -revision=4 +version=2.7.0 +revision=1 build_style=gnu-configure configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3" hostmakedepends="automake gettext libtool pkg-config" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/codereader/DarkRadiant/" distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz" -checksum=e46dc10a3a7521d64ba30a2eddfe2c8b75ef3ec12f155833e565ce04d21693ea +checksum=1166a6d87f0a54ca661ba9be83d350d657972a2aaecdde5b92ebfb7bc80458c7 pre_configure() { ./autogen.sh From 4db17b2e820204b6f991de5fbf07d2e880d560fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 22 Jan 2020 20:52:39 +0100 Subject: [PATCH 4/7] pcb: update to 4.2.2 I don't know why pcb requires a working tex binary, or does it? --- srcpkgs/pcb/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template index 2edbef0fd25..fc70b5fa73a 100644 --- a/srcpkgs/pcb/template +++ b/srcpkgs/pcb/template @@ -1,20 +1,21 @@ # Template file for 'pcb' pkgname=pcb reverts=20140316_4 -version=4.2.0 +version=4.2.2 revision=1 build_style=gnu-configure configure_args="--disable-update-desktop-database --disable-update-mime-database" -hostmakedepends="flex intltool pkg-config desktop-file-utils tk" +hostmakedepends="flex geda gerbv intltool netpbm pkg-config + desktop-file-utils tar texinfo tk" makedepends="gd-devel gtkglext-devel tk-devel" -depends="pcb-data geda" +depends="pcb-data geda gerbv" +checkdepends="ImageMagick ghostscript" short_desc="Interactive printed circuit board editor" maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://pcb.geda-project.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=cd4b36df6747789775812fb433f246d6bd5a27f3a16357d78d9c4c9b59c59a43 -broken="Requires working tex binary" +checksum=1ceeaf1bdbe0508b9b140ca421eb600836579114c04dee939341c5d594f36e5d pcb-data_package() { archs=noarch From dce881212a93a8e67826233fc691d5c7e16ea104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 22 Jan 2020 21:44:41 +0100 Subject: [PATCH 5/7] drbd-utils: update to 9.11.0 --- srcpkgs/drbd-utils/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/drbd-utils/template b/srcpkgs/drbd-utils/template index 923fd324fd2..c9b5fc27854 100644 --- a/srcpkgs/drbd-utils/template +++ b/srcpkgs/drbd-utils/template @@ -1,6 +1,6 @@ # Template file for 'drbd-utils' pkgname=drbd-utils -version=8.9.11 +version=9.11.0 revision=1 build_style=gnu-configure configure_args=" @@ -24,9 +24,9 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://www.drbd.org" makedepends="eudev-libudev-devel" -hostmakedepends="automake libtool flex pkg-config eudev libxslt docbook-xsl" -distfiles="https://www.drbd.org/download/drbd/utils/drbd-utils-$version.tar.gz" -checksum=c61878635c40536e7d689c65cbbe92ca982fa864cec20717c0af562f2a6c9c48 +hostmakedepends="automake libtool flex pkg-config eudev libxslt docbook-xsl po4a" +distfiles="https://www.linbit.com/downloads/drbd/utils/${pkgname}-${version}.tar.gz" +checksum=e07d156ce6e3d93ac1b69fa9bf8695038e6e5edfb2c80c91a1098d1477478ecb # Workaround a parallelism issue disable_parallel_build=yes From a8f6c8e9e49bf3c75d54d2ac3c614553ac01c676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 22 Jan 2020 21:49:09 +0100 Subject: [PATCH 6/7] po4a: needs gettext in hostmakedepends --- srcpkgs/po4a/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template index 7037d65a76d..2284fc2f004 100644 --- a/srcpkgs/po4a/template +++ b/srcpkgs/po4a/template @@ -5,7 +5,7 @@ revision=1 archs=noarch build_style=perl-ModuleBuild _perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak perl-SGMLSpm" -hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build libxslt docbook-xsl" +hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext libxslt docbook-xsl" makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build" depends="${_perldeps} opensp gettext" short_desc="PO for anything (po4a) project to ease translations using gettext tools" From 52f11c31588519cef0b548b8d35239169f21ca99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 22 Jan 2020 22:00:58 +0100 Subject: [PATCH 7/7] drbd-utils: fix cross build --- srcpkgs/drbd-utils/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/drbd-utils/template b/srcpkgs/drbd-utils/template index c9b5fc27854..652d01a42fd 100644 --- a/srcpkgs/drbd-utils/template +++ b/srcpkgs/drbd-utils/template @@ -3,6 +3,7 @@ pkgname=drbd-utils version=9.11.0 revision=1 build_style=gnu-configure +build_helper="qemu" configure_args=" --sbindir=/usr/bin \ --prefix=/usr \ @@ -41,11 +42,10 @@ pre_configure() { find -name "*.c" -exec sed -i "{}" -e 's#sys/poll\.h#poll.h#g' \; find -name Makefile.in -exec sed -i "{}" -e 's#$(DESTDIR)/lib#$(DESTDIR)/usr/lib#g' \; if [ -n "$CROSS_BUILD" ]; then - # Replace drbdsetup{,-83,84} with the /usr/bin or /usr/libexec counterparts - find -name Makefile.in -exec sed -i "{}" \ - -e 's#^\(\s\)../../user/v83/drbdsetup-83#\1/usr/libexec/drbdsetup-83#' \ - -e 's#^\(\s\)../../user/v84/drbdsetup-84#\1/usr/libexec/drbdsetup-84#' \ - -e 's#^\(\s\)../../user/v9/drbdsetup#\1/usr/bin/drbdsetup#' \ + # Replace drbdsetup{,-84,9} with the /usr/bin or /usr/libexec counterparts + find -name "Makefile*" -exec sed -i "{}" \ + -e 's#^\(\s\)$(TOPDIR)/user/v84/drbdsetup-84#\1/usr/libexec/drbdsetup-84#' \ + -e 's#^\(\s\)$(TOPDIR)/user/v9/drbdsetup#\1/usr/bin/drbdsetup#' \ \; fi }