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

[pacman-dev] multiple replacers
by Nagy Gabor 29 Feb '08

29 Feb '08

Hi! I would like to warm up this thread again: http://www.archlinux.org/pipermail/pacman-dev/2008-January/010877.html What do you think? Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 1

[pacman-dev] Pharmacy Online February 70% OFF
by pacman-dev＠archlinux.org 27 Feb '08

27 Feb '08

4 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.2-67-gd75f693
by Dan McGee 26 Feb '08

26 Feb '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via d75f693155c3d7e595a779f15beea516d321f228 (commit) via 8efe0ecb250050e9061854476468298afb5944d2 (commit) via 7a9d444de874f7e814b36711d3cfc51224f3385c (commit) via 66591e8284054adcefb416a5331916a6812582a8 (commit) via 7eaad2f2a9879499d29e20bb897b018f0b13f6c1 (commit) via c23ecc6160749e635767cdfbd23760e9e809c949 (commit) via f159203f6fb217bb7bed5ffea8c2518325a9ec12 (commit) via 81a2a06818d367f8528c74311171417beb9e1592 (commit) via 3e8ae774bdbc8572613a22988476b6b4e7ef91fd (commit) via d5857ee15b28af5de57614348f930046e122ba85 (commit) via 271ecb8bfc487383256b8247d6e6d8217a8a2ff0 (commit) from 143135e666f5564240868810f0b8f4bc46ff87b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d75f693155c3d7e595a779f15beea516d321f228 Merge: f159203f6fb217bb7bed5ffea8c2518325a9ec12 8efe0ecb250050e9061854476468298afb5944d2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 25 20:49:24 2008 -0600 Merge branch 'maint' Also bump the devel version on the master branch to 3.2.0devel. commit f159203f6fb217bb7bed5ffea8c2518325a9ec12 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 22 22:49:45 2008 -0600 Remove pmserver_t abstraction Remove what was a pretty weird abstraction in the libalpm backend. Instead of parsing server URLs as we get them (of which we don't usually use more than a handful anyway), wait until they are actually used, which allows us to store them as a simple string list instead. This allows us to remove a lot of code, and will greatly simplify the continuing refactoring of the download code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 81a2a06818d367f8528c74311171417beb9e1592 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 22 22:00:12 2008 -0600 Add new stub download functions for use throughout the code Add new stub functions that work by calling the existing (terrible) download forreal function, which needs a serious overhaul. Hide the existing functions and switch all former users to the new functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3e8ae774bdbc8572613a22988476b6b4e7ef91fd Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 22 21:36:11 2008 -0600 Move download code out of server.c This is the first in what will be a series of patches to clean up the current download code in libalpm. Start by moving download code out of server.c and into download.c. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 35 +++---- configure.ac | 6 +- lib/libalpm/Makefile.am | 2 +- lib/libalpm/alpm.h | 1 - lib/libalpm/db.c | 37 ++----- lib/libalpm/{server.c => dload.c} | 188 ++++++++++++----------------------- lib/libalpm/{add.h => dload.h} | 27 +++-- lib/libalpm/handle.c | 1 - lib/libalpm/po/Makevars | 4 +- lib/libalpm/po/POTFILES.in | 2 +- lib/libalpm/po/pl.po | 4 +- lib/libalpm/po/zh_CN.po | 18 ++-- lib/libalpm/server.h | 46 --------- lib/libalpm/sync.c | 8 +- po/Makevars | 4 +- po/es.po | 4 +- po/zh_CN.po | 201 +++++++++++++++++++----------------- src/pacman/add.c | 4 +- src/pacman/remove.c | 4 +- 19 files changed, 241 insertions(+), 355 deletions(-) rename lib/libalpm/{server.c => dload.c} (71%) copy lib/libalpm/{add.h => dload.h} (60%) delete mode 100644 lib/libalpm/server.h hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.2-13-g8efe0ec
by Dan McGee 26 Feb '08

