July 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Allow translation of makepkg y/n question
by Allan McRae 18 Jul '08

18 Jul '08

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4edb967..3d1430f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1216,7 +1216,7 @@ if [ "$CLEANCACHE" = "1" ]; then echo -n "$(gettext " Are you sure you wish to do this? [Y/n] ")" read answer answer=$(echo $answer | tr '[:upper:]' '[:lower:]') - if [ "$answer" = "yes" -o "$answer" = "y" ]; then + if [ "$answer" = "$(gettext "yes")" -o "$answer" = "$(gettext "y")" ]; then rm "$SRCDEST"/* if [ $? -ne 0 ]; then error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" -- 1.5.6.3

3 6

[pacman-dev] [PATCH] -Sqg and -Qqg
by Nagy Gabor 18 Jul '08

18 Jul '08

From cc336eb3e44038fa1f7416d3dc79fc6dbe9e0004 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 16 Jul 2008 14:42:25 +0200 Subject: [PATCH] -Sqg and -Qqg With --quiet, "pacman -Sg grp" and "pacman -Qg grp" don't list group names. "pacman -Qgq" and "pacman -Sggq" (without targets) still list group names. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/query.c | 7 ++++++- src/pacman/sync.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 74d3ff2..bd2d8c5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -235,7 +235,12 @@ static int query_group(alpm_list_t *targets) if(grp) { const alpm_list_t *p, *packages = alpm_grp_get_pkgs(grp); for(p = packages; p; p = alpm_list_next(p)) { - printf("%s %s\n", grpname, alpm_pkg_get_name(alpm_list_getdata(p))); + if(!config->quiet) { + printf("%s %s\n", grpname, + alpm_pkg_get_name(alpm_list_getdata(p))); + } else { + printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(p))); + } } } else { pm_fprintf(stderr, PM_LOG_ERROR, _("group \"%s\" was not found\n"), grpname); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 1e2af45..b299463 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -357,8 +357,12 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) if(grp) { /* get names of packages in group */ for(k = alpm_grp_get_pkgs(grp); k; k = alpm_list_next(k)) { - printf("%s %s\n", grpname, - alpm_pkg_get_name(alpm_list_getdata(k))); + if(!config->quiet) { + printf("%s %s\n", grpname, + alpm_pkg_get_name(alpm_list_getdata(k))); + } else { + printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(k))); + } } } } -- 1.5.6.2

3 3

[pacman-dev] updated french translation
by Xavier 18 Jul '08

18 Jul '08

