[PR PATCH] Fluxbox switch source

[PR PATCH] Fluxbox switch source

[zlice]

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

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

https://github.com/zlice/void-packages fluxbox_switch_source
https://github.com/void-linux/void-packages/pull/36863

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

#### Comments

Ran into issues with the sourceforge tar using pregenerated aclocal.m4/make files. Saw that github is getting commits here and there and the source has autogen.sh so I built from there.

There are a few file differences from the sourceforge tar. From what I can tell:

 - a `defaults.cc` generated by a makefile?
 - some `tests/` are in github that aren't in sourceforge
 - already made languages files in sourceforge
 - updated docs that aren't in sourceforge

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fluxbox_switch_source-36863.patch --]
[-- Type: text/x-diff, Size: 2900 bytes --]

From 675681709c4a5c674e41e8e83e88f9eb85aae414 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 22 Apr 2022 08:43:08 -0400
Subject: [PATCH 1/2] hexedit: update to 1.6.

---
 srcpkgs/hexedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexedit/template b/srcpkgs/hexedit/template
index a7840b7a3ddd..eb73aa150c1c 100644
--- a/srcpkgs/hexedit/template
+++ b/srcpkgs/hexedit/template
@@ -1,6 +1,6 @@
 # Template file for 'hexedit'
 pkgname=hexedit
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Jim Westfall <jwestfall@surrealistic.net>"
 license="GPL-2.0-or-later"
 homepage="http://rigaux.org"
 distfiles="https://github.com/pixel/hexedit/archive/${version}.tar.gz"