26 Feb '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 8efe0ecb250050e9061854476468298afb5944d2 (commit) via 7a9d444de874f7e814b36711d3cfc51224f3385c (commit) via 66591e8284054adcefb416a5331916a6812582a8 (commit) via 7eaad2f2a9879499d29e20bb897b018f0b13f6c1 (commit) via c23ecc6160749e635767cdfbd23760e9e809c949 (commit) from d5857ee15b28af5de57614348f930046e122ba85 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +- lib/libalpm/po/Makevars | 4 +- lib/libalpm/po/pl.po | 4 +- lib/libalpm/po/zh_CN.po | 18 ++-- po/Makevars | 4 +- po/es.po | 4 +- po/zh_CN.po | 201 +++++++++++++++++++++++++---------------------- src/pacman/add.c | 4 +- src/pacman/remove.c | 4 +- 9 files changed, 127 insertions(+), 120 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] xgettext : change pass-c-format flag to c-format.
by Chantry Xavier 25 Feb '08

25 Feb '08

Currently xgettext apparently attempts to autodetect c format strings (eg a string with a %s) to decide whether to use c-format flag or not. If we use --flag=_:1:c-format instead of --flag=_:1:pass-c-format, the c-format will be applied everywhere. I couldn't find this documented anywhere though. But the pass prefix is mentioned here : http://www.gnu.org/software/gettext/manual/html_node/xgettext-Invocation.ht… "Specifies additional flags for strings occurring as part of the argth argument of the function word. The possible flags are the possible format string indicators, such as ‘c-format’, and their negations, such as ‘no-c-format’, possibly prefixed with ‘pass-’." And c-format is documented there : http://www.gnu.org/software/gettext/manual/html_node/c_002dformat-Flag.html… "This situation happens quite often. The printf function is often called with strings which do not contain a format specifier. Of course one would normally use fputs but it does happen. In this case xgettext does not recognize this as a format string but what happens if the translation introduces a valid format specifier? The printf function will try to access one of the parameters but none exists because the original code does not pass any parameters." And that's exactly what happened with FS#9658. So using c-format for every string will prevent this issue from happening again. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/po/Makevars | 4 ++-- po/Makevars | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars index 1b1b827..d751522 100644 --- a/lib/libalpm/po/Makevars +++ b/lib/libalpm/po/Makevars @@ -9,8 +9,8 @@ top_builddir = ../../../ # These options get passed to xgettext. XGETTEXT_OPTIONS = \ - --keyword=_ --flag=_:1:pass-c-format \ - --keyword=N_ --flag=N_:1:pass-c-format + --keyword=_ --flag=_:1:c-format \ + --keyword=N_ --flag=N_:1:c-format # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff --git a/po/Makevars b/po/Makevars index 94d8294..38a4692 100644 --- a/po/Makevars +++ b/po/Makevars @@ -9,8 +9,8 @@ top_builddir = ../ # These options get passed to xgettext. XGETTEXT_OPTIONS = \ - --keyword=_ --flag=_:1:pass-c-format \ - --keyword=N_ --flag=N_:1:pass-c-format + --keyword=_ --flag=_:1:c-format \ + --keyword=N_ --flag=N_:1:c-format # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. -- 1.5.4.2

1 0

[pacman-dev] Split installs for makepkg
by Mark Constable 25 Feb '08

25 Feb '08

