From 40c7f1770fbcec937ab9287947e93daf52fd9701 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:27:54 -0600 Subject: [PATCH 1/8] gnustep-base: update to 1.29.0. --- common/shlibs | 2 +- srcpkgs/gnustep-base/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0a803960ab55..e3743d32f173 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3123,7 +3123,7 @@ libffms2.so.4 libffms2-2.23.1_1 libddcutil.so.4 ddcutil-1.0.1_1 liblsmash.so.2 liblsmash-2.9.1_1 libgiac.so.0 libgiac-1.4.9r17_1 -libgnustep-base.so.1.28 gnustep-base-1.28.0_1 +libgnustep-base.so.1.29 gnustep-base-1.29.0_1 libtermbox.so.1 termbox-1.1.0_1 libmysofa.so.1 libmysofa-1.2_1 libzinnia.so.0 libzinnia-0.06_1 diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template index 8f3ad34c1856..647eb3c75427 100644 --- a/srcpkgs/gnustep-base/template +++ b/srcpkgs/gnustep-base/template @@ -1,7 +1,7 @@ # Template file for 'gnustep-base' pkgname=gnustep-base -version=1.28.0 -revision=4 +version=1.29.0 +revision=1 build_style=gnu-configure hostmakedepends="gnustep-make gcc-objc pkg-config which" makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel @@ -10,8 +10,8 @@ short_desc="Library of general-purpose Objective C objects for GNUstep" maintainer="Andrew Benson " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://www.gnustep.org/" -distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz" -checksum=c7d7c6e64ac5f5d0a4d5c4369170fc24ed503209e91935eb0e2979d1601039ed +distfiles="https://github.com/gnustep/libs-base/releases/download/base-${version//./_}/gnustep-base-${version}.tar.gz" +checksum=fa58eda665c3e0b9c420dc32bb3d51247a407c944d82e5eed1afe8a2b943ef37 make_check=extended nocross="objc doesn't get cross build at present within gcc" From 6f102ebf6e79fd9356352dfc8af1aa3ed220c001 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:27:28 -0600 Subject: [PATCH 2/8] gnustep-gui: update to 0.30.0. --- common/shlibs | 2 +- srcpkgs/gnustep-gui/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index e3743d32f173..6908aac3ee9f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3686,7 +3686,7 @@ libflite_cmulex.so.1 flite-2.1_1 libflite_cmu_us_kal16.so.1 flite-2.2_1 libgtk-4.so.1 gtk4-4.0.0_1 libmodule.so.5 libmodule-5.0.0_1 -libgnustep-gui.so.0.29 gnustep-gui-0.29.0_1 +libgnustep-gui.so.0 gnustep-gui-0.30.0_1 libmhash.so.2 mhash-0.9.9.9_1 librlottie.so.0 rlottie-0.0.20160709_1 libdocopt.so.0 docopt.cpp-0.6.3_1 diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template index 03d04576f1ec..76fb960ed7ce 100644 --- a/srcpkgs/gnustep-gui/template +++ b/srcpkgs/gnustep-gui/template @@ -1,7 +1,7 @@ # Template file for 'gnustep-gui' pkgname=gnustep-gui -version=0.29.0 -revision=4 +version=0.30.0 +revision=1 build_style=gnu-configure hostmakedepends="gnustep-make pkg-config tar" makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel @@ -10,8 +10,8 @@ short_desc="Graphical user interface class library for GNUstep" maintainer="Andrew Benson " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://www.gnustep.org/" -distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz" -checksum=7bf12b29b12a2886003d3b251e8076ad284f41780c7322531676fcd54e1d6df5 +distfiles="https://github.com/gnustep/libs-gui/releases/download/gui-${version//./_}/gnustep-gui-${version}.tar.gz" +checksum=469dcaa54ed05b2520a704c30c0761a75b3ade8428e2e64645fb7b38a15c3cc3 replaces="gnustep-gui-data>=0" nocross="objc doesn't get cross build at present within gcc" From 1a3bd1b116b87426020e903744fef466b16a68b2 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:28:05 -0600 Subject: [PATCH 3/8] gnustep-back: update to 0.30.0. --- srcpkgs/gnustep-back/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnustep-back/template b/srcpkgs/gnustep-back/template index cacd0eea8e3c..857f9b32b51e 100644 --- a/srcpkgs/gnustep-back/template +++ b/srcpkgs/gnustep-back/template @@ -1,6 +1,6 @@ # Template file for 'gnustep-back' pkgname=gnustep-back -version=0.29.0 +version=0.30.0 revision=1 build_style=gnu-configure hostmakedepends="gnustep-make gcc-objc pkg-config" @@ -10,7 +10,7 @@ short_desc="Backend library for drawing GNUstep GUIs" maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="http://www.gnustep.org/" -distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz" -checksum=18dd4e9200abef16570b331e8725d2ecf808fa86d125a927cc9776e8b88a9892 +distfiles="https://github.com/gnustep/libs-back/releases/download/back-${version//./_}/gnustep-back-${version}.tar.gz" +checksum=60177d44beebd0216be4aa7eea6cf009cf9ff844bc35f0eacd622bf710372cff nocross="objc doesn't get cross build at present within gcc" From bb2424d12a058077a1ff02331ad967918a99ed54 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:18:03 -0600 Subject: [PATCH 4/8] PikoPixel.app: rebuild for gnustep-base --- srcpkgs/PikoPixel.app/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template index 753759d4263c..522211309911 100644 --- a/srcpkgs/PikoPixel.app/template +++ b/srcpkgs/PikoPixel.app/template @@ -1,7 +1,7 @@ # Template file for 'PikoPixel.app' pkgname=PikoPixel.app version=1.0.b10 -revision=2 +revision=3 build_wrksrc=PikoPixel build_style=gnu-makefile make_use_env=yes From acbc1ae18b524e2d3c58c408fb32ce99dacac8fc Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:18:03 -0600 Subject: [PATCH 5/8] SystemPreferences: rebuild for gnustep-base Pulling a GitHub archive while ftp.gnustep.org is down. --- srcpkgs/SystemPreferences/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SystemPreferences/template b/srcpkgs/SystemPreferences/template index 0d7881c5f447..958d8da7a3ea 100644 --- a/srcpkgs/SystemPreferences/template +++ b/srcpkgs/SystemPreferences/template @@ -1,7 +1,7 @@ # Template file for 'SystemPreferences' pkgname=SystemPreferences version=1.2.0 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=yes hostmakedepends="gnustep-make gcc-objc" @@ -11,6 +11,6 @@ short_desc="GNUstep preferences application" maintainer="Phosu Parsons " license="GPL-2.0-only" homepage="http://gnustep.org/experience/systempreferences.html" -distfiles="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${pkgname}-${version}.tar.gz" -checksum=690cfd28552c5883fe06a89283f44574f41d937627b41c8435743f07e360e7b9 +distfiles="https://github.com/gnustep/apps-systempreferences/archive/refs/tags/systempreferences-${version//./_}.tar.gz" +checksum=274d4f77eb06410bbd7c6df58742c9485f63dedf6bbd86e2dd10be10ec249461 nocross="objc doesn't get cross build at present within gcc (see gnustep-base)" From 7e9d35ae7ea3c7b08ca205cda4c021e8f4cb2bf0 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:18:03 -0600 Subject: [PATCH 6/8] Terminal: rebuild for gnustep-base --- srcpkgs/Terminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Terminal/template b/srcpkgs/Terminal/template index 9cd7970fcc2e..08ae4320ef37 100644 --- a/srcpkgs/Terminal/template +++ b/srcpkgs/Terminal/template @@ -1,7 +1,7 @@ # Template file for 'Terminal' pkgname=Terminal version=0.9.9 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=yes make_build_args="OBJCFLAGS=-fcommon messages=yes" From 7030c081d69e6341582137489c9382f8e27efc74 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:18:03 -0600 Subject: [PATCH 7/8] gorm: rebuild for gnustep-base Pulling a GitHub archive while ftp.gnustep.org is down; also, pulling the correct git commit hash since the GitHub doesn't properly tag releases. --- srcpkgs/gorm/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gorm/template b/srcpkgs/gorm/template index 6cb613fd317b..9bd75307357a 100644 --- a/srcpkgs/gorm/template +++ b/srcpkgs/gorm/template @@ -1,7 +1,8 @@ # Template file for 'gorm' pkgname=gorm version=1.2.28 -revision=1 +revision=2 +_gitrev=f97cfac1c8d30b8662cdec03e6f1340140b7e90f build_style=gnu-makefile make_use_env=yes hostmakedepends="gnustep-make" @@ -10,5 +11,5 @@ short_desc="Graphical Object Relationship Modeller for GNUstep" maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="http://www.gnustep.org/experience/Gorm.html" -distfiles="http://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz" -checksum=8a4f377f57637e415b2fdd93e0945e3652f9c25f53205aa0cad0198ed1537c37 +distfiles="https://github.com/gnustep/apps-gorm/archive/${_gitrev}.tar.gz" +checksum=e9577be68f003b6b6a22587837a3150c484c69fa5b2a31d2024d6ff1674f29dc From abfa2c698cccb22de39219ca02530810399750cf Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 Jan 2023 08:18:04 -0600 Subject: [PATCH 8/8] unar: rebuild for gnustep-base --- srcpkgs/unar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template index f8a7f134da9d..bfeee302a80a 100644 --- a/srcpkgs/unar/template +++ b/srcpkgs/unar/template @@ -1,7 +1,7 @@ # Template file for 'unar' pkgname=unar version=1.10.7 -revision=9 +revision=10 archs="~*-musl" # regexec incompatible build_wrksrc="XADMaster" build_style=gnu-makefile