-checksum=27a2349f659e995d7731ad672450f61a2e950330049a6fb59b77490c5e0015ac
+checksum=598906131934f88003a6a937fab10542686ce5f661134bc336053e978c4baae3
 
 pre_configure() {
 	./autogen.sh

From 0186e58a3b8062462bec6de8c2717741d203cd98 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 25 Apr 2022 22:41:33 -0400
Subject: [PATCH 2/2] fluxbox: build from github

---
 srcpkgs/fluxbox/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index 3328421d91ac..266ca37b1e96 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -1,7 +1,8 @@
 # Template file for 'fluxbox'
 pkgname=fluxbox
 version=1.3.7
-revision=3
+revision=4
+wrksrc=fluxbox-Release-${version//./_}
 build_style=gnu-configure
 configure_args="--enable-nls
  ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
@@ -10,17 +11,21 @@ configure_args="--enable-nls
  ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
 hostmakedepends="pkg-config"
 makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel
- libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
+ libXext-devel libXinerama-devel libXrandr-devel fribidi-devel automake libtool
+ gettext gettext-devel"
 short_desc="Highly configurable and low resource X11 Window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.fluxbox.org"
 license="MIT"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0
+homepage="http://www.fluxbox.org"
+distfiles="https://github.com/fluxbox/fluxbox/archive/refs/tags/Release-${version//./_}.tar.gz"
+checksum=990414ae342a35c5703e5025a8bf019b0b4dada55d57071c51d3d498abb5cd36
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="${configure_args/enable-nls/disable-nls}" ;;
 esac
+pre_configure() {
+	./autogen.sh
+}
 post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
 	vlicense COPYING

Re: [PR PATCH] [Updated] Fluxbox switch source

[zlice]

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

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages fluxbox_switch_source
https://github.com/void-linux/void-packages/pull/36863

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

#### Comments

Ran into issues with the sourceforge tar using pregenerated aclocal.m4/make files. Saw that github is getting commits here and there and the source has autogen.sh so I built from there.

There are a few file differences from the sourceforge tar. From what I can tell:

 - a `defaults.cc` generated by a makefile?
 - some `tests/` are in github that aren't in sourceforge
 - already made languages files in sourceforge
 - updated docs that aren't in sourceforge

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fluxbox_switch_source-36863.patch --]
[-- Type: text/x-diff, Size: 1905 bytes --]

From 3650accd6fdaed71b70b6b20d2be5923faf9d809 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 25 Apr 2022 22:41:33 -0400
Subject: [PATCH] fluxbox: build from github

---
 srcpkgs/fluxbox/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index 3328421d91ac..266ca37b1e96 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -1,7 +1,8 @@
 # Template file for 'fluxbox'
 pkgname=fluxbox
 version=1.3.7
-revision=3
+revision=4
+wrksrc=fluxbox-Release-${version//./_}
 build_style=gnu-configure
 configure_args="--enable-nls
  ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
@@ -10,17 +11,21 @@ configure_args="--enable-nls
  ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
 hostmakedepends="pkg-config"
 makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel
- libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
+ libXext-devel libXinerama-devel libXrandr-devel fribidi-devel automake libtool
+ gettext gettext-devel"
 short_desc="Highly configurable and low resource X11 Window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.fluxbox.org"
 license="MIT"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0
+homepage="http://www.fluxbox.org"
+distfiles="https://github.com/fluxbox/fluxbox/archive/refs/tags/Release-${version//./_}.tar.gz"
+checksum=990414ae342a35c5703e5025a8bf019b0b4dada55d57071c51d3d498abb5cd36
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="${configure_args/enable-nls/disable-nls}" ;;
 esac
+pre_configure() {
+	./autogen.sh
+}
 post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
 	vlicense COPYING

Re: [PR REVIEW] Fluxbox switch source

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36863#discussion_r858870285

Comment:
automake, libtool, and gettext (and maybe gettext-devel) should probably be hostmakedeps

Re: [PR REVIEW] Fluxbox switch source

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36863#discussion_r858870863

Comment:
nitpick: add an empty line between the esac, this function, and the next function

Re: [PR PATCH] [Updated] Fluxbox switch source

[zlice]

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

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages fluxbox_switch_source
https://github.com/void-linux/void-packages/pull/36863

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

#### Comments

Ran into issues with the sourceforge tar using pregenerated aclocal.m4/make files. Saw that github is getting commits here and there and the source has autogen.sh so I built from there.

There are a few file differences from the sourceforge tar. From what I can tell:

 - a `defaults.cc` generated by a makefile?
 - some `tests/` are in github that aren't in sourceforge
 - already made languages files in sourceforge
 - updated docs that aren't in sourceforge

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fluxbox_switch_source-36863.patch --]
[-- Type: text/x-diff, Size: 1993 bytes --]

From 6c7bd4af3f7442fa50166cf7f75e07db918d2e68 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 25 Apr 2022 22:41:33 -0400
Subject: [PATCH] fluxbox: build from github

---
 srcpkgs/fluxbox/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index 3328421d91ac..db5c61f17e95 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -1,26 +1,32 @@
 # Template file for 'fluxbox'
 pkgname=fluxbox
 version=1.3.7
-revision=3
+revision=4
+wrksrc=fluxbox-Release-${version//./_}
 build_style=gnu-configure
 configure_args="--enable-nls
  ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
  ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
  ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
  ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake libtool gettext gettext-devel"
 makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel
  libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
 short_desc="Highly configurable and low resource X11 Window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.fluxbox.org"
 license="MIT"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0
+homepage="http://www.fluxbox.org"
+distfiles="https://github.com/fluxbox/fluxbox/archive/refs/tags/Release-${version//./_}.tar.gz"
+checksum=990414ae342a35c5703e5025a8bf019b0b4dada55d57071c51d3d498abb5cd36
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="${configure_args/enable-nls/disable-nls}" ;;
 esac
+
+pre_configure() {
+	./autogen.sh
+}
+
 post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
 	vlicense COPYING

Re: [PR REVIEW] Fluxbox switch source

[zlice]

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/36863#discussion_r858876726

Comment:
read but dont understand the diff. 1 for build and the other for some flag that installs sources for you or something?

Re: [PR REVIEW] Fluxbox switch source

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36863#discussion_r858882404

Comment:
for crossbuilds, hostmakedeps are installed for the host architecture (e.g. x86_64), while makedeps are installed for the target architecture (e.g. aarch64). Things needed during the build process like headers or shared libraries are usually going to be makedeps. Build tools and similar things, on the other hand, are usually going to be hostmakedeps, because they need to be able to be run by the build process.

Re: Fluxbox switch source

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36863#issuecomment-1171961483

Comment:
please rebase on master

Re: [PR PATCH] [Updated] Fluxbox switch source

[zlice]

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

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages fluxbox_switch_source
https://github.com/void-linux/void-packages/pull/36863

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

#### Comments

Ran into issues with the sourceforge tar using pregenerated aclocal.m4/make files. Saw that github is getting commits here and there and the source has autogen.sh so I built from there.

There are a few file differences from the sourceforge tar. From what I can tell:

 - a `defaults.cc` generated by a makefile?
 - some `tests/` are in github that aren't in sourceforge
 - already made languages files in sourceforge
 - updated docs that aren't in sourceforge

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fluxbox_switch_source-36863.patch --]
[-- Type: text/x-diff, Size: 1993 bytes --]

From 03e6e3eba2969b08e5dd052a84e627ac8a6f205a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 25 Apr 2022 22:41:33 -0400
Subject: [PATCH] fluxbox: build from github

---
 srcpkgs/fluxbox/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index 3328421d91ac..db5c61f17e95 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -1,26 +1,32 @@
 # Template file for 'fluxbox'
 pkgname=fluxbox
 version=1.3.7
-revision=3
+revision=4
+wrksrc=fluxbox-Release-${version//./_}
 build_style=gnu-configure
 configure_args="--enable-nls
  ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
  ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
  ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
  ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake libtool gettext gettext-devel"
 makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel
  libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
 short_desc="Highly configurable and low resource X11 Window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.fluxbox.org"
 license="MIT"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0
+homepage="http://www.fluxbox.org"
+distfiles="https://github.com/fluxbox/fluxbox/archive/refs/tags/Release-${version//./_}.tar.gz"
+checksum=990414ae342a35c5703e5025a8bf019b0b4dada55d57071c51d3d498abb5cd36
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="${configure_args/enable-nls/disable-nls}" ;;
 esac
+
+pre_configure() {
+	./autogen.sh
+}
+
 post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
 	vlicense COPYING

Re: [PR PATCH] [Updated] Fluxbox switch source

[classabbyamp]

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

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/zlice/void-packages fluxbox_switch_source
https://github.com/void-linux/void-packages/pull/36863

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

#### Comments

Ran into issues with the sourceforge tar using pregenerated aclocal.m4/make files. Saw that github is getting commits here and there and the source has autogen.sh so I built from there.

There are a few file differences from the sourceforge tar. From what I can tell:

 - a `defaults.cc` generated by a makefile?
 - some `tests/` are in github that aren't in sourceforge
 - already made languages files in sourceforge
 - updated docs that aren't in sourceforge

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fluxbox_switch_source-36863.patch --]
[-- Type: text/x-diff, Size: 1993 bytes --]

From c68dfc3720062adb1a5269ef25cc191a4971a852 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 25 Apr 2022 22:41:33 -0400
Subject: [PATCH] fluxbox: build from github

---
 srcpkgs/fluxbox/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index 3328421d91ac..db5c61f17e95 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -1,26 +1,32 @@
 # Template file for 'fluxbox'
 pkgname=fluxbox
 version=1.3.7
-revision=3
+revision=4
+wrksrc=fluxbox-Release-${version//./_}
 build_style=gnu-configure
 configure_args="--enable-nls
  ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
  ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
  ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
  ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake libtool gettext gettext-devel"
 makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel
  libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
 short_desc="Highly configurable and low resource X11 Window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.fluxbox.org"
 license="MIT"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0
+homepage="http://www.fluxbox.org"
+distfiles="https://github.com/fluxbox/fluxbox/archive/refs/tags/Release-${version//./_}.tar.gz"
+checksum=990414ae342a35c5703e5025a8bf019b0b4dada55d57071c51d3d498abb5cd36
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="${configure_args/enable-nls/disable-nls}" ;;
 esac
+
+pre_configure() {
+	./autogen.sh
+}
+
 post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
 	vlicense COPYING

Re: [PR PATCH] [Merged]: Fluxbox switch source

[classabbyamp]

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

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

Fluxbox switch source
https://github.com/void-linux/void-packages/pull/36863

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

#### Comments

Ran into issues with the sourceforge tar using pregenerated aclocal.m4/make files. Saw that github is getting commits here and there and the source has autogen.sh so I built from there.

There are a few file differences from the sourceforge tar. From what I can tell:

 - a `defaults.cc` generated by a makefile?
 - some `tests/` are in github that aren't in sourceforge
 - already made languages files in sourceforge
 - updated docs that aren't in sourceforge