I'd like any opinion about doing split installs using the method outlined below. Is this a reasonable approach or am I missing something obvious? It seems to work okay and does not involve any hacking or patching of /usr/bin/makepkg. This example is for building qt-copy and qt-copy-doc from KDE4 svn trunk using qt-copy/PKGBUILD as the "parent" PKGBUILD and removing the build() function from the "child" PKGBUILD.qt-copy-doc and putting that logic into the parent build_doc() function... pkgname=qt-copy pkgver=4.3.3 pkgrel=7 _pkgfqn=qt-x11-opensource-src-$pkgver ... other typical pre build variables build() { ... pre make instructions make || return 1 build_doc ## ie; requires build_examples() + PKGBUILD.qt-copy-examples #build_examples make INSTALL_ROOT=$startdir/pkg install || return 1 ... post make instructions } build_doc() { mkdir -p $pkgdir/usr/share/doc/qt cp -r $srcdir/$_pkgfqn/doc/html/* $pkgdir/usr/share/doc/qt cd $startdir makepkg --asroot -R -p PKGBUILD.qt-copy-doc rm -rf $pkgdir/* cd $srcdir/$_pkgfqn } # ll /home/packages total 38268 -rw-r--r-- 1 archlinux users 16812720 2008-02-10 16:07 qt-copy-4.3.3-7-x86_64.pkg.tar.bz2 -rw-r--r-- 1 archlinux users 22322007 2008-02-10 16:06 qt-copy-doc-4.3.3-7-any.pkg.tar.bz2 # pacman -Qi qt-copy Name : qt-copy Version : 4.3.3-7 URL : http://www.trolltech.com/products/qt Licenses : GPL Groups : kdesvn kdesvn-all Provides : qt=4.3.3 Depends On : libpng libjpeg libxi libxcursor libxinerama mesa fontconfig libxrandr dbus glib2 Optional Deps : None Required By : poppler-qt qca qimageblitz qt-copy-doc soprano strigi tapioca-qt telepathy-qt Conflicts With : qt Replaces : None Installed Size : 45785.92 K Packager : Mark Constable <markc(a)renta.net> Architecture : x86_64 Build Date : Sun 10 Feb 2008 16:07:08 EST Install Date : Sun 10 Feb 2008 16:07:13 EST Install Reason : Explicitly installed Install Script : No Description : The QT gui toolkit # pacman -Qi qt-copy-doc Name : qt-copy-doc Version : 4.3.3-7 URL : http://www.trolltech.com/products/qt Licenses : GPL Groups : None Provides : qt-doc Depends On : qt>=4.3.3 Optional Deps : None Required By : None Conflicts With : qt-doc Replaces : None Installed Size : 56325.43 K Packager : Mark Constable <markc(a)renta.net> Architecture : any Build Date : Sun 10 Feb 2008 16:06:56 EST Install Date : Sun 10 Feb 2008 16:15:09 EST Install Reason : Explicitly installed Install Script : No Description : The QT gui toolkit documentation --markc

3 4

[pacman-dev] [patch] add support for scriptlets functions embedded in $BUILDSCRIPT
by Alessio 'mOLOk' Bolognino 25 Feb '08

25 Feb '08

