Update to version 6860

- compiled from source as required by the AUR guidelines - updated to latest upstream version
author: Freddy Potargent 2025-01-09 13:34:07 +0100
committer: Freddy Potargent 2025-01-09 13:34:07 +0100
commit: bb93194902a200a2fc3803f6fbfd9b772dec2d38 (patch)
tree: 025ee6e550c692951071c4dcf7a6d70187c22787
parent: 027eb99bbd6b9437d7b7dbc744e42f17bf4beb72 (diff)
parent: 683d365fe423b55a0246f215b9edcfdbc0798016 (diff)
download: aur-reduce.tar.gz
6 files changed, 210 insertions, 63 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f30b587d3c29..f0d7701a500d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,50 +1,72 @@
 pkgbase = reduce
-	pkgver = 6339
+	pkgdesc = A Portable General-Purpose Computer Algebra System
+	pkgver = 6860
 	pkgrel = 1
 	url = https://reduce-algebra.sourceforge.io/
 	arch = x86_64
-	license = BSD
-	depends = ncurses
-	depends = libxrandr
-	depends = libxft
-	depends = freetype2
-	depends = expat
+	license = BSD-2-Clause
+	license = LGPL-2.1-only
+	makedepends = rsync
+	makedepends = texlive-fontsrecommended
+	makedepends = texlive-latex
+	makedepends = texlive-latexextra
+	makedepends = texlive-plaingeneric
+	depends = bash
+	depends = fontconfig
+	depends = gcc-libs
+	depends = glibc
+	depends = hicolor-icon-theme
+	depends = libx11
 	depends = libxcursor
-	noextract = reduce-common_6339_all.tgz
-	noextract = reduce-csl_6339_amd64.tgz
-	noextract = reduce-psl_6339_amd64.tgz
-	noextract = reduce-addons_6339_amd64.tgz
-	source = https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2022-06-17/linux64/reduce-common_6339_all.tgz
-	source = https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2022-06-17/linux64/reduce-csl_6339_amd64.tgz
-	source = https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2022-06-17/linux64/reduce-psl_6339_amd64.tgz
-	source = https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2022-06-17/linux64/reduce-addons_6339_amd64.tgz
-	md5sums = 62a149738bf686fe95dfea01a85db473
-	md5sums = d120ef3439345b81451fac9aaf313914
-	md5sums = 5b91954a19c91c4327c3ceaac1581cba
-	md5sums = e9241bc1c0fd49396e914a637a951b6b
-	sha1sums = 494ab79032558069ad1360ab83d796b95019e9b3
-	sha1sums = 22a0afcc43e5c95f550cbc2da0021214b22ec918
-	sha1sums = d412b38e12984dd9580e4e9183a48f7ec7ed7e29
-	sha1sums = ab4326cca91964d0db6e3e2da928a16907785d38
+	depends = libxext
+	depends = libxft
+	depends = libxrandr
+	depends = ncurses
+	depends = zlib
+	options = !makeflags
+	options = strip
+	options = zipman
+	source = https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2024-08-12/Reduce-svn6860-src.tar.gz
+	source = fixes.patch
+	source = build.patch
+	sha256sums = bf084f096839c1ed06207d56ae8e84d1097dce9f3a95d84adb26c9465a92718d
+	sha256sums = d630ec524525a38cf744920b185aac95b580eeb6b405a85dfe7dcbe17daa3a1b
+	sha256sums = 4bd5a8c7b4cf77c728a0086c09fa6ab2975756e710dc14381f0ab201ea166833
 
 pkgname = reduce-common
 	pkgdesc = A Portable General-Purpose Computer Algebra System -- common files
-	provides = reduce-common
-	conflicts = reduce-common
+	arch = any
+	depends = bash
+	depends = hicolor-icon-theme
 
 pkgname = reduce-csl
 	pkgdesc = A Portable General-Purpose Computer Algebra System -- CSL based
 	depends = reduce-common
