* Re: [PR PATCH] [Updated] New package: gdcalc-3.4
2023-08-12 7:48 [PR PATCH] New package: gdcalc-3.4 bhepple
` (2 preceding siblings ...)
2023-08-12 22:11 ` bhepple
@ 2023-08-13 18:19 ` bhepple
2023-08-13 18:48 ` [PR PATCH] [Closed]: " bhepple
4 siblings, 0 replies; 11+ messages in thread
From: bhepple @ 2023-08-13 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by bhepple against master on the void-packages repository
https://github.com/bhepple/void-packages master
https://github.com/void-linux/void-packages/pull/45560
New package: gdcalc-3.4
#### 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**
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glib)
-->
A patch file from https://github.com/void-linux/void-packages/pull/45560.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-45560.patch --]
[-- Type: text/x-diff, Size: 43896 bytes --]
From c93d67e7a4a984202fec7c0dd8056e4814a5f6e6 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sat, 12 Aug 2023 17:44:51 +1000
Subject: [PATCH 01/24] Create template
---
srcpkgs/gdcalc/template | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/gdcalc/template
diff --git a/srcpkgs/gdcalc/template b/srcpkgs/gdcalc/template
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/srcpkgs/gdcalc/template
@@ -0,0 +1 @@
+
From 94a6fbbd41b27e987dbf12809aae62b2812338b3 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sat, 12 Aug 2023 17:45:31 +1000
Subject: [PATCH 02/24] Update template
---
srcpkgs/gdcalc/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/srcpkgs/gdcalc/template b/srcpkgs/gdcalc/template
index 8b137891791fe..491a8b2623f7a 100644
--- a/srcpkgs/gdcalc/template
+++ b/srcpkgs/gdcalc/template
@@ -1 +1,27 @@
+# Template file for 'gdcalc'
+pkgname=gdcalc
+version=3.4
+revision=1
+archs="x86_64"
+#build_wrksrc=
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake pkg-config libtool bison"
+makedepends="ncurses-devel gtk+3-devel"
+depends="units"
+short_desc="Financial, statistics, scientific and programmers calculator for GTK+"
+maintainer="Bob Hepple <bob.hepple@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://gitlab.com/wef/gdcalc"
+#changelog=""
+distfiles="https://gitlab.com/wef/gdcalc/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=c6d10a78e00c6d2d1f79771563fe1be6080d0d36e459451e1ab47dd935e7b4db
+pre_configure() {
+ ./autogen.sh
+ vlicense COPYING LICENSE
+}
From c2272e44b7be8b02200319ca23bd1d84f64b9476 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sat, 12 Aug 2023 21:44:20 +1000
Subject: [PATCH 03/24] gdcalc: response to PR review
gdcalc: remove GPL-2 license file and commented lines per response to PR
---
srcpkgs/gdcalc/template | 8 --------
1 file changed, 8 deletions(-)
diff --git a/srcpkgs/gdcalc/template b/srcpkgs/gdcalc/template
index 491a8b2623f7a..aa9942b290cea 100644
--- a/srcpkgs/gdcalc/template
+++ b/srcpkgs/gdcalc/template
@@ -3,13 +3,7 @@ pkgname=gdcalc
version=3.4
revision=1
archs="x86_64"
-#build_wrksrc=
build_style=gnu-configure
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
hostmakedepends="automake pkg-config libtool bison"
makedepends="ncurses-devel gtk+3-devel"
depends="units"
@@ -17,11 +11,9 @@ short_desc="Financial, statistics, scientific and programmers calculator for GTK
maintainer="Bob Hepple <bob.hepple@gmail.com>"
license="GPL-2.0-only"
homepage="https://gitlab.com/wef/gdcalc"
-#changelog=""
distfiles="https://gitlab.com/wef/gdcalc/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum=c6d10a78e00c6d2d1f79771563fe1be6080d0d36e459451e1ab47dd935e7b4db
pre_configure() {
./autogen.sh
- vlicense COPYING LICENSE
}
From 0d108c98a6a3cd1c84d6369632c0868590f81a9d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Aug 2023 16:57:08 +0200
Subject: [PATCH 04/24] pam: reenable pam_lastlog (on glibc).
https://github.com/linux-pam/linux-pam/commit/357a4ddbe9b4b10ebd805d2af3e32f3ead5b8816
is not a good reason to break existing setups.
Fixes #45562.
---
srcpkgs/pam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index d21d1d562e6f9..87a375699e7b3 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,11 +1,11 @@
# Template file for 'pam'
pkgname=pam
version=1.5.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--libdir=/usr/lib --sbindir=/usr/bin --docdir=/usr/share/doc/pam
- --disable-nis --disable-audit --disable-selinux
+ --disable-nis --disable-audit --disable-selinux --enable-lastlog
--disable-regenerate-docu BUILD_CFLAGS=-Os BUILD_LDFLAGS="
hostmakedepends="gettext-devel pkg-config"
makedepends="libfl-devel db-devel"
From 14c4f680460e61a62f41e3fd91a3e330551f5ce3 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 13 Aug 2023 01:33:27 +0900
Subject: [PATCH 05/24] plplot: fix build on musl
---
srcpkgs/plplot/template | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/plplot/template b/srcpkgs/plplot/template
index 221562823b60f..6797603722954 100644
--- a/srcpkgs/plplot/template
+++ b/srcpkgs/plplot/template
@@ -26,10 +26,6 @@ build_options="ada gen_tools"
desc_option_ada="Enable Ada bindings"
desc_option_gen_tools="Build files for host required during cross build"
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- broken="PTHREAD_MUTEX_RECURSIVE_NP"
-fi
-
if ! [ "$CROSS_BUILD" ]; then
build_options_default="gen_tools"
fi
@@ -46,6 +42,13 @@ post_patch() {
vsed -i cmake/modules/tcl-related.cmake -e '/if(NOT PLPLOT_TK_VERSION)/ i set(PLPLOT_TK_VERSION ${PLPLOT_TCL_VERSION} CACHE STRING "Tk version found by wish")'
}
+post_configure() {
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ vsed -i build/plplot_config.h \
+ -e '/PTHREAD_MUTEX_RECURSIVE_NP/s/_NP//'
+ fi
+}
+
pre_build() {
if ! [ "$build_option_gen_tools" ]; then
ln -s /usr/lib/qsastime/deltaT-gen build/lib/qsastime
From de0168ab83ef8effb35130b3bc2427ca9f28200f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Aug 2023 21:03:53 +0200
Subject: [PATCH 06/24] qView: update to 6.0
---
srcpkgs/qView/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qView/template b/srcpkgs/qView/template
index 1048d033ab57f..7a3249c542ec2 100644
--- a/srcpkgs/qView/template
+++ b/srcpkgs/qView/template
@@ -1,13 +1,13 @@
# Template file for 'qView'
pkgname=qView
-version=4.0
+version=6.0
revision=1
build_style=qmake
hostmakedepends="qt5-host-tools qt5-qmake"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-x11extras-devel"
short_desc="Image viewer designed with minimalism and usability in mind"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later"
homepage="https://interversehq.com/qview/"
distfiles="https://github.com/jurplel/qView/archive/${version}.tar.gz"
-checksum=04f986a03bff1b957ac72f266f58a8a7fd403e4606a5bc00ad4a3130d14f11c3
+checksum=ec156ac65daa993ae1ded8b97c3f454bd860b18d5060fe90438784211c966334
From 0dc69085a1efc3416152419f94d598dfd842725c Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sat, 12 Aug 2023 14:34:19 -0400
Subject: [PATCH 07/24] font-iosevka: update to 26.1.0.
---
srcpkgs/font-iosevka/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index d8aef598afe6c..d16576bdd782e 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
# Template file for 'font-iosevka'
pkgname=font-iosevka
-version=26.0.2
+version=26.1.0
revision=1
depends="font-util"
short_desc="Slender monospace sans-serif and slab-serif typeface"
@@ -10,8 +10,8 @@ homepage="https://typeof.net/Iosevka/"
changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="ac0fb71b857f996494f772af09646188671e859a1d33306fc07a3af30056d2e7
- c7243f08307c4f0603ace5cee63bf3a009daca502a278008dce2c81d27ea40c7"
+checksum="6dde65d5ae276c987aab8237b4b1f0348cc9984b61c34cdf73141c43b9f4391a
+ 9336c0c4cac8b40c7cddc500451ed7ae615768b52f950b028a8cc443d26f7a40"
font_dirs="/usr/share/fonts/TTF"
From 60d41d7104cd948aec833f9e68f5721bf3325ce1 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sun, 13 Aug 2023 05:58:49 +1000
Subject: [PATCH 08/24] New package: src-1.32
---
srcpkgs/src/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/src/template
diff --git a/srcpkgs/src/template b/srcpkgs/src/template
new file mode 100644
index 0000000000000..e710d8ff1f722
--- /dev/null
+++ b/srcpkgs/src/template
@@ -0,0 +1,18 @@
+# Template file for 'src'
+pkgname=src
+version=1.32
+revision=1
+archs="x86_64"
+build_style=gnu-makefile
+hostmakedepends="asciidoc rcs"
+makedepends="python3-devel"
+depends="rcs"
+short_desc="RCS reloaded with a modern UI, designed to manage single-file projects"
+maintainer="Bob Hepple <bob.hepple@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://gitlab.com/esr/src"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=d2011a60e88ea40959266f47f1e1ec7a24149f4b98df2bb234bfc92d048e977b
+post_install() {
+ vlicense COPYING
+}
From 81948dd5c302b556234e05e26da6c7b35596c2fd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Aug 2023 23:38:20 +0200
Subject: [PATCH 09/24] linux6.4: update to 6.4.10.
---
srcpkgs/linux6.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.4/template b/srcpkgs/linux6.4/template
index d0a2a06d4676c..eb9b5232d1908 100644
--- a/srcpkgs/linux6.4/template
+++ b/srcpkgs/linux6.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.4'
pkgname=linux6.4
-version=6.4.9
+version=6.4.10
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3
- 8c677c64494120ba957deefc5ddd67e6f7dc22263d0e4b4ab64e5ec960944ef3"
+ a0d5d93ee5ba65df2f361b487286e59518b73f1371af0a186da7c52c5069c4a2"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From afd9fe04fe2f18dc5554b7f899a35b4bb74f8561 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sun, 13 Aug 2023 08:08:12 +1000
Subject: [PATCH 10/24] New package: src-1.32
---
srcpkgs/src/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/src/template b/srcpkgs/src/template
index e710d8ff1f722..21f8b6de6e02f 100644
--- a/srcpkgs/src/template
+++ b/srcpkgs/src/template
@@ -6,7 +6,7 @@ archs="x86_64"
build_style=gnu-makefile
hostmakedepends="asciidoc rcs"
makedepends="python3-devel"
-depends="rcs"
+depends="rcs git python3"
short_desc="RCS reloaded with a modern UI, designed to manage single-file projects"
maintainer="Bob Hepple <bob.hepple@gmail.com>"
license="BSD-2-Clause"
From f26be6ab5d4a24400e25507e4f62567e68f3cfac Mon Sep 17 00:00:00 2001
From: Daniel Lewan <daniel@teddydd.me>
Date: Sat, 12 Aug 2023 13:39:06 +0200
Subject: [PATCH 11/24] lagrange: update to 1.16.7, adopt.
---
srcpkgs/lagrange/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 695264447323f..860df9e60bde9 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
# Template file for 'lagrange'
pkgname=lagrange
-version=1.16.5
+version=1.16.7
revision=1
build_style=cmake
configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config zip"
makedepends="pcre2-devel SDL2-devel openssl-devel zlib-devel libunistring-devel
mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel libwebp-devel"
short_desc="Beautiful Gemini Client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Lewan <daniel@teddydd.me>"
license="BSD-2-Clause"
homepage="https://gmi.skyjake.fi/lagrange/"
changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=c8d37a32d99ff444e4e61d73269f6244e08a5232c91bb97e2b74823dc6e29d53
+checksum=751f595b7e913ea8246fa4031f63c15dcef1cb114e057b2062fc601875ebe745
post_install() {
vlicense LICENSE.md
From fec1a6cd29425885d53356b9e4b723d63d79d0d7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 7 Aug 2023 13:19:33 +0100
Subject: [PATCH 12/24] python3-scipy: fix build.
---
srcpkgs/python3-scipy/patches/dep-versions.patch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/srcpkgs/python3-scipy/patches/dep-versions.patch b/srcpkgs/python3-scipy/patches/dep-versions.patch
index 863c5e19d6d09..0ba8c2dbf4cc8 100644
--- a/srcpkgs/python3-scipy/patches/dep-versions.patch
+++ b/srcpkgs/python3-scipy/patches/dep-versions.patch
@@ -14,6 +14,15 @@ causes build failures against more up-to-date Void packages.
"pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time
# `wheel` is needed for non-isolated builds, given that `meson-python`
# doesn't list it as a runtime requirement (at least in 0.5.0)
+@@ -16,7 +16,7 @@
+ "pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time
+ # `wheel` is needed for non-isolated builds, given that `meson-python`
+ # doesn't list it as a runtime requirement (at least in 0.5.0)
+- "wheel<0.41.0",
++ "wheel",
+
+ # NumPy dependencies - to update these, sync from
+ # https://github.com/scipy/oldest-supported-numpy/, and then
@@ -40,7 +40,7 @@
# however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6
# (see oldest-supported-numpy issues gh-28 and gh-45)
From 32af45391b66d65853d75bd99d482f4b1f397d55 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 8 Aug 2023 17:27:43 +0100
Subject: [PATCH 13/24] python3: enable optimizations.
---
srcpkgs/python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index ef07cb7d2f396..ca23bbfc54895 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,9 +4,9 @@
#
pkgname=python3
version=3.11.4
-revision=1
+revision=2
build_style="gnu-configure"
-configure_args="--enable-shared --enable-ipv6
+configure_args="--enable-shared --enable-ipv6 --enable-optimizations
--enable-loadable-sqlite-extensions --with-computed-gotos
--with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi
--without-ensurepip ac_cv_working_tzset=yes"
From ff915f0fd0f17a7a1a792a0cd0c72b66ddf9d042 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 7 May 2023 19:40:32 +0300
Subject: [PATCH 14/24] python3-tkinter: enable optimizations.
Closes: #43791 [via git-merge-pr]
---
srcpkgs/python3-tkinter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index fc16bfdf9dce4..10e0fe38104c1 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -9,9 +9,9 @@ _desc="Python programming language"
pkgname=python3-tkinter
version=3.11.4
-revision=1
+revision=2
build_style="gnu-configure"
-configure_args="--enable-shared --enable-ipv6
+configure_args="--enable-shared --enable-ipv6 --enable-optimizations
--enable-loadable-sqlite-extensions --with-computed-gotos
--with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi
--without-ensurepip"
From eeb9324b4ea292b8c94c2d4d94358b003d2d0973 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 12 Aug 2023 21:47:47 +0100
Subject: [PATCH 15/24] playonlinux: update to 4.4.
---
srcpkgs/playonlinux/patches/60.patch | 263 +++++++++++++++++++++++++++
srcpkgs/playonlinux/template | 16 +-
2 files changed, 271 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/playonlinux/patches/60.patch
diff --git a/srcpkgs/playonlinux/patches/60.patch b/srcpkgs/playonlinux/patches/60.patch
new file mode 100644
index 0000000000000..4de58600b916e
--- /dev/null
+++ b/srcpkgs/playonlinux/patches/60.patch
@@ -0,0 +1,263 @@
+From 788fad16eff4904193e4e9c52b23672535a23c33 Mon Sep 17 00:00:00 2001
+From: Gilles <gilles.wiber@gmail.com>
+Date: Sat, 30 May 2020 11:19:35 +0200
+Subject: [PATCH 1/4] Removing SetSpacing funtion
+
+---
+Upstream PR: https://github.com/PlayOnLinux/POL-POM-4/pull/60
+
+ python/configurewindow/ConfigureWindow.py | 2 +-
+ python/configurewindow/ConfigureWindowNotebook.py | 2 +-
+ python/debug.py | 2 +-
+ python/install/InstallWindow.py | 2 +-
+ python/mainwindow.py | 2 +-
+ python/options.py | 2 +-
+ python/setupwindow/POL_SetupFrame.py | 2 +-
+ python/wine_versions/WineVersionsNotebook.py | 4 ++--
+ 8 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/python/configurewindow/ConfigureWindow.py b/python/configurewindow/ConfigureWindow.py
+index 30f779db1..a26321437 100755
+--- a/python/configurewindow/ConfigureWindow.py
++++ b/python/configurewindow/ConfigureWindow.py
+@@ -75,7 +75,7 @@ def __init__(self,parent,id,title,shortcut, isPrefix = False):
+ self.Bind(wx.EVT_BUTTON, self.DeletePrefix, id=1002)
+
+
+- self.list_game.SetSpacing(0)
++ #self.list_game.SetSpacing(0)
+ self.list_game.SetImageList(self.images)
+
+
+diff --git a/python/configurewindow/ConfigureWindowNotebook.py b/python/configurewindow/ConfigureWindowNotebook.py
+index 8b4e387ea..973d9bbd3 100644
+--- a/python/configurewindow/ConfigureWindowNotebook.py
++++ b/python/configurewindow/ConfigureWindowNotebook.py
+@@ -269,7 +269,7 @@ def Packages(self, nom):
+
+ self.Menu = wx.TreeCtrl(self.panelPackages, 99, pos=(15, 75), size=(530, 260),
+ style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders)
+- self.Menu.SetSpacing(0);
++ #self.Menu.SetSpacing(0);
+ self.Menu.SetImageList(self.imagePackages)
+ self.imagePackages.RemoveAll()
+
+diff --git a/python/debug.py b/python/debug.py
+index 0221e89c0..43e8cf021 100755
+--- a/python/debug.py
++++ b/python/debug.py
+@@ -60,7 +60,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None):
+ self.Bind(wx.EVT_TREE_SEL_CHANGED, self.analyseLog, id=900)
+
+
+- self.list_game.SetSpacing(0);
++ #self.list_game.SetSpacing(0);
+ self.list_game.SetImageList(self.images)
+
+
+diff --git a/python/install/InstallWindow.py b/python/install/InstallWindow.py
+index 27a6b51a5..5b584774d 100755
+--- a/python/install/InstallWindow.py
++++ b/python/install/InstallWindow.py
+@@ -183,7 +183,7 @@ def _createAppNavigation(self):
+ self.appsList = wx.TreeCtrl(self.appNavigationPanel, 106,
+ style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders)
+ self.appsList.SetImageList(self.imagesapps)
+- self.appsList.SetSpacing(0)
++ #self.appsList.SetSpacing(0)
+
+ self.appNavigationSizer.AddSpacer(10)
+ self.appNavigationSizer.Add(self.appsList, 4, wx.EXPAND, 5)
+diff --git a/python/mainwindow.py b/python/mainwindow.py
+index 7c21142df..8df1ff14b 100755
+--- a/python/mainwindow.py
++++ b/python/mainwindow.py
+@@ -240,7 +240,7 @@ def __init__(self, parent, id, title):
+
+ ## List game
+ self.list_game = wx.TreeCtrl(self, 105, style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT)
+- self.list_game.SetSpacing(0)
++ #self.list_game.SetSpacing(0)
+ self.list_game.SetIndent(5)
+ self.list_game.SetImageList(self.images)
+ self.menu_gauche = wx.Panel(self, -1)
+diff --git a/python/options.py b/python/options.py
+index a54c11000..723073ce4 100755
+--- a/python/options.py
++++ b/python/options.py
+@@ -187,7 +187,7 @@ def Plugins(self, nom):
+ self.txtPlugin = wx.StaticText(self.panelPlugins, -1, _("Installed plugins"), size=wx.DefaultSize)
+ self.txtPlugin.SetFont(self.fontTitle)
+ self.pluginlist = wx.TreeCtrl(self.panelPlugins, 220, style=Variables.widget_borders|wx.TR_HIDE_ROOT|wx.TR_FULL_ROW_HIGHLIGHT)
+- self.pluginlist.SetSpacing(0)
++ #self.pluginlist.SetSpacing(0)
+
+ self.pluginImgList = wx.ImageList(16,16)
+
+diff --git a/python/setupwindow/POL_SetupFrame.py b/python/setupwindow/POL_SetupFrame.py
+index 66bee8533..33d73d38a 100755
+--- a/python/setupwindow/POL_SetupFrame.py
++++ b/python/setupwindow/POL_SetupFrame.py
+@@ -212,7 +212,7 @@ def _createUI(self):
+ style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders,
+ pos=(25, 25), size=(460, 220))
+ self.MenuGames.SetImageList(self.images)
+- self.MenuGames.SetSpacing(0)
++ #self.MenuGames.SetSpacing(0)
+
+ # Login
+ self.login = wx.StaticText(self.contentPanel, -1, _("Login: "), pos=(20, 40), size=(460, 20))
+diff --git a/python/wine_versions/WineVersionsNotebook.py b/python/wine_versions/WineVersionsNotebook.py
+index e088abeb2..ec5f12535 100644
+--- a/python/wine_versions/WineVersionsNotebook.py
++++ b/python/wine_versions/WineVersionsNotebook.py
+@@ -39,7 +39,7 @@ def _createInstalledWineVersionsPanel(self, arch):
+ self.installedWineVersionsTreeSelector[arch] = wx.TreeCtrl(installedWineVersionsPanel, 107 + self.calculateEventDelta(arch),
+ style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders)
+ self.installedWineVersionsTreeSelector[arch].SetImageList(self.imagesapps_i[arch])
+- self.installedWineVersionsTreeSelector[arch].SetSpacing(0)
++ #self.installedWineVersionsTreeSelector[arch].SetSpacing(0)
+ installedWineVersionsSizer.Add(self.installedWineVersionsTreeSelector[arch], 1, wx.EXPAND)
+ installedWineVersionsSizer.AddSpacer(10)
+
+@@ -55,7 +55,7 @@ def _createAvailableWineVersionsPanel(self, arch):
+ style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders,
+ size=(320, 300), pos=(10, 35))
+ self.availableWineVersionsTreeSelector[arch].SetImageList(self.imagesapps[arch])
+- self.availableWineVersionsTreeSelector[arch].SetSpacing(0)
++ #self.availableWineVersionsTreeSelector[arch].SetSpacing(0)
+ availableWineVersionsSizer.Add(self.availableWineVersionsTreeSelector[arch], 1, wx.EXPAND)
+ availableWineVersionsSizer.AddSpacer(10)
+
+
+From 77a3ca3be293ebcafa2400703a5dd4079a5f200b Mon Sep 17 00:00:00 2001
+From: Gilles <gilles.wiber@gmail.com>
+Date: Sat, 30 May 2020 11:32:13 +0200
+Subject: [PATCH 2/4] Solving pluging manager issue (extension management)
+
+---
+ python/options.py | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/python/options.py b/python/options.py
+index 723073ce4..f40f26a70 100755
+--- a/python/options.py
++++ b/python/options.py
+@@ -229,9 +229,9 @@ def generateExts(self):
+ line = line.replace("\n","")
+ line = line.split("=")
+ liner = "Line %s" % i
+- self.list_ext.InsertStringItem(i, liner)
+- self.list_ext.SetStringItem(i, 0, line[0])
+- self.list_ext.SetStringItem(i, 1, line[1])
++ self.list_ext.InsertItem(i, liner)
++ self.list_ext.SetItem(i, 0, line[0])
++ self.list_ext.SetItem(i, 1, line[1])
+ i += 1
+ self.app_installed_text.Hide()
+ self.app_installed.Hide()
+@@ -249,8 +249,9 @@ def editExt(self, event):
+ self.app_installed.Show()
+ self.delete_ext.Show()
+
+- self.app_selected = self.exts[event.m_itemIndex].split("=")[1]
+- self.ext_selected = self.exts[event.m_itemIndex].split("=")[0]
++ ind = event.GetIndex()
++ self.app_selected = self.list_ext.GetItem(ind,1).GetText()
++ self.ext_selected = self.list_ext.GetItem(ind,0).GetText()
+
+ self.app_installed.SetValue(self.app_selected.replace("\n","").replace("\r",""))
+
+
+From a656f5b2bdd23375e3d9547a9c38ccf99e2dc670 Mon Sep 17 00:00:00 2001
+From: Gilles <gilles.wiber@gmail.com>
+Date: Sat, 30 May 2020 14:34:28 +0200
+Subject: [PATCH 3/4] Solving different issue on debug window
+
+---
+ python/debug.py | 7 ++++---
+ python/lib/Variables.py | 2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/python/debug.py b/python/debug.py
+index 43e8cf021..1e344edc8 100755
+--- a/python/debug.py
++++ b/python/debug.py
+@@ -38,7 +38,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None):
+
+ wx.Frame.__init__(self, parent, -1, title, size = (810, 600+Variables.windows_add_size), style = wx.CLOSE_BOX | wx.CAPTION | wx.MINIMIZE_BOX)
+ self.SetIcon(wx.Icon(Variables.playonlinux_env+"/etc/playonlinux.png", wx.BITMAP_TYPE_ANY))
+- self.SetTitle(_('{0} debugger').format(os.environ["APPLICATION_TITLE"]))
++ self.SetTitle(title)
+ #self.panelFenp = wx.Panel(self, -1)
+
+ self.prefixes_item = {}
+@@ -79,7 +79,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None):
+ self.log_reader = wx.TextCtrl(self.panelText, 100, "", size=wx.Size(590,500), pos=(2,2), style=Variables.widget_borders|wx.TE_RICH2|wx.TE_READONLY|wx.TE_MULTILINE)
+ self.log_reader.Bind(wx.EVT_SET_FOCUS, self.OnFocus)
+ self.openTextEdit = wx.Button(self.panelNotEmpty, 101, _("Locate this logfile"), size=(400,30), pos=(70,512))
+- self.reportProblem = wx.Button(self.panelNotEmpty, 102, "", size=(400,30), pos=(70,552))
++ self.reportProblem = wx.Button(self.panelNotEmpty, 102, _("Bug report"), size=(400,30), pos=(70,552))
+
+ if(logcheck == "/dev/null"):
+ self.HideLogFile()
+@@ -95,7 +95,8 @@ def bugReport(self, event):
+ new_env = os.environ
+ new_env["LOGTITLE"] = self.logname
+ subprocess.Popen(["bash", Variables.playonlinux_env+"/bash/bug_report"], env=new_env)
+- self.reportProblem.Enable(False)
++ # Doesn't work if cancel on POL Window : need to find another way ...
++ #self.reportProblem.Enable(False)
+
+ def locate(self, event):
+ if(self.logtype == 0):
+diff --git a/python/lib/Variables.py b/python/lib/Variables.py
+index 055fe17f9..8bed7601b 100755
+--- a/python/lib/Variables.py
++++ b/python/lib/Variables.py
+@@ -51,7 +51,7 @@
+ windows_add_size = 0
+ windows_add_playonmac = 0
+ else:
+- windows_add_size = dpiFetcher().fetch_extra_pixel()
++ windows_add_size = dpiFetcher().fetch_extra_pixel()+60
+ windows_add_playonmac = 0
+
+ widget_borders = wx.RAISED_BORDER
+
+From 02beab05d4255802c26db20a18787349e9b15bbc Mon Sep 17 00:00:00 2001
+From: Gilles <gilles.wiber@gmail.com>
+Date: Sat, 30 May 2020 15:17:33 +0200
+Subject: [PATCH 4/4] Solving small bugs
+
+---
+ python/configurewindow/ConfigureWindowNotebook.py | 2 ++
+ python/install/InstallWindow.py | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/python/configurewindow/ConfigureWindowNotebook.py b/python/configurewindow/ConfigureWindowNotebook.py
+index 973d9bbd3..296443e66 100644
+--- a/python/configurewindow/ConfigureWindowNotebook.py
++++ b/python/configurewindow/ConfigureWindowNotebook.py
+@@ -467,6 +467,8 @@ def misc_button(self, event):
+ self.FileDialog.ShowModal()
+ if (self.FileDialog.GetPath() != ""):
+ filename = self.FileDialog.GetPath()
++ if not os.path.isfile(filename):
++ return
+ dirname = os.path.dirname(filename)
+ if (self.s_isPrefix == True):
+ subprocess.Popen(["bash", Variables.playonlinux_env + "/bash/POL_Command", "--prefix",
+diff --git a/python/install/InstallWindow.py b/python/install/InstallWindow.py
+index 5b584774d..2e49e4a18 100755
+--- a/python/install/InstallWindow.py
++++ b/python/install/InstallWindow.py
+@@ -333,7 +333,7 @@ def closeapp(self, event):
+
+ def manual(self, event):
+ self.live = 1
+- self.installapp(self)
++ self.installapp(event)
+
+ def showStars(self, stars):
+ starWidth = 20
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 780e766509429..56207a29aa23a 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -1,18 +1,18 @@
# Template file for 'playonlinux'
pkgname=playonlinux
-version=4.3.4
-revision=2
+version=4.4
+revision=1
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
-depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
- gnupg xdg-user-dirs libXmu wget p7zip curl jq"
+depends="icoutils netcat ImageMagick xterm wxPython4 cabextract unzip glxinfo
+ gnupg xdg-user-dirs libXmu wget p7zip curl jq python3-natsort xrdb gettext
+ perl"
short_desc="GUI for managing Windows programs under linux"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
-distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
-checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
-python_version=2 #unverified
+distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"
+checksum=aaeedec5249df3ffd56cd8b3e3e06ea7117828ffc868eb2653d232c48e488058
do_install() {
vmkdir usr/share/$pkgname
@@ -24,5 +24,5 @@ do_install() {
chmod +x $DESTDIR/usr/bin/$pkgname
vinstall etc/PlayOnLinux.desktop 644 usr/share/applications playonlinux.desktop
- sed -i "s/ %F//g" $DESTDIR/usr/share/applications/playonlinux.desktop
+ vsed -i "s/ %F//g" $DESTDIR/usr/share/applications/playonlinux.desktop
}
From bb68063c4da81d8d0eae66894687b0576f9ad31b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 14 Feb 2023 20:00:53 +0100
Subject: [PATCH 16/24] libappindicator: remove package
uses python2, not maintained since 2012, replaced by libayatana-appindicator
---
common/shlibs | 1 -
srcpkgs/libappindicator-devel | 1 -
srcpkgs/libappindicator/template | 45 --------------------------------
3 files changed, 47 deletions(-)
delete mode 120000 srcpkgs/libappindicator-devel
delete mode 100644 srcpkgs/libappindicator/template
diff --git a/common/shlibs b/common/shlibs
index 2473f6fad8b9f..6661b197c3bf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3081,7 +3081,6 @@ libappstream-builder.so.8 appstream-glib-0.6.13_1
libflatpak.so.0 flatpak-0.9.3_2
libnanomsg.so.5 nanomsg-1.1.3_1
libindicator3.so.7 libindicator-12.10.1_1
-libappindicator3.so.1 libappindicator-12.10.0_1
libscanmem.so.1 libscanmem-0.17_5
libsctp.so.1 lksctp-tools-1.0.17_1
libwithsctp.so.1 lksctp-tools-1.0.17_1
diff --git a/srcpkgs/libappindicator-devel b/srcpkgs/libappindicator-devel
deleted file mode 120000
index 8bd81b3849943..0000000000000
--- a/srcpkgs/libappindicator-devel
+++ /dev/null
@@ -1 +0,0 @@
-libappindicator
\ No newline at end of file
diff --git a/srcpkgs/libappindicator/template b/srcpkgs/libappindicator/template
deleted file mode 100644
index 11fc6f6d15273..0000000000000
--- a/srcpkgs/libappindicator/template
+++ /dev/null
@@ -1,45 +0,0 @@
-# Template file for 'libappindicator'
-pkgname=libappindicator
-version=12.10.0
-revision=3
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--with-gtk=3"
-hostmakedepends="pkg-config python glib-devel"
-makedepends="gtk+3-devel glib-devel glib-networking libdbusmenu-glib-devel
- libdbusmenu-gtk3-devel libindicator-devel dbus-glib-devel python-devel
- python-gobject2-devel pygtk-devel"
-short_desc="Library to allow applications to export a menu"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="LGPL-2.1"
-homepage="https://launchpad.net/libappindicator"
-distfiles="https://launchpad.net/libappindicator/${version%.*}/${version}/+download/libappindicator-${version}.tar.gz"
-checksum=d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f
-
-# since this package depends on features that have already been removed in
-# gtk+4, we need to ignore the depreciated problem. GTK is going away from the
-# idea of app indicators in taskbars.
-CFLAGS="-Wno-deprecated-declarations -Wno-error=incompatible-pointer-types"
-
-# Avoid errors for macros deprecated since glib-2.58 */
-CFLAGS+=" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_56"
-
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
- fi
-}
-
-libappindicator-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libdbusmenu-glib-devel"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
- vmove usr/lib/*.a
- vmove usr/share/gir-1.0
- vmove usr/share/gtk-doc
- }
-}
From 22c710abc7fbb3e91fe511107cfc949ccc5bc469 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 14 Feb 2023 20:07:07 +0100
Subject: [PATCH 17/24] libindicator: remove package
last release in 2012, replaced by libayatana-indicator
---
common/shlibs | 1 -
srcpkgs/libindicator-devel | 1 -
srcpkgs/libindicator/patches/gtk+3.patch | 11 --------
srcpkgs/libindicator/template | 36 ------------------------
4 files changed, 49 deletions(-)
delete mode 120000 srcpkgs/libindicator-devel
delete mode 100644 srcpkgs/libindicator/patches/gtk+3.patch
delete mode 100644 srcpkgs/libindicator/template
diff --git a/common/shlibs b/common/shlibs
index 6661b197c3bf1..fa464bbbfa5f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3080,7 +3080,6 @@ libappstream-glib.so.8 appstream-glib-0.6.13_1
libappstream-builder.so.8 appstream-glib-0.6.13_1
libflatpak.so.0 flatpak-0.9.3_2
libnanomsg.so.5 nanomsg-1.1.3_1
-libindicator3.so.7 libindicator-12.10.1_1
libscanmem.so.1 libscanmem-0.17_5
libsctp.so.1 lksctp-tools-1.0.17_1
libwithsctp.so.1 lksctp-tools-1.0.17_1
diff --git a/srcpkgs/libindicator-devel b/srcpkgs/libindicator-devel
deleted file mode 120000
index 67d163620094b..0000000000000
--- a/srcpkgs/libindicator-devel
+++ /dev/null
@@ -1 +0,0 @@
-libindicator
\ No newline at end of file
diff --git a/srcpkgs/libindicator/patches/gtk+3.patch b/srcpkgs/libindicator/patches/gtk+3.patch
deleted file mode 100644
index 200609d58a9fb..0000000000000
--- a/srcpkgs/libindicator/patches/gtk+3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libindicator/indicator-image-helper.c.bck 2017-06-14 03:46:33.174214553 -0400
-+++ b/libindicator/indicator-image-helper.c 2017-06-14 03:47:00.594494305 -0400
-@@ -69,7 +69,7 @@
- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error);
-
- if (icon_info != NULL) {
-- gtk_icon_info_free(icon_info);
-+ g_object_unref(icon_info);
- }
-
- if (pixbuf == NULL) {
diff --git a/srcpkgs/libindicator/template b/srcpkgs/libindicator/template
deleted file mode 100644
index 1ad0e5f9c6e79..0000000000000
--- a/srcpkgs/libindicator/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'libindicator'
-pkgname=libindicator
-version=12.10.1
-revision=1
-build_style=gnu-configure
-configure_args="--with-gtk=3"
-hostmakedepends="pkg-config glib-devel"
-makedepends="garcon gtk+3-devel libglib-devel"
-short_desc="Convenient symbols and functions for indicators in the Ayatana project"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="GPL-3"
-homepage="https://launchpad.net/libindicator"
-distfiles="https://launchpad.net/libindicator/${version%.*}/${version}/+download/libindicator-${version}.tar.gz"
-checksum=b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f
-
-CFLAGS="-Wno-deprecated-declarations"
-# Avoid errors for macros deprecated since glib-2.58 */
-CFLAGS+=" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_56"
-
-
-post_configure() {
- # Due to laziness, let's just fix the problem here without
- # understanding it
- sed -i -e 's/-lglib-2.0-lm/-lglib-2.0 -lm/' Makefile */Makefile
-}
-
-libindicator-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
- vmove usr/lib/*.a
- }
-}
From f09666b8a1183bb28b103e7c4575ffdbdda46845 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sat, 12 Aug 2023 17:44:51 +1000
Subject: [PATCH 18/24] Create template
---
srcpkgs/gdcalc/template | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/gdcalc/template
diff --git a/srcpkgs/gdcalc/template b/srcpkgs/gdcalc/template
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/srcpkgs/gdcalc/template
@@ -0,0 +1 @@
+
From 1b82fffa263bf82fb6a0ac91cef11d97e6fd4a06 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sat, 12 Aug 2023 17:45:31 +1000
Subject: [PATCH 19/24] Update template
---
srcpkgs/gdcalc/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/srcpkgs/gdcalc/template b/srcpkgs/gdcalc/template
index 8b137891791fe..491a8b2623f7a 100644
--- a/srcpkgs/gdcalc/template
+++ b/srcpkgs/gdcalc/template
@@ -1 +1,27 @@
+# Template file for 'gdcalc'
+pkgname=gdcalc
+version=3.4
+revision=1
+archs="x86_64"
+#build_wrksrc=
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake pkg-config libtool bison"
+makedepends="ncurses-devel gtk+3-devel"
+depends="units"
+short_desc="Financial, statistics, scientific and programmers calculator for GTK+"
+maintainer="Bob Hepple <bob.hepple@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://gitlab.com/wef/gdcalc"
+#changelog=""
+distfiles="https://gitlab.com/wef/gdcalc/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=c6d10a78e00c6d2d1f79771563fe1be6080d0d36e459451e1ab47dd935e7b4db
+pre_configure() {
+ ./autogen.sh
+ vlicense COPYING LICENSE
+}
From 90c6b25ec6995995fbddcd703dae04b0687f7105 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sat, 12 Aug 2023 21:44:20 +1000
Subject: [PATCH 20/24] gdcalc: response to PR review
gdcalc: remove GPL-2 license file and commented lines per response to PR
---
srcpkgs/gdcalc/template | 8 --------
1 file changed, 8 deletions(-)
diff --git a/srcpkgs/gdcalc/template b/srcpkgs/gdcalc/template
index 491a8b2623f7a..aa9942b290cea 100644
--- a/srcpkgs/gdcalc/template
+++ b/srcpkgs/gdcalc/template
@@ -3,13 +3,7 @@ pkgname=gdcalc
version=3.4
revision=1
archs="x86_64"
-#build_wrksrc=
build_style=gnu-configure
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
hostmakedepends="automake pkg-config libtool bison"
makedepends="ncurses-devel gtk+3-devel"
depends="units"
@@ -17,11 +11,9 @@ short_desc="Financial, statistics, scientific and programmers calculator for GTK
maintainer="Bob Hepple <bob.hepple@gmail.com>"
license="GPL-2.0-only"
homepage="https://gitlab.com/wef/gdcalc"
-#changelog=""
distfiles="https://gitlab.com/wef/gdcalc/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum=c6d10a78e00c6d2d1f79771563fe1be6080d0d36e459451e1ab47dd935e7b4db
pre_configure() {
./autogen.sh
- vlicense COPYING LICENSE
}
From 66387a8f757cbb8bf03d47387463b5ce5164dc07 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sun, 13 Aug 2023 05:58:49 +1000
Subject: [PATCH 21/24] New package: src-1.32
---
srcpkgs/src/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/src/template
diff --git a/srcpkgs/src/template b/srcpkgs/src/template
new file mode 100644
index 0000000000000..e710d8ff1f722
--- /dev/null
+++ b/srcpkgs/src/template
@@ -0,0 +1,18 @@
+# Template file for 'src'
+pkgname=src
+version=1.32
+revision=1
+archs="x86_64"
+build_style=gnu-makefile
+hostmakedepends="asciidoc rcs"
+makedepends="python3-devel"
+depends="rcs"
+short_desc="RCS reloaded with a modern UI, designed to manage single-file projects"
+maintainer="Bob Hepple <bob.hepple@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://gitlab.com/esr/src"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=d2011a60e88ea40959266f47f1e1ec7a24149f4b98df2bb234bfc92d048e977b
+post_install() {
+ vlicense COPYING
+}
From 28e2bac8fc371394d143d2d26399178c4ff790ca Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Sun, 13 Aug 2023 08:08:12 +1000
Subject: [PATCH 22/24] New package: src-1.32
---
srcpkgs/src/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/src/template b/srcpkgs/src/template
index e710d8ff1f722..21f8b6de6e02f 100644
--- a/srcpkgs/src/template
+++ b/srcpkgs/src/template
@@ -6,7 +6,7 @@ archs="x86_64"
build_style=gnu-makefile
hostmakedepends="asciidoc rcs"
makedepends="python3-devel"
-depends="rcs"
+depends="rcs git python3"
short_desc="RCS reloaded with a modern UI, designed to manage single-file projects"
maintainer="Bob Hepple <bob.hepple@gmail.com>"
license="BSD-2-Clause"
From d667b87e477e7aecd251708959477cc36d419641 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Mon, 14 Aug 2023 04:06:21 +1000
Subject: [PATCH 23/24] Revert "New package: src-1.32"
This reverts commit f6f6ea5a528a973b4c65f56fae29925140e99697.
---
srcpkgs/src/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/src/template
diff --git a/srcpkgs/src/template b/srcpkgs/src/template
deleted file mode 100644
index 21f8b6de6e02f..0000000000000
--- a/srcpkgs/src/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'src'
-pkgname=src
-version=1.32
-revision=1
-archs="x86_64"
-build_style=gnu-makefile
-hostmakedepends="asciidoc rcs"
-makedepends="python3-devel"
-depends="rcs git python3"
-short_desc="RCS reloaded with a modern UI, designed to manage single-file projects"
-maintainer="Bob Hepple <bob.hepple@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://gitlab.com/esr/src"
-distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=d2011a60e88ea40959266f47f1e1ec7a24149f4b98df2bb234bfc92d048e977b
-post_install() {
- vlicense COPYING
-}
From 79f31a9996a8a09146e14453173a01a600aa3921 Mon Sep 17 00:00:00 2001
From: Bob Hepple <bob.hepple@gmail.com>
Date: Mon, 14 Aug 2023 04:19:18 +1000
Subject: [PATCH 24/24] Trying to unbork myself
---
srcpkgs/src/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/src/template
diff --git a/srcpkgs/src/template b/srcpkgs/src/template
deleted file mode 100644
index 21f8b6de6e02f..0000000000000
--- a/srcpkgs/src/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'src'
-pkgname=src
-version=1.32
-revision=1
-archs="x86_64"
-build_style=gnu-makefile
-hostmakedepends="asciidoc rcs"
-makedepends="python3-devel"
-depends="rcs git python3"
-short_desc="RCS reloaded with a modern UI, designed to manage single-file projects"
-maintainer="Bob Hepple <bob.hepple@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://gitlab.com/esr/src"
-distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=d2011a60e88ea40959266f47f1e1ec7a24149f4b98df2bb234bfc92d048e977b
-post_install() {
- vlicense COPYING
-}
^ permalink raw reply [flat|nested] 11+ messages in thread