Hi, I think there isn't a real need to split PKGBUILD and $pkgname.install, this patch allows you to put the scriptlets functions into the PKGBUILD. This IMHO follows the KISS philosophy. If at least a {post,pre}_{install,upgrade,remove} function is found in the PKGBUILD, then the install file (if it exists) is ignored; otherwise, if there isn't any scriptlet function in the PKGBUILD the install file is included, as usually. Enjoy: From e206a96ebe1e9a11f85de1502fc46e75321ba192 Mon Sep 17 00:00:00 2001 From: Alessio 'mOLOk' Bolognino <themolok(a)gmail.com> Date: Sat, 21 Jul 2007 06:15:34 +0200 Subject: [PATCH] Added support for scriptlets functions embedded in $BUILDSCRIPT --- scripts/makepkg.sh.in | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a3e4d9c..fb931a7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -831,9 +831,18 @@ create_package() { local comp_files=".PKGINFO .FILELIST" - # check for an install script + # check for scriptlets fuctions or an install script # TODO: should we include ${pkgname}.install if it exists and $install is unset? - if [ "$install" != "" ]; then + scriptlet=$(declare -f {post,pre}_{install,remove,upgrade} || return 0) + if [ "$scriptlet" != "" ]; then + msg2 "$(gettext "Adding scriptlet functions (install script will be ignored)...")" + ( echo "$scriptlet" + echo 'op=$1' + echo 'shift' + echo '[ "$(type -t "$op")" = "function" ] && $op "$@"' + ) > .INSTALL + comp_files="$comp_files .INSTALL" + elif [ "$install" != "" ]; then msg2 "$(gettext "Adding install script...")" cp "$startdir/$install" .INSTALL comp_files="$comp_files .INSTALL" @@ -1175,6 +1184,7 @@ fi unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract +unset {post,pre}_{install,remove,upgrade} if [ ! -f "$BUILDSCRIPT" ]; then error "$(gettext "%s does not exist.")" "$BUILDSCRIPT" -- 1.5.2.4 -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User Please send personal email to themolok(a)gmail.com Public Key http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xFE0270FB GPG Key ID = 1024D / FE0270FB 2007-04-11 Key Fingerprint = 9AF8 9011 F271 450D 59CF 2D7D 96C9 8F2A FE02 70FB

9 20

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.2-56-g143135e
by Dan McGee 25 Feb '08

25 Feb '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 143135e666f5564240868810f0b8f4bc46ff87b5 (commit) via ca1a187131d95604ff2c33df3c1ec80ef4af789b (commit) via 8cfccf68c1c7fdd45c172d49115e56e04dae2a2c (commit) from 3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 143135e666f5564240868810f0b8f4bc46ff87b5 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Feb 19 00:44:09 2008 +0100 Improve yesno function. Add a preset paramater to yesno function saying which answer should be the default. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-June/008470.html This allows us to answer no by default to some questions, like the -Scc one mentioned in the above thread, and implemented by this patch. Another advantage is that we don't have to repeat the [Y/n] in every questions. It's only put once in yesno function. This highly reduces the chances that YES and NO strings are translated, but not some questions, which lead to obvious confusions. Finally, the noconfirm variable only needs to be used in that yesno function. So all other usages of it were removed. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit ca1a187131d95604ff2c33df3c1ec80ef4af789b Author: Dan McGee <dan(a)archlinux.org> Date: Sun Feb 24 18:07:44 2008 -0600 More cleanup to alpm_list * Remove some #include statements that are not strictly necessary * Remove node_new function that is really just a one-liner Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8cfccf68c1c7fdd45c172d49115e56e04dae2a2c Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Feb 23 22:31:20 2008 +0100 alpm_list.c clean-up * Introduces 'list == NULL' convention for empty list. That means alpm_list_new isn't needed anymore, so kill it * Small straightforward fixes in alpm_list.c Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm_list.c | 136 ++++++++++++++++++++++------------------------- lib/libalpm/alpm_list.h | 1 - src/pacman/callback.c | 34 ++++-------- src/pacman/remove.c | 6 +- src/pacman/sync.c | 30 ++++------- src/pacman/util.c | 32 ++++++++--- src/pacman/util.h | 2 +- 7 files changed, 113 insertions(+), 128 deletions(-) hooks/post-receive -- The official pacman repository

3 3

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.2-8-gd5857ee
by Dan McGee 25 Feb '08

25 Feb '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via d5857ee15b28af5de57614348f930046e122ba85 (commit) via 271ecb8bfc487383256b8247d6e6d8217a8a2ff0 (commit) from 96f7613d15e46131bf8a4b93828ad70b041524d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d5857ee15b28af5de57614348f930046e122ba85 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Feb 25 00:30:21 2008 +0100 libalpm/sync.c : fix poorly worded debug message. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 271ecb8bfc487383256b8247d6e6d8217a8a2ff0 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Feb 25 00:24:01 2008 +0100 Update TRANSLATORS file. The header of that file already stated that only current translators were listed in that file. So there is no need to mark the current translators with a star, I just removed the old ones instead (all history of that file is kept in git anyway). Current translators = all translators who contributed to 3.1.x translations. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 35 ++++++++++++++++------------------- lib/libalpm/sync.c | 2 +- 2 files changed, 17 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.2-6-g96f7613
by Dan McGee 24 Feb '08

24 Feb '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 96f7613d15e46131bf8a4b93828ad70b041524d1 (commit) via 105e01c8efcb3a27cb55cc5dd7bf15afbea80698 (commit) via 4c14dcc5804aa6736616d35aac4db1ea3b29985e (commit) via a6470956bc2db5acb821485e590822953966586a (commit) via 29f55fb7c9e2d7d3923d796216a9506d95b1fd60 (commit) via 731a774319a9f571179a5db738b4795337c75e38 (commit) from 8ded60326a98d26e51e1e0c0719380571d400a4b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 2 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/ru.po | 6 +- lib/libalpm/po/{libalpm.pot => zh_CN.po} | 311 +++++----- po/LINGUAS | 1 + po/ru.po | 71 +- po/{hu.po => zh_CN.po} | 1025 ++++++++++++++---------------- src/pacman/callback.c | 88 ++- src/pacman/package.c | 15 +- src/pacman/util.c | 73 ++- 10 files changed, 812 insertions(+), 781 deletions(-) copy lib/libalpm/po/{libalpm.pot => zh_CN.po} (64%) copy po/{hu.po => zh_CN.po} (63%) hooks/post-receive -- The official pacman repository

1 0