-	provides = reduce-csl
-	conflicts = reduce-csl
+	depends = bash
+	depends = fontconfig
+	depends = gcc-libs
+	depends = glibc
+	depends = libx11
+	depends = libxcursor
+	depends = libxext
+	depends = libxft
+	depends = libxrandr
+	depends = ncurses
+	depends = zlib
+	optdepends = gnuplot: for plotting graphs
+	provides = reduce
 
 pkgname = reduce-psl
 	pkgdesc = A Portable General-Purpose Computer Algebra System -- PSL based
 	depends = reduce-common
-	provides = reduce-psl
-	conflicts = reduce-psl
+	depends = bash
+	depends = glibc
+	optdepends = gnuplot: for plotting graphs
+	provides = reduce
 
 pkgname = reduce-addons
 	pkgdesc = A Portable General-Purpose Computer Algebra System -- addons
-	provides = reduce-addons
-	conflicts = reduce-addons
+	depends = reduce
+	depends = bash
+	depends = glibc
+	depends = ncurses
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1461d958a952
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# Exclude everything (force-add files when needed)
+*
+
+# Do not ignore the following files
+!.gitignore
+!PKGBUILD
+!README.md
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 69b3b13c2be0..53e6a580e0fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,94 @@
-# Maintainter: Lu Xu <oliver_lew at outlook dot com>
+# Maintainer: Freddy Potargent <fpotargent at gmail dot com>
+# Contributor: Lu Xu <oliver_lew at outlook dot com>
 
 pkgbase=reduce
 pkgname=(reduce-common reduce-csl reduce-psl reduce-addons)
-pkgver=6339
+pkgdesc="A Portable General-Purpose Computer Algebra System"
+pkgver=6860
 pkgrel=1
 arch=('x86_64')
 url="https://reduce-algebra.sourceforge.io/"
