From d08dbbb180effb9a216ff8cbd9c850e7385a747b Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 6 May 2021 19:38:35 -0700 Subject: [PATCH 01/11] omxplayer: fix license --- srcpkgs/omxplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index f20b056f406f..8ffe7a953722 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,10 +1,10 @@ # Template file for 'omxplayer' pkgname=omxplayer version=20190102 -revision=1 +revision=2 short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/popcornmix/omxplayer" _commit="f06235cc9690a6d58187514452df8cf8fcdaacec" From 36800c4b3c6ce1a063be6fb6233b16ac47d733fd Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 6 May 2021 20:04:44 -0700 Subject: [PATCH 02/11] onboard: fix license, other lint, skip tests --- srcpkgs/onboard/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template index 833a136ccb78..363717415643 100644 --- a/srcpkgs/onboard/template +++ b/srcpkgs/onboard/template @@ -1,10 +1,8 @@ # Template file for 'onboard' pkgname=onboard version=1.4.1 -revision=7 +revision=8 build_style=python3-module -pycompile_module="Onboard" -patch_args="-Np1" hostmakedepends="intltool pkg-config python3-distutils-extra" makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel libcanberra-devel libX11-devel libXi-devel libXtst-devel libxkbfile-devel @@ -12,7 +10,9 @@ makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel depends="iso-codes python3-cairo python3-gobject python3-dbus" short_desc="On-screen keyboard useful on tablet PCs or for mobility impaired users" maintainer="Francesco Circhetta " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://launchpad.net/onboard" distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz" checksum=01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865 +patch_args="-Np1" +make_check=no # requires a functional display to test From 8c0f7a041a9d2b6f0ec11e86b9b629345906cca2 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 6 May 2021 20:35:12 -0700 Subject: [PATCH 03/11] openbox: fix license, verify python version, vsed --- srcpkgs/openbox/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template index fb62d8d4fedb..bbc6012279fb 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -1,7 +1,7 @@ # Template file for 'openbox' pkgname=openbox version=3.6.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-startup-notification $(vopt_enable svg librsvg)" hostmakedepends="automake libtool pkg-config gettext-devel" @@ -15,11 +15,11 @@ conf_files=" /etc/xdg/openbox/autostart" short_desc="Standards compliant, fast, light-weight, extensible window manager" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.openbox.org" distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz" checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d -python_version=2 #unverified +python_version=2 # Package build options build_options="svg" @@ -31,9 +31,9 @@ pre_configure() { post_install() { rm ${DESTDIR}/usr/bin/{gdm-control,gnome-panel-control} - sed -i 's:startkde:/usr/bin/\0:' \ + vsed -i 's:startkde:/usr/bin/\0:' \ ${DESTDIR}/usr/share/xsessions/openbox-kde.desktop - sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \ + vsed -i 's:=gnome-session:=/usr/bin/gnome-session:' \ ${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop } openbox-devel_package() { From a9ebf5dbad9ea46692f29b465f24a99ad42ab011 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 10:53:01 -0700 Subject: [PATCH 04/11] opencsg: fix license, other lint, remove sed in do_build() --- srcpkgs/opencsg/template | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template index 7a3a63cf85d7..7b5e1cd8af06 100644 --- a/srcpkgs/opencsg/template +++ b/srcpkgs/opencsg/template @@ -1,21 +1,19 @@ # Template file for 'opencsg' - -pkgname="opencsg" -version="1.4.2" -revision=3 -short_desc="A library that does image-based CSG rendering using OpenGL" +pkgname=opencsg +version=1.4.2 +revision=4 +wrksrc="OpenCSG-${version}" +build_wrksrc="src" +makedepends="glew-devel libfreeglut-devel" +short_desc="Library for image-based CSG rendering using OpenGL" maintainer="Pierre Allegraud " -license="GPL-2" +license="GPL-2.0-only" homepage="http://www.opencsg.org" distfiles="http://www.opencsg.org/OpenCSG-${version}.tar.gz" checksum="d952ec5d3a2e46a30019c210963fcddff66813efc9c29603b72f9553adff4afb" -wrksrc="OpenCSG-${version}" -build_wrksrc="src" -makedepends="glew-devel libfreeglut-devel" do_build() { - sed -i 's@-Wl,-rpath,\.\./lib@@' Makefile # no rpath make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX" } From 0c0ed42909a809b2b23ef63866c92cb279485007 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 11:05:52 -0700 Subject: [PATCH 05/11] open-isns: fix license, remove superfluous post_extract, other lint --- srcpkgs/open-isns/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template index af670232cefb..a19070262746 100644 --- a/srcpkgs/open-isns/template +++ b/srcpkgs/open-isns/template @@ -1,23 +1,19 @@ # Template file for 'open-isns' pkgname=open-isns version=0.101 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-shared" -makedepends="openssl-devel" make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp" +makedepends="openssl-devel" conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf" short_desc="Server and client for iSNS" maintainer="Leah Neukirchen " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="https://github.com/open-iscsi/open-isns" distfiles="https://github.com/open-iscsi/open-isns/archive/v${version}.tar.gz" checksum=f672ec86b6c9e984843a7a28d76f07e26393499c486f86034b8b18caa8deb556 -post_extract() { - sed -i 's/ -Werror / /' configure -} - libisns_package() { short_desc+=" - library" pkg_install() { From 43774f2a830f8a08903268ebe550218e101c0831 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 11:10:49 -0700 Subject: [PATCH 06/11] openobex: fix license, remove superfluous sed --- srcpkgs/openobex/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template index 5fe6faa6089a..b151a9fd6d73 100644 --- a/srcpkgs/openobex/template +++ b/srcpkgs/openobex/template @@ -1,14 +1,14 @@ # Template file for 'openobex' pkgname=openobex version=1.7.2 -revision=2 +revision=3 wrksrc="${pkgname}-${version}-Source" build_style=cmake hostmakedepends="pkg-config libxslt docbook-xsl" makedepends="libusb-devel libbluetooth-devel eudev-libudev-devel" short_desc="OBEX protocol implementation" maintainer="Orphaned " -license="LGPL-2" +license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://dev.zuckschwerdt.org/openobex/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-Source.tar.gz" checksum=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc @@ -16,8 +16,7 @@ checksum=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc replaces="libopenobex>=0" pre_configure() { - sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' udev/openobex.rules.in - sed -i 's|^project ( openobex \(C.*\) )|project ( openobex \1 CXX )|' CMakeLists.txt + vsed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' udev/openobex.rules.in } openobex-devel_package() { From 229fe757052afcd05b4c8cd13a5316ab09c77811 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 11:19:16 -0700 Subject: [PATCH 07/11] openspades: fix license --- srcpkgs/openspades/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template index 216f6dcc3ca5..10a545e52d9b 100644 --- a/srcpkgs/openspades/template +++ b/srcpkgs/openspades/template @@ -4,7 +4,7 @@ # into a -data subpackage !!! pkgname=openspades version=0.1.3 -revision=2 +revision=3 archs="x86_64* i686*" create_wrksrc=true build_wrksrc="openspades-${version}" @@ -16,7 +16,7 @@ makedepends="SDL2_image-devel freealut-devel freetype-devel glew-devel depends="libopenal xdg-utils" short_desc="Compatible open source client of Ace of Spades 0.75 " maintainer="John " -license="GPL-3.0-or-later, OFL-1.1, OpenSpades-Non-GPL-Pak-License" +license="GPL-3.0-or-later, OFL-1.1, custom:OpenSpades-Non-GPL-Pak-License" homepage="http://openspades.yvt.jp/" distfiles="https://github.com/yvt/openspades/archive/v${version}.tar.gz https://github.com/yvt/openspades-paks/releases/download/r33/OpenSpadesDevPackage-r33.zip" From 803188012cb2197ded15de6b760758c08a649bbe Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 11:19:51 -0700 Subject: [PATCH 08/11] optipng: fix license --- srcpkgs/optipng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/optipng/template b/srcpkgs/optipng/template index 51fb818c6874..b636b58ec6ce 100644 --- a/srcpkgs/optipng/template +++ b/srcpkgs/optipng/template @@ -1,12 +1,12 @@ # Template file for 'optipng' pkgname=optipng version=0.7.7 -revision=1 +revision=2 hostmakedepends="pkg-config" makedepends="zlib-devel libpng-devel" short_desc="Advanced PNG Optimizer" maintainer="Orphaned " -license="zlib" +license="Zlib" homepage="http://optipng.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452 From 350f5b0eab112fc1476badf5017c0ac7bc2bca04 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 15:21:49 -0700 Subject: [PATCH 09/11] otpw: fix license, other lint --- srcpkgs/otpw/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/otpw/template b/srcpkgs/otpw/template index 03c9c86d6a19..95a6dcfb69b8 100644 --- a/srcpkgs/otpw/template +++ b/srcpkgs/otpw/template @@ -1,12 +1,12 @@ # Template file for 'otpw' pkgname=otpw version=1.5 -revision=5 +revision=6 conf_files="/etc/pam.d/ssh-otpw" makedepends="pam-devel" -short_desc="A one-time password login package" +short_desc="One-time password login package" maintainer="Duncan Overbruck " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.cl.cam.ac.uk/~mgk25/otpw.html" distfiles="https://www.cl.cam.ac.uk/%7Emgk25/download/otpw-${version}.tar.gz" checksum=98aca38a61c7713677b96f24426ca7053480c0fd077d91b1e99bc9f92ccb832a From d292d2c238f966e43c9811061f8015b501627b48 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 16:28:29 -0700 Subject: [PATCH 10/11] oue: clarify license, update distfile location --- srcpkgs/oue/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/oue/template b/srcpkgs/oue/template index 73b3a74b1e0d..603c3d34e6bf 100644 --- a/srcpkgs/oue/template +++ b/srcpkgs/oue/template @@ -1,16 +1,16 @@ # Template file for 'oue' pkgname=oue version=2.31 -revision=4 +revision=5 hostmakedepends="msrc_base-devel" makedepends="gdbm-devel" depends="msrc_base" short_desc="Only unique element filter" maintainer="Leah Neukirchen " -license="custom" +license="custom:MIT-0-like" homepage="http://www.databits.net/~ksb/msrc/local/bin/oue/oue.html" -distfiles="http://www.npcguild.org/~ksb/rpms/SOURCES/${pkgname}-${version}.tgz" -checksum=5b559a869ad7dabc8e45c4ce3e3a6bb3e22b8ee7d9e8ebb0e8a4fbf1ab56e821 +distfiles="http://www.databits.net/~ksb/dl/${pkgname}-${version}.tgz" +checksum=55248f7fd6cdfe56c3d09029624c4144503721058b24fcae664265afef8f2efd do_build() { CFLAGS+=" $LDFLAGS" From ec3055b6d31f8d503853b509a0f7f9a7b620ace4 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 7 May 2021 16:52:25 -0700 Subject: [PATCH 11/11] oxygen-gtk+: fix license, other lint --- srcpkgs/oxygen-gtk+/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/oxygen-gtk+/template b/srcpkgs/oxygen-gtk+/template index 3a7e133daf29..4d184eaad762 100644 --- a/srcpkgs/oxygen-gtk+/template +++ b/srcpkgs/oxygen-gtk+/template @@ -1,14 +1,14 @@ # Template file for 'oxygen-gtk+' pkgname=oxygen-gtk+ version=1.4.6 -revision=3 +revision=4 wrksrc="${pkgname//\+/2}-${version}" build_style=cmake hostmakedepends="pkg-config" makedepends="gtk+-devel" -short_desc="A port of the default KDE widget theme (Oxygen) to GTK2" +short_desc="Port of the default KDE widget theme (Oxygen) to GTK2" maintainer="TheNumb " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/playground/artwork/oxygen-gtk/" -distfiles="http://download.kde.org/stable/${pkgname//\+/2}/${version}/src/${pkgname//\+/2}-${version}.tar.bz2" +distfiles="${KDE_SITE}/${pkgname//\+/2}/${version}/src/${pkgname//\+/2}-${version}.tar.bz2" checksum=a289434347cc96054c75d1e4e4408b84adc2e8c7862f0be4e2da8fafbf26bf26