Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix texinfo trigger & remove conflicting /usr/share/info/dir files #122

Merged
merged 4 commits into from
Jan 28, 2024
Merged

Fix texinfo trigger & remove conflicting /usr/share/info/dir files #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56dc99b
texinfo: Fix trigger file
der-eismann Jan 27, 2024
990a86a
bc: Remove conflicting `/usr/share/info/dir`
der-eismann Jan 27, 2024
d626330
groff: Remove conflicting `/usr/share/info/dir`
der-eismann Jan 27, 2024
6b8772a
gcc: Add comment to remove `/usr/share/info/dir`
der-eismann Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified b/bc/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions b/bc/manifest.x86_64.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"/usr/bin/dc",
"/usr/share/info/bc.info",
"/usr/share/info/dc.info",
"/usr/share/info/dir",
"/usr/share/man/man1/bc.1",
"/usr/share/man/man1/dc.1"
],
Expand All @@ -31,6 +30,6 @@
}
},
"source-name": "bc",
"source-release": "4",
"source-release": "5",
"source-version": "1.07.1"
}
5 changes: 3 additions & 2 deletions b/bc/stone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# SPDX-License-Identifier: MPL-2.0
#
name : bc
version : 1.07.1
release : 4
version : '1.07.1'
release : 5
homepage : https://ftp.gnu.org/gnu/bc
upstreams :
- https://ftp.gnu.org/gnu/bc/bc-1.07.1.tar.gz : 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
Expand All @@ -28,3 +28,4 @@ build : |
%make -j1
install : |
%make_install -j1
rm -rf %(installroot)/usr/share/info/dir
2 changes: 2 additions & 0 deletions g/gcc/stone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ install : |
%install_dir %(installroot)/%(datadir)/gdb/auto-load/%(libdir)32
mv %(installroot)/%(libdir)/libstdc++.so.*-gdb.py %(installroot)/%(datadir)/gdb/auto-load/%(libdir)/.
mv %(installroot)/%(libdir)32/libstdc++.so.*-gdb.py %(installroot)/%(datadir)/gdb/auto-load/%(libdir)32/.
# TODO: Remove /usr/share/info/dir, don't want to rebuild gcc now
# rm -rf %(installroot)/usr/share/info/dir
toolchain : gnu
tuning :
- fortify: false
Expand Down
Binary file modified g/groff/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions g/groff/manifest.x86_64.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,6 @@
"/usr/share/groff/site-font",
"/usr/share/groff/site-tmac/man.local",
"/usr/share/groff/site-tmac/mdoc.local",
"/usr/share/info/dir",
"/usr/share/info/groff.info",
"/usr/share/info/groff.info-1",
"/usr/share/info/groff.info-2",
Expand Down Expand Up @@ -1015,6 +1014,6 @@
}
},
"source-name": "groff",
"source-release": "2",
"source-release": "3",
"source-version": "1.23.0"
}
3 changes: 2 additions & 1 deletion g/groff/stone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
name : groff
version : '1.23.0'
release : 2
release : 3
homepage : https://www.gnu.org/software/groff/
upstreams :
- https://mirrors.rit.edu/gnu/groff/groff-1.23.0.tar.gz : 6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13
Expand All @@ -22,3 +22,4 @@ build : |
%make AR=llvm-ar
install : |
%make_install
rm -rf %(installroot)/usr/share/info/dir
Binary file modified t/texinfo/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion t/texinfo/manifest.x86_64.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,6 @@
}
},
"source-name": "texinfo",
"source-release": "6",
"source-release": "7",
"source-version": "7.1"
}
4 changes: 2 additions & 2 deletions t/texinfo/pkg/trigger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ description: |

handlers:
install_info:
run: /bin/install-info
run: /usr/bin/install-info
args: ["/usr/share/info/$(item)", "/usr/share/info/dir"]

paths:
"/usr/share/info/(item:*.info*)" :
handlers:
- install_info
- install_info
2 changes: 1 addition & 1 deletion t/texinfo/stone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
name : texinfo
version : '7.1'
release : 6
release : 7
summary : GNU software documentation system
license : GPL-3.0-or-later
homepage : https://www.gnu.org/software/texinfo
Expand Down
Loading