bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove aegis.

Browse source 
* gnu/packages/patches/aegis-constness-error.patch,
* gnu/packages/patches/aegis-perl-tempdir1.patch,
* gnu/packages/patches/aegis-perl-tempdir2.patch,
* gnu/packages/patches/aegis-test-fixup-1.patch,
* gnu/packages/patches/aegis-test-fixup-2.patch: Remove files.
* gnu/local.mk: Remove references to the patches above.
* gnu/packages/version-control.scm (aegis): Delete variable.

Change-Id: If2c34fc9b93204b4b2aa248911d4d0e5002f8f8e
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Anderson Torres 2025-12-17 14:17:24 -03:00 • committed by Andreas Enge
parent 65c729ac83
commit 9f4eb225f3
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
7 changed files with 0 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/local.mk
View file

@ -971,11 +971,6 @@ dist_patch_DATA = \
%D%/packages/patches/adb-add-libraries.patch \
%D%/packages/patches/adb-libssl_11-compatibility.patch \
%D%/packages/patches/accountsservice-extensions.patch \
%D%/packages/patches/aegis-constness-error.patch \
%D%/packages/patches/aegis-perl-tempdir1.patch \
%D%/packages/patches/aegis-perl-tempdir2.patch \
%D%/packages/patches/aegis-test-fixup-1.patch \
%D%/packages/patches/aegis-test-fixup-2.patch \
%D%/packages/patches/aegisub-icu59-include-unistr.patch \
%D%/packages/patches/aegisub-boost68.patch \
%D%/packages/patches/aegisub-boost81.patch \

12
gnu/packages/patches/aegis-constness-error.patch
View file

@ -1,12 +0,0 @@
Fixes a fatal constness error with g++ 4.8.2.
--- aegis-4.24/common/ac/string/memmem.cc 2008-03-14 07:19:27.000000000 +0100
+++ aegis-4.24/common/ac/string/memmem.cc 2014-01-26 11:17:58.000000000 +0100
@@ -182,7 +182,7 @@
// Use optimizations in memchr when possible.
if (needle_len == 1)
- return memchr(haystack, *needle, haystack_len);
+ return (void *) memchr(haystack, *needle, haystack_len);
// Minimizing the worst-case complexity:
// Let n = haystack_len, m = needle_len.

14
gnu/packages/patches/aegis-perl-tempdir1.patch
View file

@ -1,14 +0,0 @@
This patch removes the hard coded temporary directory (which might not exist on the system)
and replaces it using the Perl preferred method.
--- aegis-4.24/script/aebisect.in 2008-03-14 07:19:27.000000000 +0100
+++ aegis-4.24/script/aebisect.in 2014-01-26 11:03:31.000000000 +0100
@@ -34,7 +34,8 @@
# @configure_input@
#
# Configure additions?
-my $TmpDir = "/var/tmp";
+use File::Temp qw/ tempdir /;
+my $TmpDir = tempdir();
my $ProgramName = "aebisect";
require 5.004;

18
gnu/packages/patches/aegis-perl-tempdir2.patch
View file

@ -1,18 +0,0 @@
--- aegis-4.24/script/aeintegratq.in 2008-03-14 07:19:27.000000000 +0100
+++ aegis-4.24/script/aeintegratq.in 2014-01-26 16:08:22.000000000 +0100
@@ -49,13 +49,14 @@
#
# @configure_input@
#
+use File::Temp qw/ tempdir /;
# Grab useful locations from configure
$BinDir = "@bindir@";
# configure does not expand @comdir@ directly so use sharedstatedir
$ComDir = "@sharedstatedir@";
# Configure additions?
-$TmpDir = "/var/tmp";
+$TmpDir = tempdir();
# base mail program that takes all info (to: subj: etc) on stdin
$SendMail = "/usr/lib/sendmail";
# Define the preferred integration host

15
gnu/packages/patches/aegis-test-fixup-1.patch
View file

@ -1,15 +0,0 @@
This test fails because it expects a MIME type "Content-Type: image/gif"
whereas that provided by libmagic is "Content-Type: image/gif; charset=binary"
Presumably the test was written against a different version.
--- aegis-4.24/test/02/t0228a-matt.sh 2008-03-14 07:19:27.000000000 +0100
+++ aegis-4.24/test/02/t0228a-matt.sh 2014-01-27 09:43:44.000000000 +0100
@@ -147,7 +147,8 @@
SCRIPT_NAME=/cgi-bin/aeget \
PATH_INFO=icon/rss.gif \
QUERY_STRING= \
-$bin/aeget > rss.served.gif 2>&1
+$bin/aeget \
+| sed -e 's%^Content-Type: image/gif; charset=binary%Content-Type: image/gif%' > rss.served.gif 2>&1
if test $? -ne 0 ; then fail; fi
# Compare the expected and the actual received file.

