Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] {awesome,picom,geteltorito}: cleanup template, adopt.
@ 2022-10-09 10:19 0x5c
  2022-10-10  2:14 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 1 reply; 2+ messages in thread
From: 0x5c @ 2022-10-09 10:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]

There is a new pull request by 0x5c against master on the void-packages repository

https://github.com/0x5c/void-packages adopt/many-packages
https://github.com/void-linux/void-packages/pull/39833

{awesome,picom,geteltorito}: cleanup template, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39833.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-adopt/many-packages-39833.patch --]
[-- Type: text/x-diff, Size: 4780 bytes --]

From 4b55ccc9d093908d53a09c8112b7cbc0b77477fc Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 9 Oct 2022 02:12:02 -0400
Subject: [PATCH 1/3] geteltorito: cleanup template, adopt.

Adoption related to #39559
---
 srcpkgs/geteltorito/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geteltorito/template b/srcpkgs/geteltorito/template
index 0b32584c9254..22fbbb017055 100644
--- a/srcpkgs/geteltorito/template
+++ b/srcpkgs/geteltorito/template
@@ -5,10 +5,10 @@ revision=2
 wrksrc=${pkgname}
 depends="perl"
 short_desc="El Torito boot image extractor"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-2.0-only"
 homepage="https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito"
-distfiles="${homepage}/${pkgname}-${version}.tar.gz"
+distfiles="https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/geteltorito-${version}.tar.gz"
 checksum=bb4fab8d4bedee1250762940b9f5d20fc7ac29fb2b5e9767c6af0a0955aa6bbe
 
 do_install() {

From 81bf153174a89a7b2adb2d1587c8a079585e5906 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 9 Oct 2022 03:23:29 -0400
Subject: [PATCH 2/3] picom: cleanup template, adopt.

Adding missing licence file and conf examples.
---
 srcpkgs/picom/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/picom/template b/srcpkgs/picom/template
index 8c35218384c2..35f40f3b52e2 100644
--- a/srcpkgs/picom/template
+++ b/srcpkgs/picom/template
@@ -1,7 +1,7 @@
 # Template file for 'picom'
 pkgname=picom
 version=9.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_docs=true"
 hostmakedepends="pkg-config asciidoc"
@@ -10,7 +10,7 @@ makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel
  libxdg-basedir-devel uthash"
 depends="desktop-file-utils"
 short_desc="Lightweight compositor for X11 (previously a compton fork)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="MIT, MPL-2.0"
 homepage="https://github.com/yshui/picom/"
 distfiles="https://github.com/yshui/picom/archive/v${version}.tar.gz"
@@ -18,7 +18,10 @@ checksum=8700ac71bd496c91262c8576e29cb3aecf2b4ef48c04394a929509d3cb37b87d
 
 post_install() {
 	vlicense LICENSES/MIT
+	vlicense COPYING
 	vsconf picom.sample.conf
+	vsconf compton-default-fshader-win.glsl
+	vsconf compton-fake-transparency-fshader-win.glsl
 }
 
 compton_package() {

From 3d7c5b870aa57f151553b6b3539679f260386847 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 9 Oct 2022 05:55:42 -0400
Subject: [PATCH 3/3] awesome: cleanup template, adopt.

xmlto is not longer being used by awesome's build system, which has also been
taking care of installing the desktop file to /usr/share/xsessions for some
time already.
The russian manual pages build without errors, and although I can't really
read russian, they look just fine to me.
---
 srcpkgs/awesome/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template
index 87e1101fbf50..0ccd54762495 100644
--- a/srcpkgs/awesome/template
+++ b/srcpkgs/awesome/template
@@ -1,19 +1,19 @@
 # Template file for 'awesome'
 pkgname=awesome
 version=4.3
-revision=8
+revision=9
 build_style=cmake
 build_helper="qemu"
 configure_args="-DSYSCONFDIR=/etc"
 conf_files="/etc/xdg/awesome/rc.lua"
-hostmakedepends="ruby-asciidoctor ImageMagick pkg-config xmlto"
+hostmakedepends="ruby-asciidoctor ImageMagick pkg-config"
 makedepends="libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel
  xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel
  startup-notification-devel libxdg-basedir-devel
  gdk-pixbuf-devel dbus-devel libxkbcommon-devel xcb-util-xrm-devel"
 depends="dbus-x11 pango"
 short_desc="Highly configurable, next gen framework window manager for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-2.0-or-later"
 homepage="http://awesomewm.org"
 distfiles="https://github.com/awesomeWM/awesome/releases/download/v${version}/awesome-${version}.tar.xz"
@@ -38,19 +38,12 @@ fi
 CFLAGS="-fcommon"
 
 pre_configure() {
-	# Russian manpages fail to build.
-	vsed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt
-
 	if [ "$build_option_jit" ]; then
 		# Use correct lua name
-		vsed -e "s|COMMAND lua\b|COMMAND luajit|" \
+		vsed -e 's|COMMAND lua\b|COMMAND luajit|' \
 			-i awesomeConfig.cmake \
 			-i tests/examples/CMakeLists.txt
-		vsed -e "s|LUA_COV_RUNNER lua\b|LUA_COV_RUNNER luajit|" \
+		vsed -e 's|LUA_COV_RUNNER lua\b|LUA_COV_RUNNER luajit|' \
 			-i tests/examples/CMakeLists.txt
 	fi
 }
-
-post_install() {
-	vinstall awesome.desktop 644 usr/share/xsessions
-}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: {awesome,picom,geteltorito}: cleanup template, adopt.
  2022-10-09 10:19 [PR PATCH] {awesome,picom,geteltorito}: cleanup template, adopt 0x5c
@ 2022-10-10  2:14 ` classabbyamp
  0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2022-10-10  2:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]

There's a merged pull request on the void-packages repository

{awesome,picom,geteltorito}: cleanup template, adopt.
https://github.com/void-linux/void-packages/pull/39833

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-10  2:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-09 10:19 [PR PATCH] {awesome,picom,geteltorito}: cleanup template, adopt 0x5c
2022-10-10  2:14 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).