[PR PATCH] jp2a: update to 1.1.1, adopt

[PR PATCH] jp2a: update to 1.1.1, adopt

[subnut]

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

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

https://github.com/subnut/void-packages jp2a
https://github.com/void-linux/void-packages/pull/36508

jp2a: update to 1.1.1, 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (x86_64-glibc)
<!-- 
- 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/36508.patch is attached

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

From ff9be0c449211fcb576cef3597aa6df555c176ea Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 3 Apr 2022 23:13:44 +0530
Subject: [PATCH] jp2a: update to 1.1.1, adopt

---
 srcpkgs/jp2a/template | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/jp2a/template b/srcpkgs/jp2a/template
index dc7d1b2ebb81..87c6e81ba02b 100644
--- a/srcpkgs/jp2a/template
+++ b/srcpkgs/jp2a/template
@@ -1,17 +1,18 @@
 # Template file for 'jp2a'
 pkgname=jp2a
-version=1.0.7
+version=1.1.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake"
-makedepends="libjpeg-turbo-devel libcurl-devel"
+hostmakedepends="automake autoconf autoconf-archive pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel libcurl-devel ncurses-devel"
 short_desc="JPEG image to ASCII art converter"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://github.com/cslarsen/jp2a"
-distfiles="https://github.com/cslarsen/jp2a/archive/v${version}.tar.gz"
-checksum=e509d8bbf9434afde5c342568b21d11831a61d9942ca8cb1633d4295b7bc5059
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/Talinx/jp2a"
+distfiles="https://github.com/Talinx/jp2a/archive/v${version}.tar.gz"
+checksum=332521cd4675b4a03c7080a600ccbd848eb29aebf17fce767f163d8dac141555
 
 pre_configure() {
-	autoreconf -fi
+	autoreconf -vi
+	export bashcompdir=/usr/share/bash-completion/completions
 }

Re: jp2a: update to 1.1.1, adopt

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1098889080

Comment:
Why hasn't this been merged yet?

Re: jp2a: update to 1.1.1, adopt

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1098905867

Comment:
> Why hasn't this been merged yet?

If you want to help, please test this PR and report how it went.

Re: jp2a: update to 1.1.1, adopt

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1099061265

