- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] meson: fix libcommon being publicly exposed as a static link dependency
by Eli Schwartz 02 Oct '19

02 Oct '19

libcommon isn't even installed, so that means libalpm.a (if installed) is fatally broken as it misses objects. The problem is that meson doesn't handle this case correctly: https://github.com/mesonbuild/meson/issues/3934 https://github.com/mesonbuild/meson/issues/3937 https://github.com/mesonbuild/meson/pull/3939 Work around this by manually extracting libcommon's .o files into the list of objects used to create libalpm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 389a95b7..5199759f 100644 --- a/meson.build +++ b/meson.build @@ -317,9 +317,10 @@ libcommon = static_library( libalpm_a = static_library( 'alpm', libalpm_sources, + # https://github.com/mesonbuild/meson/issues/3937 + objects : libcommon.extract_all_objects(), include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl, gpgme], - link_with : [libcommon], install : true) if get_option('default_library') != 'static' @@ -336,7 +337,6 @@ install_headers( 'lib/libalpm/alpm.h', 'lib/libalpm/alpm_list.h') -# TODO: libs.private seem quite wrong here pkgconfig = import('pkgconfig') pkgconfig.generate( libalpm, -- 2.23.0

1 2

[pacman-dev] Idea for makepkg. Use notify-send when package finishes compiling. (optional feature)
by igo95862 28 Sep '19

28 Sep '19

Often when compiling large packages I find myself missing the "sudo" promt to install compiled package. I have thought of a solution using notify-send command from community/inotify-tools package that will send a notification when the package finishes compiling. (but before install) Could be implemented as an opt-in option in makepkg.conf If you are interested I can send a patch. -- igo95862 <igo95862(a)yandex.ru>

2 2

[pacman-dev] [PATCH] meson: fix incorrect libalpm version
by Eli Schwartz 19 Sep '19

19 Sep '19

LIB_VERSION is supposed to be something like 11.0.1, not simply reiterate the project version. As a result, we ended up with this: $ pacman -V [...] Pacman v5.1.0 - libalpm v5.1.0 [...] Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 650e599f..f5601ff8 100644 --- a/meson.build +++ b/meson.build @@ -69,7 +69,7 @@ conf.set_quoted('PACKAGE_VERSION', PACKAGE_VERSION) conf.set_quoted('LOCALEDIR', LOCALEDIR) conf.set_quoted('SCRIPTLET_SHELL', get_option('scriptlet-shell')) conf.set_quoted('LDCONFIG', LDCONFIG) -conf.set_quoted('LIB_VERSION', meson.project_version()) +conf.set_quoted('LIB_VERSION', libalpm_version) conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/')) -- 2.23.0

1 0

[pacman-dev] [PATCH] pacman: better handle -F when file is not found
by morganamilo 10 Sep '19

10 Sep '19