Hm, that took more time than I hoped / expected :P I am still wondering who won the medal of causing the most translation annoyance between me : http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=143135e666f55642… (all these [Y/n] to remove) and Allan : http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=3c3cb001a441656c… (all these error: to remove) So you can vote now :) Also one of my other change became pretty sneaky with the [Y/n] change : http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=d5278ebb3ba94efd… I almost missed that change: - ":: and install the new pacman version now?"))) { + ":: and upgrade these packages now?"))) { Anyway I hope I didn't make too much mistakes in this update :P

8 16

[pacman-dev] [PATCH] Strip *.a libraries in makepkg
by Allan McRae 18 Jul '08

18 Jul '08

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cbdad56..4edb967 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -740,7 +740,9 @@ tidy_install() { bindirs="bin lib sbin usr/bin usr/lib usr/sbin usr/local/bin usr/local/lib usr/local/sbin opt/*/bin opt/*/lib opt/*/sbin" find ${bindirs} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in - *application/x-sharedlib*) # Libraries + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip --strip-debug "$binary";; + *application/x-archive*) # Libraries (.a) /usr/bin/strip --strip-debug "$binary";; *application/x-executable*) # Binaries /usr/bin/strip "$binary";; -- 1.5.6.3

1 0

[pacman-dev] [PATCH] Use LC_ALL=C everywhere
by Allan McRae 18 Jul '08

18 Jul '08

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2ab2aef..cbdad56 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -783,7 +783,7 @@ create_package() { if [ "$INFAKEROOT" = "1" ]; then echo "# using $(fakeroot -v)" >>.PKGINFO fi - echo "# $(LC_ALL= LANG= date -u)" >>.PKGINFO + echo "# $(LC_ALL=C date -u)" >>.PKGINFO echo "pkgname = $pkgname" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO @@ -1017,7 +1017,7 @@ devel_check() { elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then [ $(type -p svn) ] || return 0 msg "$(gettext "Determining latest svn revision...")" - newpkgver=$(LC_ALL= LANG= svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') + newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then [ $(type -p bzr) ] || return 0 msg "$(gettext "Determining latest bzr revision...")" -- 1.5.6.3

1 0

[pacman-dev] [PATCH] Remove pacman.static build from build files
by Dan McGee 18 Jul '08

18 Jul '08

This presents plenty of problems on OSes besides Linux, and even on Linux when the libtool file for libarchive isn't present. The static build isn't all that useful anyway as missing something such as glibc will still leave you unable to run the pacman.static binary. Remove it from the formal build process. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 16 ---------------- src/pacman/.gitignore | 2 -- src/pacman/Makefile.am | 7 ------- 3 files changed, 0 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index ab5a374..b4b6a56 100644 --- a/configure.ac +++ b/configure.ac @@ -119,11 +119,6 @@ AC_ARG_ENABLE(git-version, [enable use of git version in version string if available]), [wantgitver=$enableval], [wantgitver=no]) -# Help line for pacman.static -AC_ARG_ENABLE(pacman-static, - AS_HELP_STRING([--disable-pacman-static], [do not build static version of pacman]), - [pacmanstatic=$enableval], [pacmanstatic=yes]) - # Checks for programs. AC_PROG_AWK AC_PROG_CC_C99 @@ -324,16 +319,6 @@ else fi AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes") -# Enable or disable inclusion of pacman.static -AC_MSG_CHECKING(whether to build pacman.static) -if test "x$pacmanstatic" = "xyes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE([INCLUDE_PACMAN_STATIC], , [Build pacman.static]) -else - AC_MSG_RESULT(no) -fi -AM_CONDITIONAL(INCLUDE_PACMAN_STATIC, test "x$pacmanstatic" = "xyes") - # Set root directory AC_SUBST(ROOTDIR) # Set package file extension @@ -398,7 +383,6 @@ ${PACKAGE_NAME}: Doxygen support : ${usedoxygen} Asciidoc support : ${useasciidoc} debug support : ${debug} - build pacman.static : ${pacmanstatic} " # vim:set ts=2 sw=2 noet: diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore index c47851c..6a358aa 100644 --- a/src/pacman/.gitignore +++ b/src/pacman/.gitignore @@ -2,5 +2,3 @@ .libs pacman pacman.exe -pacman.static -pacman.static.exe diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index e5f8cb3..220ee9c 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -6,10 +6,6 @@ logfile = ${localstatedir}/log/pacman.log bin_PROGRAMS = pacman -if INCLUDE_PACMAN_STATIC -bin_PROGRAMS += pacman.static -endif - DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ -DROOTDIR=\"$(ROOTDIR)\" \ @@ -40,7 +36,4 @@ pacman_SOURCES = \ LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la -pacman_static_SOURCES = $(pacman_SOURCES) -pacman_static_LDFLAGS = $(LDFLAGS) -all-static - # vim:set ts=2 sw=2 noet: -- 1.5.6.2

4 14

[pacman-dev] static libraries not stripped?
by Xavier 18 Jul '08

18 Jul '08

I just noticed that the last ffmpeg package is much bigger than the old one (13MB vs 4MB). Looking more in depth in the two packages, it looks like it is all the static libraries which are much bigger now : -rw-r--r-- root/root 4838852 2007-12-05 03:43 usr/lib/libavcodec.a -rw-r--r-- root/root 20604500 2008-06-26 03:12 usr/lib/libavcodec.a Isn't this only because the new one is not stripped? Here is how it is detected by file : $ file -biz /usr/lib/libavcodec.a application/x-archive So could this be an old pacman 3.1 regression ? http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=721ceee1e2c9b184… Maybe this code also needs to handle x-archive. $ file -iz /usr/lib/* | grep x-archive | wc -l 366 $ file -iz /usr/lib/*.a | grep x-archive | wc -l 366 $ file -iz /usr/lib/*.a | grep -v x-archive /usr/lib/libcurses.a: application/x-not-regular-file /usr/lib/libdts.a: application/x-not-regular-file /usr/lib/libieee.a: application/x-object /usr/lib/libmcheck.a: application/x-object /usr/lib/libpng.a: application/x-not-regular-file So a few .a files don't appear as x-archive, but apparently the big majority of them do, so maybe this is not a big problem.

2 1

[pacman-dev] [translation] updated Turkish translation
by Samed Beyribey 17 Jul '08

17 Jul '08

Here's the updated Türkçe (Turkish) translation :) -- A day without sunshine is like a day without orange juice.

2 3

[pacman-dev] [translation] fixed DE version
by Matthias Gorissen 17 Jul '08

17 Jul '08

Yeah, thanks for the explanation. So this one has the superflous Y/n deleted (pacman-section), and J/n changed to y/n (makepakage-section). It pays off to ask first :)

1 0

[pacman-dev] [translation]Spanish translation
by Juan Pablo Gonzalez T. 17 Jul '08

17 Jul '08

Another minor update. I think this is the last one. Thanks to xavier for the explain! - Fixed the localization mesages for the answers

1 0