Comment:
![image](https://user-images.githubusercontent.com/47404953/163375448-23824ef2-a020-42e1-b807-264b29349a39.png)
![image](https://user-images.githubusercontent.com/47404953/163376745-ebc1af48-a5d1-4154-94ca-c46dcf2e7345.png)

atleast https://github.com/void-linux/void-packages/issues/36461 is solved by this PR.

Re: [PR REVIEW] jp2a: update to 1.1.1, adopt

[leahneukirchen]

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

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#discussion_r853312718

Comment:
This seems to be wrong.

Re: jp2a: update to 1.1.1, adopt

[paper42]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1098889080

Comment:
Why hasn't this been merged yet?

Re: [PR PATCH] [Updated] jp2a: update to 1.1.1, adopt

[subnut]

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

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

https://github.com/subnut/void-packages jp2a
https://github.com/void-linux/void-packages/pull/36508

jp2a: update to 1.1.1, 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (x86_64-glibc)
<!-- 
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

#### Additional info
Closes #36461

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

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

From ca35b124896980453727360306647a7aba1b520b Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 3 Apr 2022 23:13:44 +0530
Subject: [PATCH] jp2a: update to 1.1.1, adopt

---
 srcpkgs/jp2a/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/jp2a/template b/srcpkgs/jp2a/template
index dc7d1b2ebb81..522437bec2dd 100644
--- a/srcpkgs/jp2a/template
+++ b/srcpkgs/jp2a/template
@@ -1,17 +1,18 @@
 # Template file for 'jp2a'
 pkgname=jp2a
-version=1.0.7
+version=1.1.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake"
-makedepends="libjpeg-turbo-devel libcurl-devel"
+hostmakedepends="automake autoconf autoconf-archive pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel libcurl-devel ncurses-devel"
 short_desc="JPEG image to ASCII art converter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
-homepage="https://github.com/cslarsen/jp2a"
-distfiles="https://github.com/cslarsen/jp2a/archive/v${version}.tar.gz"
-checksum=e509d8bbf9434afde5c342568b21d11831a61d9942ca8cb1633d4295b7bc5059
+homepage="https://github.com/Talinx/jp2a"
+distfiles="https://github.com/Talinx/jp2a/archive/v${version}.tar.gz"
+checksum=332521cd4675b4a03c7080a600ccbd848eb29aebf17fce767f163d8dac141555
 
 pre_configure() {
-	autoreconf -fi
+	autoreconf -vi
+	export bashcompdir=/usr/share/bash-completion/completions
 }

Re: [PR REVIEW] jp2a: update to 1.1.1, adopt

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#discussion_r857715238

Comment:
Can we just use the release tarball to avoid autoreconf?
```suggestion
distfiles="https://github.com/Talinx/jp2a/releases/download/v${version}/jp2a-${version}.tar.gz"
```

Re: [PR PATCH] [Updated] jp2a: update to 1.1.1, adopt

[subnut]

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

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

https://github.com/subnut/void-packages jp2a
https://github.com/void-linux/void-packages/pull/36508

jp2a: update to 1.1.1, 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (x86_64-glibc)
<!-- 
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

#### Additional info
Closes #36461

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

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

From cf536a16a3d3a9516b85a4133530326d65054c1c Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 3 Apr 2022 23:13:44 +0530
Subject: [PATCH] jp2a: update to 1.1.1

---
 srcpkgs/jp2a/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/jp2a/template b/srcpkgs/jp2a/template
index dc7d1b2ebb81..1fb5cdec9e4a 100644
--- a/srcpkgs/jp2a/template
+++ b/srcpkgs/jp2a/template
@@ -1,17 +1,13 @@
 # Template file for 'jp2a'
 pkgname=jp2a
-version=1.0.7
+version=1.1.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake"
-makedepends="libjpeg-turbo-devel libcurl-devel"
+makedepends="libjpeg-turbo-devel libpng-devel libcurl-devel ncurses-devel"
 short_desc="JPEG image to ASCII art converter"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="https://github.com/cslarsen/jp2a"
-distfiles="https://github.com/cslarsen/jp2a/archive/v${version}.tar.gz"
-checksum=e509d8bbf9434afde5c342568b21d11831a61d9942ca8cb1633d4295b7bc5059
-
-pre_configure() {
-	autoreconf -fi
-}
+homepage="https://github.com/Talinx/jp2a"
+distfiles="https://github.com/Talinx/jp2a/releases/download/v${version}/jp2a-${version}.tar.gz"
+checksum=144dd671373ee67821fb1c579f444758645af1ca9d6d419ffa7947a002847c82
+export bashcompdir=/usr/share/bash-completion/completions

Re: jp2a: update to 1.1.1

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138616735

Comment:
coming back to this, still was and still am confused on why theres no colors yet.

Re: jp2a: update to 1.1.1

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138621859

Comment:
cannot build.
```
=> jp2a-1.1.1_1: removing autodeps, please wait...
=> ERROR: jp2a-1.1.1_1: failed to install target dependencies! (error 19)
ncurses-libs-6.3_1 in transaction breaks installed pkg `ncurses-6.3_2'
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
```

Re: jp2a: update to 1.1.1

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138636306

Comment:
> rebase your branch on top of master
```
... <thousands upon thousands of merge conflicts>
CONFLICT (add/add): Merge conflict in xbps-src
error: could not apply cf536a16a3... jp2a: update to 1.1.1
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
```

Re: jp2a: update to 1.1.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138654330

Comment:
> > rebase your branch on top of master
> ```
> ... <thousands upon thousands of merge conflicts>
> CONFLICT (add/add): Merge conflict in xbps-src
> error: could not apply cf536a16a3... jp2a: update to 1.1.1
> hint: Resolve all conflicts manually, mark them as resolved with
> hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
> hint: You can instead skip this commit: run "git rebase --skip".
> hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
> ```

you didn't rebase on top of this repository's master then, did you run something like `git fetch upstream; git rebase upstream/master` or `git pull --rebase upstrean/master`?

Re: jp2a: update to 1.1.1

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138658452

Comment:
re-cloning and re-based fixed it. successfully builds.

Re: jp2a: update to 1.1.1

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138814663

Comment:
> why theres no colors yet.

@wael444, does adding the `--colors` flag not enable the colors?

I am not on linux right now, so can't test it myself. But IIRC, when I submitted this PR, running `jp2a --colors voidlinux.jpg` _did_ enable the colors (using the jp2a from this PR, of course).

Re: jp2a: update to 1.1.1

[wael444]

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

New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138820020

Comment:
> why theres no colors yet. 

i was referring to the current `void-packages` version of jp2a. i had thought that this PR has been merged.
sorry for not putting context but yes this PR still adds colors.

Re: [PR PATCH] [Merged]: jp2a: update to 1.1.1

[leahneukirchen]

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

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

jp2a: update to 1.1.1
https://github.com/void-linux/void-packages/pull/36508

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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (x86_64-glibc)
<!-- 
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

#### Additional info
Closes #36461