[PR PATCH] boinc: not depends on GTK+ anymore

[PR PATCH] boinc: not depends on GTK+ anymore

[sgn]

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

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

https://github.com/sgn/void-packages boinc-no-gtk+2
https://github.com/void-linux/void-packages/pull/39481

boinc: not depends on GTK+ anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/39481.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boinc-no-gtk+2-39481.patch --]
[-- Type: text/x-diff, Size: 2019 bytes --]

From 13106f155c840690b2a0973e8f3ded37af608dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 26 Sep 2022 23:51:37 +0700
Subject: [PATCH] boinc: not depends on GTK+ anymore

---
 srcpkgs/boinc/patches/boinc-am_conditional.patch | 4 ++--
 srcpkgs/boinc/template                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/boinc/patches/boinc-am_conditional.patch b/srcpkgs/boinc/patches/boinc-am_conditional.patch
index 7d59f154340f..a7657d7f1d23 100644
--- a/srcpkgs/boinc/patches/boinc-am_conditional.patch
+++ b/srcpkgs/boinc/patches/boinc-am_conditional.patch
@@ -1,4 +1,4 @@
-Add objective c++ program and check for gtk2
+Add objective c++ program and check for gtk+3
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -14,7 +14,7 @@ Add objective c++ program and check for gtk2
  AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
  AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
  
-+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
++PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
 +
  dnl ======================================================================
  dnl some more vodoo required for building portable client-binary (client, clientgui)
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 33850b5b0364..0ae75ba3d997 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info"
 makedepends="glu-devel libfreeglut-devel libcurl-devel
  libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel
- libXmu-devel libXi-devel gtk+-devel webkit2gtk-devel wxWidgets-gtk3-devel"
+ libXmu-devel libXi-devel webkit2gtk-devel wxWidgets-gtk3-devel"
 depends="curl ca-certificates"
 conf_files="/etc/default/boinc-client"
 short_desc="Berkely Infrastructure for Network Computing"

Re: [PR PATCH] [Updated] boinc: not depends on GTK+ anymore

[sgn]

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

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

https://github.com/sgn/void-packages boinc-no-gtk+2
https://github.com/void-linux/void-packages/pull/39481

boinc: not depends on GTK+ anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/39481.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boinc-no-gtk+2-39481.patch --]
[-- Type: text/x-diff, Size: 4915 bytes --]

From d48bb6fffb122e5d034d491be39f7c2f0810373f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 26 Sep 2022 23:51:37 +0700
Subject: [PATCH 1/3] boinc: not depends on GTK+ anymore

---
 srcpkgs/boinc/patches/boinc-am_conditional.patch | 4 ++--
 srcpkgs/boinc/template                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/boinc/patches/boinc-am_conditional.patch b/srcpkgs/boinc/patches/boinc-am_conditional.patch
index 7d59f154340f..a7657d7f1d23 100644
--- a/srcpkgs/boinc/patches/boinc-am_conditional.patch
+++ b/srcpkgs/boinc/patches/boinc-am_conditional.patch
@@ -1,4 +1,4 @@
-Add objective c++ program and check for gtk2
+Add objective c++ program and check for gtk+3
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -14,7 +14,7 @@ Add objective c++ program and check for gtk2
  AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
  AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
  
-+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
++PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
 +
  dnl ======================================================================
  dnl some more vodoo required for building portable client-binary (client, clientgui)
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 33850b5b0364..0ae75ba3d997 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info"
 makedepends="glu-devel libfreeglut-devel libcurl-devel
  libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel
- libXmu-devel libXi-devel gtk+-devel webkit2gtk-devel wxWidgets-gtk3-devel"
+ libXmu-devel libXi-devel webkit2gtk-devel wxWidgets-gtk3-devel"
 depends="curl ca-certificates"
 conf_files="/etc/default/boinc-client"
 short_desc="Berkely Infrastructure for Network Computing"

From 90fd77ac2e0ec6f3da25649b6cbee1d3b1bce9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 27 Sep 2022 00:04:16 +0700
Subject: [PATCH 2/3] codeblocks: no needs GTK+

---
 srcpkgs/codeblocks/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 26487b40f796..02e1e255730d 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -4,10 +4,12 @@ version=20.03
 revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
- --with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
+ --with-boost=${XBPS_CROSS_BASE}/usr
+ --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
+ ac_cv_exeext=no --with-gnu-ld"
 hostmakedepends="libtool pkg-config zip"
 makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
- gamin-devel boost-devel boost-build"
+ gamin-devel boost-devel boost-build tinyxml-devel"
 short_desc="Free C, C++ and Fortran IDE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
@@ -15,11 +17,6 @@ homepage="http://www.codeblocks.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz"
 checksum=15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" wxWidgets-devel tinyxml-devel"
-	configure_args+=" ac_cv_exeext=no --with-gnu-ld"
-fi
-
 post_install() {
 	vinstall debian/codeblocks.sharedmime 644 /usr/share/mime/packages codeblocks.xml
 	vinstall src/mime/codeblocks.desktop 644 /usr/share/applications

From 124c8c06a7a7c0aa89693cfe85a24e57bb5c3bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 27 Sep 2022 00:04:39 +0700
Subject: [PATCH 3/3] golly: move to GTK+3

---
 srcpkgs/golly/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index ee2876689ad3..e8a24b9074c0 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -6,11 +6,11 @@ wrksrc="${pkgname}-${version}-src"
 build_wrksrc="gui-wx"
 build_style=gnu-makefile
 make_build_args="-f makefile-gtk GOLLYDIR=/usr/share/golly LUALIB=-llua5.4
- CXXC=\$(CXX)"
+ CXXC=\$(CXX) WX_CONFIG=wx-config-gtk3"
 make_install_args="${make_build_args}"
 hostmakedepends="python3"
-makedepends="MesaLib-devel glu-devel lua54-devel python3-devel wxWidgets-devel
- zlib-devel SDL2-devel"
+makedepends="MesaLib-devel glu-devel lua54-devel python3-devel
+ wxWidgets-gtk3-devel zlib-devel SDL2-devel"
 short_desc="Simulator for Conway's Game of Life and other cellular automata"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

Re: [PR PATCH] [Merged]: boinc: not depends on GTK+ anymore

[sgn]

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

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

boinc: not depends on GTK+ anymore
https://github.com/void-linux/void-packages/pull/39481

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

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

<!--
#### 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
-->