Error messages are now printed. Pacman now returns 1 if any of the files queried are not found. --- src/pacman/files.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 8e518486..c4351114 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -115,7 +115,6 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if(regex) { if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - /* TODO: error message */ goto notfound; } } @@ -174,13 +173,20 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { regfree(&reg); } + if(found) { + continue; + } + notfound: - if(!found) { - ret++; + ret = 1; + if(regex) { + pm_printf(ALPM_LOG_ERROR, _("no files match '%s'\n"), targ); + } else { + pm_printf(ALPM_LOG_ERROR, _("no package owns '%s'\n"), targ); } } - return 0; + return ret; } static void dump_file_list(alpm_pkg_t *pkg) { -- 2.23.0

2 1

[pacman-dev] [PATCH] libmakepkg: fix typo
by morganamilo 09 Sep '19

09 Sep '19

--- scripts/libmakepkg/buildenv.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index a8d416c8..085e1380 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -1,7 +1,7 @@ #!/bin/bash # # buildenv.sh - functions for altering the build environment before -# compiliation +# compilation # # Copyright (c) 2015-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # -- 2.23.0

1 0

[pacman-dev] [PATCH 1/2] pacman: pacman-conf: removed hputs macro for usage display
by Matthew Sexton 09 Sep '19

09 Sep '19

From: Matthew Sexton <WSDMatty(a)gmail.com> Using the macro got in the way of _() macro for translation All the macro did was make it so the writer didn't have to type \n", stream); at the end of every line. --- src/pacman/pacman-conf.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index df874029..d9e596b8 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -37,19 +37,17 @@ static void cleanup(void) static void usage(int ret) { FILE *stream = (ret ? stderr : stdout); -#define hputs(x) fputs(x"\n", stream) - hputs("pacman-conf - query pacman's configuration file"); - hputs("usage: pacman-conf [options] [<directive>...]"); - hputs(" pacman-conf (--repo-list|--help|--version)"); - hputs("options:"); - hputs(" -c, --config=<path> set an alternate configuration file"); - hputs(" -R, --rootdir=<path> set an alternate installation root"); - hputs(" -r, --repo=<remote> query options for a specific repo"); - hputs(" -v, --verbose always show directive names"); - hputs(" -l, --repo-list list configured repositories"); - hputs(" -h, --help display this help information"); - hputs(" -V, --version display version information"); -#undef hputs + fputs("pacman-conf - query pacman's configuration file\n", stream); + fputs("usage: pacman-conf [options] [<directive>...]\n", stream); + fputs(" pacman-conf (--repo-list|--help|--version)\n", stream); + fputs("options:\n", stream); + fputs(" -c, --config=<path> set an alternate configuration file\n", stream); + fputs(" -R, --rootdir=<path> set an alternate installation root\n", stream); + fputs(" -r, --repo=<remote> query options for a specific repo\n", stream); + fputs(" -v, --verbose always show directive names\n", stream); + fputs(" -l, --repo-list list configured repositories\n", stream); + fputs(" -h, --help display this help information\n", stream); + fputs(" -V, --version display version information\n", stream); cleanup(); exit(ret); } -- 2.23.0

1 1

[pacman-dev] Proposed Changelog Feature
by Hong Shick Pak 07 Sep '19

07 Sep '19

Hello! I noticed that PKGBUILD supports a 'changelog=' field to specify a file that contains release notes for that package and this is query-able via 'pacman -Qc <package>'. A lot of software these days maintain a CHANGELOG.md or NEWS file that keeps track of notable changes across versions (including pacman). Would it be possible for the PKGBUILD to allow users to specify a file to set for 'changelog=' relative to $srcdir? Of all the packages installed on my system, only 'terraform' and 'powertop' have a changelog set. This change would make it extremely trivial for package maintainers to specify a changelog file if one exists for a project. I think it would be a nice QoL win for Arch users if more packages took advantage of this feature. Let me know if there's an official RFC process for changes! I was not able to find any evidence of one. Hong

4 3

[pacman-dev] Starting Pacman development
by Matthew Sexton 07 Sep '19

07 Sep '19

What are some tasks that someone could tackle to get familiar with the project? I am familiar with C, and have perused Pacman bugs and source. But I don't feel like I know the application enough to really be helpful. And I don't really know where to start. Thank you, WSDMatty

3 3

[pacman-dev] [PATCH] makepkg: Delete logpipe when exiting
by Austin Lund 27 Aug '19

27 Aug '19

The logpipe fifo can remain when exiting on a non-error condition such as recieving signals INT and USR1. This can be seen by doing either a manual CTRL-C to interrupt the build or by sending a signal such as: $ makepkg & sleep 5 ; kill -USR1 $! Remove the fifo in all cases on script exit if it still exists. (Revises previously submitted patch) Signed-off-by: Austin Lund <austin.lund(a)gmail.com> --- scripts/makepkg.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43484db3..fac268a8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -129,6 +129,10 @@ clean_up() { return 0 fi + if [[ -p $logpipe ]]; then + rm "$logpipe" + fi + if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && CLEANUP )); then local pkg file @@ -343,9 +347,6 @@ remove_deps() { } error_function() { - if [[ -p $logpipe ]]; then - rm "$logpipe" - fi # first exit all subshells, then print the error if (( ! BASH_SUBSHELL )); then error "$(gettext "A failure occurred in %s().")" "$1" -- 2.23.0

1 0

[pacman-dev] [PATCH] makepkg: Delete logpipe when cleaning up
by Austin Lund 26 Aug '19

26 Aug '19

There are a number of exit paths where the logpipe fifo remains in the logging directory. Remove it if it exists when cleaning up at exit. Signed-off-by: Austin Lund <austin.lund(a)gmail.com> --- scripts/makepkg.sh.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43484db3..0e0d3461 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -129,6 +129,8 @@ clean_up() { return 0 fi + [[ -p $logpipe ]] && rm "$logpipe" + if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && CLEANUP )); then local pkg file @@ -343,9 +345,6 @@ remove_deps() { } error_function() { - if [[ -p $logpipe ]]; then - rm "$logpipe" - fi # first exit all subshells, then print the error if (( ! BASH_SUBSHELL )); then error "$(gettext "A failure occurred in %s().")" "$1" -- 2.23.0

3 6