-license=('BSD')
-depends=('ncurses' 'libxrandr' 'libxft' 'freetype2' 'expat' 'libxcursor')
-source_urlbase="https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2022-06-17/linux64"
-source=("$source_urlbase/reduce-common_${pkgver}_all.tgz"
-        "$source_urlbase/reduce-csl_${pkgver}_amd64.tgz"
-        "$source_urlbase/reduce-psl_${pkgver}_amd64.tgz"
-        "$source_urlbase/reduce-addons_${pkgver}_amd64.tgz")
-md5sums=('62a149738bf686fe95dfea01a85db473'
-         'd120ef3439345b81451fac9aaf313914'
-         '5b91954a19c91c4327c3ceaac1581cba'
-         'e9241bc1c0fd49396e914a637a951b6b')
-sha1sums=('494ab79032558069ad1360ab83d796b95019e9b3'
-          '22a0afcc43e5c95f550cbc2da0021214b22ec918'
-          'd412b38e12984dd9580e4e9183a48f7ec7ed7e29'
-          'ab4326cca91964d0db6e3e2da928a16907785d38')
-noextract=("${source[@]##*/}")
+license=('BSD-2-Clause' 'LGPL-2.1-only')
+depends=('bash' 'fontconfig' 'gcc-libs' 'glibc' 'hicolor-icon-theme' 'libx11'
+         'libxcursor' 'libxext' 'libxft' 'libxrandr' 'ncurses' 'zlib')
+makedepends=('rsync' 'texlive-fontsrecommended' 'texlive-latex'
+             'texlive-latexextra' 'texlive-plaingeneric')
+options=('!makeflags' 'strip' 'zipman')
+
+_source_urlbase="https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_2024-08-12"
+source=("${_source_urlbase}/Reduce-svn6860-src.tar.gz"
+        "fixes.patch"
+        "build.patch")
+sha256sums=('bf084f096839c1ed06207d56ae8e84d1097dce9f3a95d84adb26c9465a92718d'
+            'd630ec524525a38cf744920b185aac95b580eeb6b405a85dfe7dcbe17daa3a1b'
+            '4bd5a8c7b4cf77c728a0086c09fa6ab2975756e710dc14381f0ab201ea166833')
+
+CFLAGS+=" -Wno-error=format-security"
+CXXFLAGS+=" -Wno-error=format-security"
+
+prepare() {
+    echo "$pkgver" >"$srcdir/Reduce-svn${pkgver}-src"/svnversion.txt
+    patch -p0 <fixes.patch
+    patch -p0 <build.patch
+}
+
+build() {
+    local SRCDIR="$(readlink -m $srcdir)"
+    local BUILDTOPDIR="$SRCDIR/Reduce-svn${pkgver}-src"
+    local STAGINGDIR="$SRCDIR/staging"
+    local DEBIANDIR="$BUILDTOPDIR/debianbuild/reduce"
+
+    rm -rf "$STAGINGDIR"
+    mkdir -p "$STAGINGDIR"
+
+    cd "$DEBIANDIR"
+    make -f debian/rules BUILDTOPDIR="${BUILDTOPDIR}" configure
+    make -f debian/rules BUILDTOPDIR="${BUILDTOPDIR}" build
+    make -f debian/rules BUILDTOPDIR="$BUILDTOPDIR" INSTALLDIR="$STAGINGDIR" install
+
+    for docdir in reduce-common reduce-csl reduce-psl reduce-addons; do
+        local docsharedir="$STAGINGDIR/usr/share/doc/$docdir"
+        mkdir -p "$docsharedir"
+        cp "$DEBIANDIR/debian/changelog" "$DEBIANDIR/debian/copyright" "$docsharedir"
+    done
+}
+
+_package_filelist() {
+    local file="$srcdir/Reduce-svn${pkgver}-src/debianbuild/reduce/debian/$1"
+
+    tar -c -C "$srcdir/staging" --files-from="$file" | tar -x -C "$pkgdir"
+}
 
 package_reduce-common() {
-    provides=('reduce-common')
-    conflicts=('reduce-common')
     pkgdesc="A Portable General-Purpose Computer Algebra System -- common files"
+    arch=('any')
+    depends=('bash' 'hicolor-icon-theme')
 
-    tar zxf reduce-common_${pkgver}_all.tgz -C $pkgdir
+    _package_filelist reduce-common.install
 }
 
 package_reduce-csl() {
-    depends=('reduce-common')
-    provides=('reduce-csl')
-    conflicts=('reduce-csl')
     pkgdesc="A Portable General-Purpose Computer Algebra System -- CSL based"
+    provides=('reduce')
+    depends=('reduce-common' 'bash' 'fontconfig' 'gcc-libs' 'glibc' 'libx11'
+             'libxcursor' 'libxext' 'libxft' 'libxrandr' 'ncurses' 'zlib')
+    optdepends=('gnuplot: for plotting graphs')
 
-    tar zxf reduce-csl_${pkgver}_amd64.tgz -C $pkgdir
+    _package_filelist reduce-csl.install
 }
 
 package_reduce-psl() {
-    depends=('reduce-common')
-    provides=('reduce-psl')
-    conflicts=('reduce-psl')
     pkgdesc="A Portable General-Purpose Computer Algebra System -- PSL based"
+    provides=('reduce')
+    depends=('reduce-common' 'bash' 'glibc')
+    optdepends=('gnuplot: for plotting graphs')
 
-    tar zxf reduce-psl_${pkgver}_amd64.tgz -C $pkgdir
+    _package_filelist reduce-psl.install
 }
 
 package_reduce-addons() {
-    provides=('reduce-addons')
-    conflicts=('reduce-addons')
     pkgdesc="A Portable General-Purpose Computer Algebra System -- addons"
+    depends=('reduce' 'bash' 'glibc' 'ncurses')
 
-    tar zxf reduce-addons_${pkgver}_amd64.tgz -C $pkgdir
+    _package_filelist reduce-addons.install
 }
diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..1c1c7dbab72b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+# Reduce Algebra - Arch User Repositories (AUR) package development
+
+> **Do not install the _reduce_ package group from this repository,
+> use the released package(s) on the AUR.**
+
+_Reduce_ is a portable general-purpose computer algebra system with
+many features. Visit the homepage for more information:
+<https://reduce-algebra.sourceforge.io/>
+
+This repository is used for developing/updating the package for the
+AUR.  The rationale behind the update work is two-fold:
+
+* The current package in the AUR is flagged "out-of-date" as newer
+  official releases are available.
+* The package should be built from source to comply with the
+  [AUR submission guidelines](https://wiki.archlinux.org/title/AUR_submission_guidelines).
+  (also see the
+  [flag comment](https://aur.archlinux.org/pkgbase/reduce/flag-comment)).
+
+## Short term goals
+
+* Build from source and mimic the official Debian releases
+* Report changes/bugs/... upstream
+* Release a `reduce-bin` package from the offical release packages
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..0bd597475ce2
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,48 @@
+diff -Naur Reduce-svn6860-src.orig/debianbuild/reduce/debian/rules Reduce-svn6860-src/debianbuild/reduce/debian/rules
+--- Reduce-svn6860-src.orig/debianbuild/reduce/debian/rules	2023-03-07 22:36:03.000000000 +0100
++++ Reduce-svn6860-src/debianbuild/reduce/debian/rules	2025-01-09 04:22:15.586480336 +0100
+@@ -59,8 +59,8 @@
+ RSYNC_CMD=rsync -a --cvs-exclude --delete --delete-excluded
+ 
+ 
+-%:
+-	dh $@ 
++# %:
++# 	dh $@
+ 
+ distclean:
+ 	dh_distclean
+@@ -92,7 +92,7 @@
+ #override_dh_auto_configure:
+ configure: configure-stamp
+ configure-stamp:
+-	dh_testdir
++#	dh_testdir
+ 	cd $(TOPDIR) ; ./configure --prefix=/usr --with-csl
+ ifneq ($(BUILDPSL),)
+ 	cd $(TOPDIR) ; ./configure --with-psl
+@@ -101,13 +101,13 @@
+ 	cd $(REDFRONTSRCDIR) ; autoreconf -f -i -v
+ 	cd $(REDFRONTBUILDDIR) ; ../configure
+ 	mkdir -p $(LIBEDITBUILDDIR)
+-	cd $(LIBEDITBUILDDIR) ; autoreconf -f -i -v; $(LIBEDITSRCDIR)/configure --prefix=$(REDFRONTSRCDIR) --enable-widec
++	cd $(LIBEDITBUILDDIR) ; autoreconf -f -i -v $(LIBEDITSRCDIR); $(LIBEDITSRCDIR)/configure --prefix=$(REDFRONTSRCDIR) --enable-widec
+ 	touch configure-stamp
+ 
+ 
+ build:	configure-stamp build-stamp
+ build-stamp:
+-	dh_testdir
++#	dh_testdir
+ #	cd $(TOPDIR) ; make
+ 	cd $(CSLBUILDDIR) ; make bootstrapreduce.img ; make csl.img ; make
+ ifneq ($(BUILDPSL),)
+@@ -196,7 +196,7 @@
+ 	chmod a-x $(DESKTOPDIR)/*.desktop
+ 
+ # run dh_install to copy the files into the package build dirs
+-	dh_install
++#	dh_install
+ 
+ 	touch install-stamp
+ 
diff --git a/fixes.patch b/fixes.patch
new file mode 100644
index 000000000000..6702dacf81cd
--- /dev/null
+++ b/fixes.patch
@@ -0,0 +1,9 @@
+diff -Naur Reduce-svn6860-src.orig/debianbuild/reduce/debian/reduce-psl.install Reduce-svn6860-src/debianbuild/reduce/debian/reduce-psl.install
+--- Reduce-svn6860-src.orig/debianbuild/reduce/debian/reduce-psl.install	2021-11-29 18:30:09.000000000 +0100
++++ Reduce-svn6860-src/debianbuild/reduce/debian/reduce-psl.install	2025-01-09 02:51:05.803328330 +0100
+@@ -2,4 +2,4 @@
+ usr/lib/reduce/pslbuild
+ usr/share/man/man1/redpsl.1
+ usr/share/reduce/pslbuild
+-/usr/share/applications/redpsl.desktop
++usr/share/applications/redpsl.desktop
author	Freddy Potargent	2025-01-09 13:34:07 +0100
committer	Freddy Potargent	2025-01-09 13:34:07 +0100
commit	bb93194902a200a2fc3803f6fbfd9b772dec2d38 (patch)
tree	025ee6e550c692951071c4dcf7a6d70187c22787
parent	027eb99bbd6b9437d7b7dbc744e42f17bf4beb72 (diff)
parent	683d365fe423b55a0246f215b9edcfdbc0798016 (diff)
download	aur-reduce.tar.gz