24
gnu/packages/patches/aegis-test-fixup-2.patch
View file

@ -1,24 +0,0 @@
This test was failing with subversion 1.7.8 because the svn repository structure
was not as the test expected. Presumably the test relies on different version.
--- aegis-4.24/test/02/t0222a-pmil.sh 2008-03-14 07:19:27.000000000 +0100
+++ aegis-4.24/test/02/t0222a-pmil.sh 2014-01-27 19:48:30.000000000 +0100
@@ -268,7 +268,8 @@
-c 10 > log 2>&1
if test $? -ne 0 ; then cat log; fail; fi
-test -f $work/svnroot/db/revs/2 || fail
+activity="check svn db 271"
+test -f $work/svnroot/db/revs/0/2 || test -f $work/svnroot/db/revs/2 || fail
# --------------------------------------------------------------------------
@@ -364,7 +365,8 @@
-c 3 > log 2>&1
if test $? -ne 0 ; then cat log; fail; fi
-test -f $work/svnroot/db/revs/3 || fail
+activity="check svn db 368"
+test -f $work/svnroot/db/revs/0/3 || test -f $work/svnroot/db/revs/3 || fail
#
# Only definite negatives are possible.

96
gnu/packages/version-control.scm
View file

@ -3314,102 +3314,6 @@ code control system SCCS. This allows old code still under that system to be
accessed and migrated on modern systems.")
(license license:gpl3+)))
;; This package can unfortunately work only in -TEST mode, since Aegis
;; requires that it is installed setuid root.
(define-public aegis
(package
(name "aegis")
(version "4.24")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/aegis/aegis/" version
"/aegis-" version ".tar.gz"))
(sha256
(base32
"18s86ssarfmc4l17gbpzybca29m5wa37cbaimdji8czlcry3mcjl"))
(patches (search-patches "aegis-perl-tempdir1.patch"
"aegis-perl-tempdir2.patch"
"aegis-test-fixup-1.patch"
"aegis-test-fixup-2.patch"
"aegis-constness-error.patch"))))
(build-system gnu-build-system)
(inputs
`(("e2fsprogs" ,e2fsprogs)
("curl" ,curl)
("file" ,file)
("libxml2" ,libxml2)
("zlib" ,zlib)
("gettext" ,gettext-minimal)))
(native-inputs
(list bison
groff
perl
;; Various tests require the following:
cvs
flex
cook
subversion
rcs
ed))
(arguments
`(#:configure-flags (list "--with-no-aegis-configured"
"--sharedstatedir=/var/com/aegis"
;; Uses the old 'throw()' specifier with 'new'
;; which changed in C++11.
"CXXFLAGS=-std=c++03")
#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-conf
(lambda _
(substitute* (append '("configure"
"etc/check-tar-gz.sh"
"etc/patches.sh"
"etc/test.sh"
"script/aexver.in"
"script/aebisect.in"
"script/aeintegratq.in"
"script/tkaegis.in"
"script/test_funcs.in"
"web/eg_oss_templ.sh"
"web/webiface.html"
"libaegis/getpw_cache.cc")
(find-files "test" "\\.sh"))
(("/bin/sh") (which "sh")))
(setenv "SH" (which "sh"))
#t))
(replace 'check
(lambda _
(let ((home (string-append (getcwd) "/my-new-home")))
;; Some tests need to write to $HOME.
(mkdir home)
(setenv "HOME" home)
;; This test assumes that flex has been symlinked to "lex".
(substitute* "test/00/t0011a.sh"
(("type lex") "type flex"))
;; XXX Disable tests that fail, for unknown reasons, ‘for now’.
(for-each
(lambda (test) (substitute* "Makefile"
(((string-append "test/" test "\\.ES ")) "")))
(list "00/t0011a"
"00/t0049a"
"01/t0196a"))
;; The author decided to call the check rule "sure".
(invoke "make" "sure")))))))
(home-page "https://sourceforge.net/projects/aegis/")
(synopsis "Project change supervisor")
(description "Aegis is a project change supervisor, and performs some of
the Software Configuration Management needed in a CASE environment. Aegis
provides a framework within which a team of developers may work on many
changes to a program independently, and Aegis coordinates integrating these
changes back into the master source of the program, with as little disruption
as possible. Resolution of contention for source files, a major headache for
any project with more than one developer, is one of Aegis's major functions.")
(license license:gpl3+)))
(define-public tig
(package
(name "tig")