[Frugalware-git] frugalware-current: pyflakes-0.7.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8735c64609bbcd897edb26bb4a21ffc7d6fa87f8
commit 8735c64609bbcd897edb26bb4a21ffc7d6fa87f8
Author: Melko me...@frugalware.org
Date: Sat May 4 10:57:35 2013 +0200
pyflakes-0.7.2-1-i686
* version bump
* use hermier's shiny thing
diff --git a/source/devel-extra/pyflakes/FrugalBuild
b/source/devel-extra/pyflakes/FrugalBuild
index f82d994..4a48497 100644
--- a/source/devel-extra/pyflakes/FrugalBuild
+++ b/source/devel-extra/pyflakes/FrugalBuild
@@ -1,8 +1,10 @@
# Compiling Time: 0 SBU
# Maintainer: Melko me...@frugalware.org
+options+=('asneeded')
+
pkgname=pyflakes
-pkgver=0.6.1
+pkgver=0.7.2
pkgrel=1
pkgdesc=Program to analyze Python programs and detect various errors.
url=http://pypi.python.org/pypi/pyflakes;
@@ -11,4 +13,4 @@ groups=('devel-extra')
archs=('i686' 'x86_64')
up2date=Flasttar http://pypi.python.org/packages/source/p/$pkgname/;
source=(http://pypi.python.org/packages/source/p/$pkgname/$pkgname-${pkgver}.tar.gz)
-sha1sums=('c868b5d58c7a833e7759e173875b37760691b72a')
+sha1sums=('3271889cbc8f12eb7fe60ea5265299e3bf00e2a2')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-ladon-0.8.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85bee1ec7e37f81b10278cdb4694d9d5aa419f6d
commit 85bee1ec7e37f81b10278cdb4694d9d5aa419f6d
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:04:13 2013 +0100
python-ladon-0.8.1-1-i686
* version bump
diff --git a/source/devel-extra/python-ladon/FrugalBuild
b/source/devel-extra/python-ladon/FrugalBuild
index 39b9138..ba6061b 100644
--- a/source/devel-extra/python-ladon/FrugalBuild
+++ b/source/devel-extra/python-ladon/FrugalBuild
@@ -1,9 +1,9 @@
-# Compiling Time: 0.02 SBU
+# Compiling Time: 0.01 SBU
# Maintainer: Slown sl...@frugalware.org
pkgname=python-ladon
_F_archive_name=${pkgname/python-/}
-pkgver=0.7.9
+pkgver=0.8.1
pkgrel=1
pkgdesc=A framework for exposing methods to several internet service protocols
depends=('python')
@@ -12,4 +12,4 @@ groups=('devel-extra')
archs=('i686' 'x86_64')
_F_pypi_name=${pkgname/python-/}
Finclude pypi
-sha1sums=('75ea8dbcaaf79252a5b9e972b648fe86d16f8815')
+sha1sums=('ab22d6b24e10f3e02a613385f478fb88a7825700')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-psutil-0.7.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38e49ed29e31a83f9b5d0d64021cff043f557be7
commit 38e49ed29e31a83f9b5d0d64021cff043f557be7
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:05:38 2013 +0100
python-psutil-0.7.1-1-i686
* version bump
diff --git a/source/lib-extra/python-psutil/FrugalBuild
b/source/lib-extra/python-psutil/FrugalBuild
index f73e800..849be8e 100644
--- a/source/lib-extra/python-psutil/FrugalBuild
+++ b/source/lib-extra/python-psutil/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=python-psutil
_F_archive_name=psutil
-pkgver=0.7.0
+pkgver=0.7.1
pkgrel=1
pkgdesc=A cross-platform process ans system utilities module for Python
depends=('python')
@@ -11,6 +11,6 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
_F_googlecode_name=psutil
Finclude googlecode
-sha1sums=('e19bd1c050786616dd81a3b200c61b8147eb9985')
+sha1sums=('9c67e61ce00166d7831a4cdcbd2fe534708681a1')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: pyasn1-0.1.7-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6dcca94f2d810e76129f665685be3e47a35c477
commit c6dcca94f2d810e76129f665685be3e47a35c477
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:06:48 2013 +0100
pyasn1-0.1.7-1-i686
* version bump
diff --git a/source/lib-extra/pyasn1/FrugalBuild
b/source/lib-extra/pyasn1/FrugalBuild
index 52058fd..e9a94cb 100644
--- a/source/lib-extra/pyasn1/FrugalBuild
+++ b/source/lib-extra/pyasn1/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: Slown sl...@frugalware.org
pkgname=pyasn1
-pkgver=0.1.7rc2
+pkgver=0.1.7
pkgrel=1
pkgdesc=ASN.1 library for Python
depends=('python')
groups=('lib-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
-sha1sums=('0bc03213a7e241968303dbef62620eceffccc101')
+sha1sums=('e32b91c5a5d9609fb1d07d8685a884bab22ca6d0')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: rpy2-2.3.6-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6aed0c2eb8dbca19fd3130a9f7dfac5dbfdd8f37
commit 6aed0c2eb8dbca19fd3130a9f7dfac5dbfdd8f37
Author: Melko me...@frugalware.org
Date: Sat May 4 11:05:36 2013 +0200
rpy2-2.3.6-1-i686
* version bump
diff --git a/source/devel-extra/rpy2/FrugalBuild
b/source/devel-extra/rpy2/FrugalBuild
index ac74670..cd44a07 100644
--- a/source/devel-extra/rpy2/FrugalBuild
+++ b/source/devel-extra/rpy2/FrugalBuild
@@ -4,13 +4,13 @@
options+=('asneeded')
pkgname=rpy2
-pkgver=2.3.5
+pkgver=2.3.6
pkgrel=1
pkgdesc=Python interface to the R Programming Language.
depends=('r' 'python' 'numpy' 'python-sqlite3')
groups=('devel-extra')
archs=('i686' 'x86_64')
Finclude pypi
-sha1sums=('85fa09787b08494ea1c43ddd0556bc439e7a9dcc')
+sha1sums=('5b497d49a2b777414de5ea07b2c57c14a6f65255')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-wtforms-1.0.4-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a50794e6995705029b73510678b0fc7dc5c896a7
commit a50794e6995705029b73510678b0fc7dc5c896a7
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:08:17 2013 +0100
python-wtforms-1.0.4-1-i686
* version bump
diff --git a/source/lib-extra/python-wtforms/FrugalBuild
b/source/lib-extra/python-wtforms/FrugalBuild
index aa3070d..c3c961d 100644
--- a/source/lib-extra/python-wtforms/FrugalBuild
+++ b/source/lib-extra/python-wtforms/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=python-wtforms
_F_archive_name=WTForms
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=1
pkgdesc=A flexible forms validation and rendering library for python web
development
depends=('python')
@@ -12,4 +12,4 @@ archs=('i686' 'x86_64')
_F_pypi_name=WTForms
_F_pypi_ext=.zip
Finclude pypi
-sha1sums=('f3128408e10375332aa41a8fa037cc48389c0d5e')
+sha1sums=('e8d97b4c72e805b8e29c5d2e6673c40780490c69')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: terra-0.1.7-3-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8589d1943765f95f5045eb2129e11fd3e284ae94
commit 8589d1943765f95f5045eb2129e11fd3e284ae94
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:19:26 2013 +0100
terra-0.1.7-3-i686
* fix up2date
diff --git a/source/x11-extra/terra/FrugalBuild
b/source/x11-extra/terra/FrugalBuild
index 6a2ccca..5e21259 100644
--- a/source/x11-extra/terra/FrugalBuild
+++ b/source/x11-extra/terra/FrugalBuild
@@ -1,17 +1,17 @@
-# Compiling Time: 0.02 SBU
+# Compiling Time: 0.04 SBU
# Maintainer: Slown sl...@frugalware.org
pkgname=terra
pkgver=0.1.7
-pkgrel=2
+pkgrel=3
pkgdesc=Drop-down terminal emulator with split-screen support
url=http://x264.fushizen.eu;
-depends=('gtk+3' 'vte-python' 'pygobject' 'dbus-python')
+depends=('vte3' 'pygobject' 'dbus-python')
makedepends=('python-distutils-extra' 'intltool')
groups=('x11-extra')
archs=('i686' 'x86_64')
Fpkgversep=_
-up2date=lynx -dump
https://launchpad.net/~ozcanesen/+archive/terra-terminal/+sourcepub/3010023/+listing-archive-extra
| sed 's/%7Equantal1//' | Flasttar
+up2date=Flasttar
https://launchpad.net/~ozcanesen/+archive/terra-terminal/+sourcepub/3010023/+listing-archive-extra
| sed 's/%7Equantal1//'
source=(https://launchpad.net/~ozcanesen/+archive/terra-terminal/+files/$pkgname$Fpkgversep$pkgver~quantal1.tar.gz)
_F_cd_path=recipe-$pkgver
sha1sums=('fa40d0c8deb138ea8ec40d1a54460b613f2c8c86')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: pyasn1-modules-0.0.5-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5737064dc72e977b57ec3b264c5177deb9d542fc
commit 5737064dc72e977b57ec3b264c5177deb9d542fc
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:22:18 2013 +0100
pyasn1-modules-0.0.5-1-i686
* version bump
diff --git a/source/lib-extra/pyasn1-modules/FrugalBuild
b/source/lib-extra/pyasn1-modules/FrugalBuild
index b834be9..b2d5d95 100644
--- a/source/lib-extra/pyasn1-modules/FrugalBuild
+++ b/source/lib-extra/pyasn1-modules/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: Slown sl...@frugalware.org
pkgname=pyasn1-modules
-pkgver=0.0.4
+pkgver=0.0.5
pkgrel=1
pkgdesc=A collection of protocols modules written in ASN.1 language
-depends=('pyasn1=0.1.4')
+depends=('pyasn1')
groups=('lib-extra')
archs=('i686' 'x86_64')
Finclude pypi
-sha1sums=('2b023b1970e3895c08c432ac5b941d6933b1ce84')
+sha1sums=('108bdef1b3ca7050ff93c59e7ef7225c9c1a8b07')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: perl-error-0.17020-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=caa38e3dda0ffb29695506c0b733ff1fd28adec4
commit caa38e3dda0ffb29695506c0b733ff1fd28adec4
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:24:01 2013 +0100
perl-error-0.17020-1-i686
* version bump
diff --git a/source/devel-extra/perl-error/FrugalBuild
b/source/devel-extra/perl-error/FrugalBuild
index 261e9a1..c669e18 100644
--- a/source/devel-extra/perl-error/FrugalBuild
+++ b/source/devel-extra/perl-error/FrugalBuild
@@ -1,11 +1,11 @@
-# Compiling Time: 0.01 SBU
+# Compiling Time: 0 SBU
# Maintainer: jercel jerce...@gmail.com
_F_perl_name=Error
_F_perl_author=S/SH/SHLOMIF
-pkgver=0.17019
+pkgver=0.17020
pkgdesc=Error/exception handling in an OO-ish way
Finclude perl
pkgrel=1
archs=('i686' 'x86_64' 'arm')
-sha1sums=('41527292e6891eeedba4b1a75550c3a0ac61857d')
+sha1sums=('ca1495b7f878adccd03543f9bc080c15ed60f1ec')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: zim-0.60-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a0edfc45f227dd93591f19082d3e098f078a580
commit 5a0edfc45f227dd93591f19082d3e098f078a580
Author: Slown slownli...@gmail.com
Date: Sat May 4 10:27:26 2013 +0100
zim-0.60-1-i686
* version bump
diff --git a/source/xapps-extra/zim/FrugalBuild
b/source/xapps-extra/zim/FrugalBuild
index 491b04b..c21a4ba 100644
--- a/source/xapps-extra/zim/FrugalBuild
+++ b/source/xapps-extra/zim/FrugalBuild
@@ -1,10 +1,10 @@
-# Compiling Time: 0.02 SBU
+# Compiling Time: 0.03 SBU
# Contributor: Yakulu fabien.8 AT free.fr
# Contributor: PacMiam pacm...@gmx.fr
# Maintainer: jercel jerce...@gmail.com
pkgname=zim
-pkgver=0.59
+pkgver=0.60
pkgrel=1
pkgdesc=A desktop wiki as a collection of files on local filesystem that can
be edited with a GUI application.
url=http://zim-wiki.org;
@@ -17,7 +17,7 @@ _F_gnome_desktop=y
_F_gnome_iconcache=y
_F_gnome_mime=y
Finclude gnome-scriptlet
-sha1sums=('15d68c892c02cb1e4490599b4f397fe88c334706')
+sha1sums=('f6abef969687ca09467031def1ddbcb611cb9f92')
build()
{
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: rkward-0.6.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e95a9f244213148c25e8e80aa9a0b5987d87886
commit 7e95a9f244213148c25e8e80aa9a0b5987d87886
Author: Melko me...@frugalware.org
Date: Sat May 4 11:46:30 2013 +0200
rkward-0.6.1-1-i686
* version bump
* use hermier's shiny thing
diff --git a/source/kde-extra/rkward/FrugalBuild
b/source/kde-extra/rkward/FrugalBuild
index 15897c2..93508d9 100644
--- a/source/kde-extra/rkward/FrugalBuild
+++ b/source/kde-extra/rkward/FrugalBuild
@@ -1,16 +1,18 @@
# Compiling Time: 0.57 SBU
# Maintainer: Melko me...@frugalware.org
+options+=('asneeded')
+
pkgname=rkward
-pkgver=0.5.7
+pkgver=0.6.1
pkgrel=1
pkgdesc=Easily extensible, easy to use IDE/GUI for R.
Finclude sourceforge kde
depends=('r' libkhtml=$_F_kde_ver libkross=$_F_kde_ver)
-makedepends=(${makedepends[@]} 'kdelibs-compiletime' 'ksgmltools2')
+makedepends=(${makedepends[@]} 'kdelibs-compiletime' 'kdelibs' 'ksgmltools2')
groups=('kde-extra')
archs=('i686' 'x86_64')
-sha1sums=('9fc0fdde2d8fa102afebc74668afc92239c83fcb')
+sha1sums=('e7798e7dfdf280586bbccca8e13ae5d4a945047f')
build() {
KDE_build
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libechonest-2.0.3-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95349d42d0d89c1666ad6e1e8ce07da4d3d3c742
commit 95349d42d0d89c1666ad6e1e8ce07da4d3d3c742
Author: Melko me...@frugalware.org
Date: Sat May 4 12:08:21 2013 +0200
libechonest-2.0.3-2-i686
* use hermier's shiny thing
* fix sha1sum
* rebuild because of .so version ?
diff --git a/source/lib-extra/libechonest/FrugalBuild
b/source/lib-extra/libechonest/FrugalBuild
index cf3e378..ed9db29 100644
--- a/source/lib-extra/libechonest/FrugalBuild
+++ b/source/lib-extra/libechonest/FrugalBuild
@@ -1,9 +1,11 @@
# Compiling Time: 0.44 SBU
# Maintainer: Slown sl...@frugalware.org
+options+=('asneeded')
+
pkgname=libechonest
pkgver=2.0.3
-pkgrel=1
+pkgrel=2
pkgdesc=C++ library for interfacing with Echo Nest.
url=https://projects.kde.org/projects/playground/libs/$pkgname;
depends=('qjson' 'libqtnetwork' 'libqttest' 'libqtxml')
@@ -12,6 +14,6 @@ archs=('i686' 'x86_64')
up2date=Flasttar $url
source=(http://files.lfranchi.com/$pkgname-$pkgver.tar.bz2)
Finclude cmake
-sha1sums=('2fbcfbb9107c0538ba7dd7361e2049cc272d09c8')
+sha1sums=('10ada8aced6dce3c0d206afcfbd4b05313bd4d04')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Increase mirroring in _pacman_checkdeps.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a90a9204d9e9dd1c61984a3778addadcbb2eb10a
commit a90a9204d9e9dd1c61984a3778addadcbb2eb10a
Author: Michel Hermier herm...@frugalware.org
Date: Fri May 3 22:07:02 2013 +0200
libpacman: Increase mirroring in _pacman_checkdeps.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 300c875..c3d7efb 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -351,7 +351,6 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char
op, pmlist_t *packag
{
pmdepend_t depend;
pmlist_t *i, *j, *k;
- int found = 0;
pmlist_t *baddeps = NULL;
pmdepmissing_t *miss = NULL;
pmdb_t *db = trans-handle-db_local;
@@ -391,17 +390,21 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned
char op, pmlist_t *packag
continue;
}
for(j = _pacman_pkg_getinfo(oldpkg, PM_PKG_REQUIREDBY); j; j = j-next) {
- //char *ver;
+ pmtranspkg_t *requiredtranspkg =
__pacman_trans_get_trans_pkg (trans, (const char *)j-data);
pmpkg_t *p;
- found = 0;
- if((p = _pacman_db_get_pkgfromcache(db,
j-data)) == NULL) {
- /* hmmm... package isn't installed.. */
+ int found = 0;
+
+ if (requiredtranspkg != NULL
+ requiredtranspkg-type
PM_TRANS_TYPE_ADD) {
+ /* this package is also in the upgrade
list, so don't worry about it */
continue;
}
- if(_pacman_pkg_isin(p-name, packages)) {
- /* this package is also in the upgrade
list, so don't worry about it */
+
+ if((p = _pacman_db_get_pkgfromcache(db,
j-data)) == NULL) {
+ /* hmmm... package isn't installed.. */
continue;
}
+
for(k = _pacman_pkg_getinfo(p, PM_PKG_DEPENDS); k; k = k-next) {
/* don't break any existing dependencies (possible provides) */
_pacman_splitdep(k-data, depend);
@@ -421,9 +424,9 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char
op, pmlist_t *packag
}
if(op == PM_TRANS_TYPE_REMOVE) {
/* check requiredby fields */
- found=0;
for(j = _pacman_pkg_getinfo(tp, PM_PKG_REQUIREDBY); j; j = j-next) {
pmtranspkg_t *requiredtranspkg = __pacman_trans_get_trans_pkg (trans, (const
char *)j-data);
+ int found = 0;
/* Ignore required packages to be deleted */
if (requiredtranspkg != NULL
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Remove unecessary 'packages' parameter to _pacman_checkconflicts.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ceff01739073eab6b61b2ec2bb610f81f296b1bb
commit ceff01739073eab6b61b2ec2bb610f81f296b1bb
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 09:51:00 2013 +0200
libpacman: Remove unecessary 'packages' parameter to _pacman_checkconflicts.
diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c
index c25ef3c..fcd5001 100644
--- a/lib/libpacman/conflict.c
+++ b/lib/libpacman/conflict.c
@@ -50,8 +50,7 @@
*
* conflicts are always name only
*/
-pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages)
-{
+pmlist_t *_pacman_checkconflicts(pmtrans_t *trans) {
pmpkg_t *info = NULL;
pmlist_t *i, *j, *k;
pmlist_t *baddeps = NULL;
@@ -59,13 +58,12 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t
*packages)
int howmany, remain;
double percent;
- howmany = f_list_count (packages);
+ howmany = f_list_count (trans-packages);
+
+ for(i = trans-packages; i; i = i-next) {
+ pmtranspkg_t *transpkg = i-data;
+ const char *transpkg_name = __pacman_transpkg_name (transpkg);
- for(i = packages; i; i = i-next) {
- pmpkg_t *tp = i-data;
- if(tp == NULL) {
- continue;
- }
remain = f_list_count (i);
percent = (double)(howmany - remain + 1) / howmany;
@@ -75,24 +73,28 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t
*packages)
howmany - remain + 1);
}
- for(j = _pacman_pkg_getinfo(tp, PM_PKG_CONFLICTS); j; j =
j-next) {
- if(!strcmp(tp-name, j-data)) {
+ if (!(transpkg-type PM_TRANS_TYPE_ADD)) {
+ continue;
+ }
+
+ for(j = _pacman_pkg_getinfo(transpkg-pkg_new,
PM_PKG_CONFLICTS); j; j = j-next) {
+ if(!strcmp(transpkg_name, j-data)) {
/* a package cannot conflict with itself -- that's just not nice */
continue;
}
/* CHECK 1: check targets against database */
- _pacman_log(PM_LOG_DEBUG, _(checkconflicts: targ '%s'
vs db), tp-name);
+ _pacman_log(PM_LOG_DEBUG, _(checkconflicts: targ '%s'
vs db), transpkg_name);
for(k = _pacman_db_get_pkgcache(trans-handle-db_local); k; k = k-next) {
pmpkg_t *dp = (pmpkg_t *)k-data;
- if(!strcmp(dp-name, tp-name)) {
+ if(!strcmp(dp-name, transpkg_name)) {
/* a package cannot conflict with itself -- that's just not nice */
continue;
}
if(!strcmp(j-data, dp-name)) {
/* conflict */
_pacman_log(PM_LOG_DEBUG, _(targs vs db: found %s as a conflict for %s),
- dp-name, tp-name);
- miss = _pacman_depmiss_new(tp-name,
PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, dp-name, NULL);
+ dp-name, transpkg_name);
+ miss =
_pacman_depmiss_new(transpkg_name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY,
dp-name, NULL);
if(!_pacman_depmiss_isin(miss, baddeps)) {
baddeps = _pacman_list_add(baddeps, miss);
} else {
@@ -105,8 +107,8 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t
*packages)
if(!strcmp(m-data, j-data)) {
/* confict */
_pacman_log(PM_LOG_DEBUG, _(targs vs db: found %s as a conflict for %s),
- dp-name,
tp-name);
- miss =
_pacman_depmiss_new(tp-name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, dp-name,
NULL);
+ dp-name,
transpkg_name);
+ miss =
_pacman_depmiss_new(transpkg_name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY,
dp-name, NULL);
if(!_pacman_depmiss_isin(miss, baddeps)) {
baddeps = _pacman_list_add(baddeps, miss);
} else {
@@ -117,18 +119,21 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans,
pmlist_t *packages)
}
}
/* CHECK 2: check targets against targets */
- _pacman_log(PM_LOG_DEBUG, _(checkconflicts: targ '%s'
vs targs), tp-name);
- for(k = packages; k; k = k-next) {
- pmpkg_t *otp = (pmpkg_t *)k-data;
- if(!strcmp(otp-name, tp-name)) {
+ _pacman_log(PM_LOG_DEBUG, _(checkconflicts: targ '%s'
vs targs), transpkg_name);
+ for(k = trans-packages; k; k = k-next) {
+ pmtranspkg_t *other_transpkg = k-data;
+ const char *other_transpkg_name =
__pacman_transpkg_name (other_transpkg);
+
+ if (other_transpkg == transpkg ||
+ !(other_transpkg-type
PM_TRANS_TYPE_ADD)) {
/* a package cannot conflict with itself -- that's just not nice */
[Frugalware-git] pacman-g2: libpacman: Remove some _packages usages.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4bbb5571b869482d82c26fdc6ca8e1774b103103
commit 4bbb5571b869482d82c26fdc6ca8e1774b103103
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 10:38:22 2013 +0200
libpacman: Remove some _packages usages.
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index 6f1c220..d7095f3 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -1010,10 +1010,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
/* re-order w.r.t. dependencies */
_pacman_log(PM_LOG_FLOW1, _(sorting by dependencies));
- lp = _pacman_sortbydeps(trans-_packages,
PM_TRANS_TYPE_ADD);
- /* free the old alltargs */
- FREELISTPTR(trans-_packages);
- trans-_packages = lp;
+ trans-_packages = _pacman_sortbydeps(trans-_packages,
PM_TRANS_TYPE_ADD);
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
}
@@ -1074,8 +1071,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
pmdepmissing_t *miss = (pmdepmissing_t *)i-data;
pmpkg_t *info = _pacman_db_scan(db_local, miss-depend.name, INFRQ_ALL);
if(info) {
-
_pacman_log(PM_LOG_FLOW2, _(pulling %s in the targets list), info-name);
- trans-_packages =
_pacman_list_add(trans-_packages, info);
+ _pacman_trans_add_pkg
(trans, info, PM_TRANS_TYPE_UPGRADE, 0);
} else {
_pacman_log(PM_LOG_ERROR, _(could not find %s in database -- skipping),
miss-depend.name);
@@ -1101,10 +1097,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
/* re-order w.r.t. dependencies */
_pacman_log(PM_LOG_FLOW1, _(sorting by dependencies));
- lp = _pacman_sortbydeps(trans-_packages, PM_TRANS_TYPE_REMOVE);
- /* free the old alltargs */
- FREELISTPTR(trans-_packages);
- trans-_packages = lp;
+ trans-_packages = _pacman_sortbydeps(trans-_packages,
PM_TRANS_TYPE_REMOVE);
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
}
@@ -1374,12 +1367,13 @@ int _pacman_trans_commit(pmtrans_t *trans, pmlist_t
**data)
}
} else {
int i, errors = 0;
- int remain, howmany, archive_ret;
+ int remain, archive_ret;
double percent;
register struct archive *archive;
struct archive_entry *entry;
char expath[PATH_MAX], cwd[PATH_MAX] = ;
pmlist_t *targ, *lp;
+ const int howmany = f_list_count (trans-packages);
for(targ = trans-_packages; targ; targ = targ-next) {
pmtranstype_t transtype;
@@ -1389,7 +1383,6 @@ int _pacman_trans_commit(pmtrans_t *trans, pmlist_t
**data)
pmpkg_t *oldpkg = NULL;
errors = 0;
remain = f_list_count (targ);
- howmany = f_list_count (trans-_packages);
struct trans_event_table_item *event;
if(handle-trans-state == STATE_INTERRUPTED) {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Make _pacman_sortbydeps take a trans instead of a list and return void.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=bde62cf3d4ae00b161e4e863ac6cc59fd848aa8e
commit bde62cf3d4ae00b161e4e863ac6cc59fd848aa8e
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 11:27:13 2013 +0200
libpacman: Make _pacman_sortbydeps take a trans instead of a list and return
void.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index b50ae4b..6c34298 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -250,9 +250,8 @@ int _pacman_depmiss_isin(pmdepmissing_t *needle, pmlist_t
*haystack)
* affects the dependency order sortbydeps() will use.
*
* This function returns the new pmlist_t* target list.
- *
*/
-pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode)
+void _pacman_sortbydeps(pmtrans_t *trans, int mode)
{
pmlist_t *newtargs = NULL;
pmlist_t *i, *j, *k;
@@ -261,14 +260,14 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode)
pmgraph_t *vertex;
int found;
- if(targets == NULL) {
+ if (trans-_packages == NULL) {
return(NULL);
}
_pacman_log(PM_LOG_DEBUG, _(started sorting dependencies));
/* We create the vertices */
- for(i = targets; i; i = i-next) {
+ for (i = trans-_packages; i; i = i-next) {
pmgraph_t *v = _pacman_graph_new();
v-data = (void *)i-data;
vertices = _pacman_list_add(vertices, v);
@@ -339,7 +338,7 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode)
_FREELIST(vertices, _pacman_graph_free);
- return(newtargs);
+ trans-_packages = newtargs;
}
/* Returns a pmlist_t* of missing_t pointers.
diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h
index dc6741c..be09d12 100644
--- a/lib/libpacman/deps.h
+++ b/lib/libpacman/deps.h
@@ -49,7 +49,7 @@ typedef struct __pmgraph_t {
pmdepmissing_t *_pacman_depmiss_new(const char *target, unsigned char type,
unsigned char depmod,
const char *depname, const char *depversion);
int _pacman_depmiss_isin(pmdepmissing_t *needle, pmlist_t *haystack);
-pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode);
+void _pacman_sortbydeps(pmtrans_t *trans, int mode);
pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages);
int _pacman_splitdep(const char *depstr, pmdepend_t *depend);
void _pacman_removedeps(pmtrans_t *trans);
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index d7095f3..c6de66b 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -630,25 +630,7 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t
**data)
}
}
- /* re-order w.r.t. dependencies */
- k = l = NULL;
- for(i=trans-packages; i; i=i-next) {
- pmsyncpkg_t *s = (pmsyncpkg_t*)i-data;
- k = _pacman_list_add(k, s-pkg_new);
- }
- m = _pacman_sortbydeps(k, PM_TRANS_TYPE_ADD);
- for(i=m; i; i=i-next) {
- for(j=trans-packages; j; j=j-next) {
- pmsyncpkg_t *s = (pmsyncpkg_t*)j-data;
- if(s-pkg_new==i-data) {
- l = _pacman_list_add(l, s);
- }
- }
- }
- FREELISTPTR(k);
- FREELISTPTR(m);
- FREELISTPTR(trans-packages);
- trans-packages = l;
+ _pacman_sortbydeps(trans, PM_TRANS_TYPE_ADD);
EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
@@ -1008,9 +990,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
RET_ERR(PM_ERR_CONFLICTING_DEPS, -1);
}
- /* re-order w.r.t. dependencies */
- _pacman_log(PM_LOG_FLOW1, _(sorting by dependencies));
- trans-_packages = _pacman_sortbydeps(trans-_packages,
PM_TRANS_TYPE_ADD);
+ _pacman_sortbydeps(trans, PM_TRANS_TYPE_ADD);
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
}
@@ -1096,8 +1076,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
}
/* re-order w.r.t. dependencies */
- _pacman_log(PM_LOG_FLOW1, _(sorting by dependencies));
- trans-_packages = _pacman_sortbydeps(trans-_packages,
PM_TRANS_TYPE_REMOVE);
+ _pacman_sortbydeps(trans, PM_TRANS_TYPE_REMOVE);
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libflib: Add get set accessors to FList items.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=cc4892304f1292eb8a9adfc0faba66d7ae103a45
commit cc4892304f1292eb8a9adfc0faba66d7ae103a45
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 12:17:41 2013 +0200
libflib: Add get set accessors to FList items.
diff --git a/lib/libflib/flist.c b/lib/libflib/flist.c
index 46daf53..e74438c 100644
--- a/lib/libflib/flist.c
+++ b/lib/libflib/flist.c
@@ -80,6 +80,33 @@ FList *f_list_free (FList *item, FVisitorFunc fn, void
*user_data) {
return next;
}
+void *f_list_get (FList *item) {
+ return item != NULL ? item-data : NULL;
+}
+
+void f_list_set (FList *item, void *data) {
+ if (item) {
+ item-data = data;
+ }
+}
+
+size_t f_list_count(FList *list)
+{
+ size_t count;
+
+ for (count = 0; list != NULL; list = list-next, count++)
+ /* Do nothing */;
+ return count;
+}
+
+FList *f_list_first (FList *list) {
+ if (list != NULL) {
+ for (; list-prev != NULL; list = list-prev)
+ /* Do nothing */;
+ }
+ return list;
+}
+
void f_list_insert_after (FList *item, FList *list) {
FList *last = f_list_last (list);
@@ -110,23 +137,6 @@ void f_list_insert_before (FList *item, FList *list) {
}
}
-size_t f_list_count(FList *list)
-{
- size_t count;
-
- for (count = 0; list != NULL; list = list-next, count++)
- /* Do nothing */;
- return count;
-}
-
-FList *f_list_first (FList *list) {
- if (list != NULL) {
- for (; list-prev != NULL; list = list-prev)
- /* Do nothing */;
- }
- return list;
-}
-
FList *f_list_last (FList *list) {
if (list != NULL) {
for (; list-next != NULL; list = list-next)
diff --git a/lib/libflib/flist.h b/lib/libflib/flist.h
index 06e4a65..43f04f5 100644
--- a/lib/libflib/flist.h
+++ b/lib/libflib/flist.h
@@ -51,11 +51,13 @@ void f_list_delete (FList *list, FVisitorFunc fn, void
*user_data);
FList *f_list_alloc (void *data);
FList *f_list_free (FList *item, FVisitorFunc fn, void *user_data);
-void f_list_insert_after (FList *item, FList *list);
-void f_list_insert_before (FList *item, FList *list);
+void *f_list_get (FList *item);
+void f_list_set (FList *item, void *data);
size_t f_list_count (FList *list);
FList *f_list_first (FList *list);
+void f_list_insert_after (FList *item, FList *list);
+void f_list_insert_before (FList *item, FList *list);
FList *f_list_last (FList *list);
FList *f_list_next (FList *list);
FList *f_list_next_filtered (FList *list, FDetectFunc dfn, void *user_data);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: flib'ify __pacman_trans_get_trans_pkg.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0cbe3eaafda585db6d02f53c60aded5d8d518342
commit 0cbe3eaafda585db6d02f53c60aded5d8d518342
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 12:18:56 2013 +0200
libpacman: flib'ify __pacman_trans_get_trans_pkg.
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index c6de66b..fde7861 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -115,24 +115,10 @@ int check_oldcache(pmtrans_t *trans)
}
pmsyncpkg_t *__pacman_trans_get_trans_pkg(pmtrans_t *trans, const char
*package) {
- pmlist_t *i;
- pmsyncpkg_t *syncpkg;
-
/* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, NULL));
-#if 1
- for(i = trans-packages; i != NULL ; i = i-next) {
- syncpkg = i-data;
- if(syncpkg __pacman_transpkg_detect_name (syncpkg, package)
== 0) {
- return(syncpkg);
- }
- }
-
- return(NULL);
-#else
- return f_list_detect (trans-packages,
(FDetectFunc)__pacman_transpkg_detect_name, package);
-#endif
+ return f_list_get (f_list_detect (trans-packages,
(FDetectFunc)__pacman_transpkg_detect_name, (void *)package));
}
static
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: tomahawk-0.7.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74fa396717a8777bf0568e7d93012498789fece7
commit 74fa396717a8777bf0568e7d93012498789fece7
Author: Melko me...@frugalware.org
Date: Sat May 4 12:23:28 2013 +0200
tomahawk-0.7.0-1-i686
* version bump
diff --git a/source/xmultimedia-extra/tomahawk/FrugalBuild
b/source/xmultimedia-extra/tomahawk/FrugalBuild
index 9901189..f00cf57 100644
--- a/source/xmultimedia-extra/tomahawk/FrugalBuild
+++ b/source/xmultimedia-extra/tomahawk/FrugalBuild
@@ -4,7 +4,7 @@
options+=('asneeded')
pkgname=tomahawk
-pkgver=0.6.1
+pkgver=0.7.0
pkgrel=1
pkgdesc=Music player written in Qt.
url=http://www.tomahawk-player.org/;
@@ -15,6 +15,6 @@ archs=('i686' 'x86_64')
Finclude cmake
up2date=Flasttar http://download.tomahawk-player.org/;
source=(http://download.tomahawk-player.org/$pkgname-$pkgver.tar.bz2)
-sha1sums=('4d02e2800cf3e71ed7aaede93a053a9b60a95a5b')
+sha1sums=('ddd6787b588c3419355ef1d2d3dad9aa7b57928f')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Remove an unnecessary argument of _pacman_removedeps.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1c647faf2ff5ae1f6819216595a4d2b2e8552a31
commit 1c647faf2ff5ae1f6819216595a4d2b2e8552a31
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 13:13:59 2013 +0200
libpacman: Remove an unnecessary argument of _pacman_removedeps.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 6c34298..6fd986d 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -527,12 +527,12 @@ void _pacman_removedeps(pmtrans_t *trans)
}
}
-/* populates *list with packages that need to be installed to satisfy all
+/* populates *trans with packages that need to be installed to satisfy all
* dependencies (recursive) for syncpkg
*
- * make sure *list and *trail are already initialized
+ * make sure *trail are already initialized
*/
-int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t *list,
+int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *trail, pmlist_t **data)
{
pmlist_t *i, *j;
@@ -557,7 +557,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *list,
pmpkg_t *ps = NULL;
/* check if one of the packages in *list already provides this dependency */
- for(j = list; j !found; j = j-next) {
+ for(j = trans-_packages; j !found; j = j-next) {
pmpkg_t *sp = (pmpkg_t *)j-data;
if(f_stringlist_find (_pacman_pkg_getinfo(sp, PM_PKG_PROVIDES),
miss-depend.name)) {
_pacman_log(PM_LOG_DEBUG, _(%s provides dependency %s -- skipping),
@@ -597,7 +597,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *list,
pm_errno = PM_ERR_UNSATISFIED_DEPS;
goto error;
}
- if(_pacman_pkg_isin(ps-name, list)) {
+ if(_pacman_pkg_isin(ps-name, trans-_packages)) {
/* this dep is already in the target list */
_pacman_log(PM_LOG_DEBUG, _(dependency %s is already in the target list --
skipping),
ps-name);
@@ -616,12 +616,12 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t
*syncpkg, pmlist_t *list,
}
if(usedep) {
trail = _pacman_list_add(trail, ps);
- if(_pacman_resolvedeps(trans, ps, list, trail,
data)) {
+ if(_pacman_resolvedeps(trans, ps, trail, data))
{
goto error;
}
_pacman_log(PM_LOG_DEBUG, _(pulling dependency %s (needed by %s)),
ps-name, syncpkg-name);
- list = _pacman_list_add(list, ps);
+ trans-_packages =
_pacman_list_add(trans-_packages, ps);
} else {
_pacman_log(PM_LOG_ERROR, _(cannot resolve dependencies for \%s\),
miss-target);
if(data) {
diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h
index be09d12..cc411cf 100644
--- a/lib/libpacman/deps.h
+++ b/lib/libpacman/deps.h
@@ -53,7 +53,7 @@ void _pacman_sortbydeps(pmtrans_t *trans, int mode);
pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages);
int _pacman_splitdep(const char *depstr, pmdepend_t *depend);
void _pacman_removedeps(pmtrans_t *trans);
-int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t *list,
+int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *trail, pmlist_t **data);
#endif /* _PACMAN_DEPS_H */
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index e1d276b..ac6c8e9 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -589,7 +589,7 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
_pacman_log(PM_LOG_FLOW1, _(resolving targets dependencies));
for(i = trans-packages; i; i = i-next) {
pmpkg_t *spkg = ((pmsyncpkg_t *)i-data)-pkg_new;
- if (_pacman_resolvedeps (trans, spkg, trans-_packages,
trail, data) == -1) {
+ if (_pacman_resolvedeps (trans, spkg, trail, data) ==
-1) {
/* pm_errno is set by resolvedeps */
ret = -1;
goto cleanup;
@@ -813,9 +813,9 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
* package that's in our final (upgrade) list.
*/
/*EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);*/
- if(trans-_packages) {
+ if (trans-_packages) {
_pacman_log(PM_LOG_FLOW1, _(checking dependencies of packages designated for
removal));
- deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_REMOVE,
trans-_packages);
+ deps = _pacman_checkdeps (trans, PM_TRANS_TYPE_REMOVE,
trans-_packages);
if(deps) {
int errorout = 0;
for(i = deps; i; i = i-next) {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Remove recreated copy of _packages, by using it directly.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=144ab05e9ed53f9ce05181732693fda3c6ce0c09
commit 144ab05e9ed53f9ce05181732693fda3c6ce0c09
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 12:47:59 2013 +0200
libpacman: Remove recreated copy of _packages, by using it directly.
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index fde7861..e1d276b 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -568,7 +568,6 @@ static
int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
{
pmlist_t *deps = NULL;
- pmlist_t *list = NULL; /* list allowing checkdeps usage with data from
trans-packages */
pmlist_t *trail = NULL; /* breadcrum list to avoid running into circles */
pmlist_t *asked = NULL;
pmlist_t *i, *j, *k, *l, *m;
@@ -582,11 +581,6 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t
**data)
*data = NULL;
}
- for(i = trans-packages; i; i = i-next) {
- pmsyncpkg_t *ps = i-data;
- list = _pacman_list_add(list, ps-pkg_new);
- }
-
if(!(trans-flags PM_TRANS_FLAG_NODEPS)) {
trail = f_list_new();
@@ -595,14 +589,14 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t
**data)
_pacman_log(PM_LOG_FLOW1, _(resolving targets dependencies));
for(i = trans-packages; i; i = i-next) {
pmpkg_t *spkg = ((pmsyncpkg_t *)i-data)-pkg_new;
- if(_pacman_resolvedeps(trans, spkg, list, trail, data)
== -1) {
+ if (_pacman_resolvedeps (trans, spkg, trans-_packages,
trail, data) == -1) {
/* pm_errno is set by resolvedeps */
ret = -1;
goto cleanup;
}
}
- for(i = list; i; i = i-next) {
+ for (i = trans-_packages; i; i = i-next) {
/* add the dependencies found by resolvedeps to the transaction set */
pmpkg_t *spkg = i-data;
if(!__pacman_trans_get_trans_pkg(trans, spkg-name)) {
@@ -621,7 +615,7 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
_pacman_log(PM_LOG_FLOW1, _(looking for unresolvable dependencies));
- deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_UPGRADE, list);
+ deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_UPGRADE,
trans-_packages);
if(deps) {
if(data) {
*data = deps;
@@ -804,8 +798,6 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL);
}
- FREELISTPTR(list);
-
/* XXX: this fails for cases where a requested package wants
* a dependency that conflicts with an older version of
* the package. It will be removed from final, and the user
@@ -821,15 +813,9 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t
**data)
* package that's in our final (upgrade) list.
*/
/*EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);*/
- for(i = trans-packages; i; i = i-next) {
- pmsyncpkg_t *ps = i-data;
- for(j = ps-replaces; j; j = j-next) {
- list = _pacman_list_add(list, j-data);
- }
- }
- if(list) {
+ if(trans-_packages) {
_pacman_log(PM_LOG_FLOW1, _(checking dependencies of packages designated for
removal));
- deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_REMOVE,
list);
+ deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_REMOVE,
trans-_packages);
if(deps) {
int errorout = 0;
for(i = deps; i; i = i-next) {
@@ -911,7 +897,6 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
check_olddelay();
cleanup:
- FREELISTPTR(list);
FREELISTPTR(trail);
FREELIST(asked);
@@ -1061,7 +1046,6 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
_pacman_removedeps(trans);
}
- /* re-order w.r.t. dependencies */
_pacman_sortbydeps(trans, PM_TRANS_TYPE_REMOVE);
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Remove trail to resolvedeps.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b7b566f33890935c98309a9bc2ca347836f93e94
commit b7b566f33890935c98309a9bc2ca347836f93e94
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 13:50:58 2013 +0200
libpacman: Remove trail to resolvedeps.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 6fd986d..841d274 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -261,7 +261,7 @@ void _pacman_sortbydeps(pmtrans_t *trans, int mode)
int found;
if (trans-_packages == NULL) {
- return(NULL);
+ return;
}
_pacman_log(PM_LOG_DEBUG, _(started sorting dependencies));
@@ -532,8 +532,7 @@ void _pacman_removedeps(pmtrans_t *trans)
*
* make sure *trail are already initialized
*/
-int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
- pmlist_t *trail, pmlist_t **data)
+int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t **data)
{
pmlist_t *i, *j;
pmlist_t *targ;
@@ -597,14 +596,12 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t
*syncpkg,
pm_errno = PM_ERR_UNSATISFIED_DEPS;
goto error;
}
- if(_pacman_pkg_isin(ps-name, trans-_packages)) {
+ if (__pacman_trans_get_trans_pkg (trans, ps-name) != NULL) {
/* this dep is already in the target list */
_pacman_log(PM_LOG_DEBUG, _(dependency %s is already in the target list --
skipping),
ps-name);
continue;
- }
-
- if(!_pacman_pkg_isin(ps-name, trail)) {
+ } else {
/* check pmo_ignorepkg and pmo_s_ignore to make sure we haven't pulled in
* something we're not supposed to.
*/
@@ -615,13 +612,12 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t
*syncpkg,
FREEPKG(dummypkg);
}
if(usedep) {
- trail = _pacman_list_add(trail, ps);
- if(_pacman_resolvedeps(trans, ps, trail, data))
{
- goto error;
- }
_pacman_log(PM_LOG_DEBUG, _(pulling dependency %s (needed by %s)),
ps-name, syncpkg-name);
- trans-_packages =
_pacman_list_add(trans-_packages, ps);
+ _pacman_trans_add_pkg (trans, ps,
PM_TRANS_TYPE_UPGRADE, 0);
+ if(_pacman_resolvedeps(trans, ps, data)) {
+ goto error;
+ }
} else {
_pacman_log(PM_LOG_ERROR, _(cannot resolve dependencies for \%s\),
miss-target);
if(data) {
@@ -635,9 +631,6 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pm_errno = PM_ERR_UNSATISFIED_DEPS;
goto error;
}
- } else {
- /* cycle detected -- skip it */
- _pacman_log(PM_LOG_DEBUG, _(dependency cycle detected:
%s), ps-name);
}
}
diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h
index cc411cf..2d1b558 100644
--- a/lib/libpacman/deps.h
+++ b/lib/libpacman/deps.h
@@ -53,8 +53,7 @@ void _pacman_sortbydeps(pmtrans_t *trans, int mode);
pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages);
int _pacman_splitdep(const char *depstr, pmdepend_t *depend);
void _pacman_removedeps(pmtrans_t *trans);
-int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
-pmlist_t *trail, pmlist_t **data);
+int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t **data);
#endif /* _PACMAN_DEPS_H */
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index ac6c8e9..064b140 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -568,7 +568,6 @@ static
int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
{
pmlist_t *deps = NULL;
- pmlist_t *trail = NULL; /* breadcrum list to avoid running into circles
*/
pmlist_t *asked = NULL;
pmlist_t *i, *j, *k, *l, *m;
int ret = 0;
@@ -582,14 +581,12 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t
**data)
}
if(!(trans-flags PM_TRANS_FLAG_NODEPS)) {
- trail = f_list_new();
-
/* Resolve targets dependencies */
EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
_pacman_log(PM_LOG_FLOW1, _(resolving targets dependencies));
for(i = trans-packages; i; i = i-next) {
pmpkg_t *spkg = ((pmsyncpkg_t *)i-data)-pkg_new;
- if (_pacman_resolvedeps (trans, spkg, trail, data) ==
-1) {
+ if (_pacman_resolvedeps (trans, spkg, data) == -1) {
/* pm_errno is set by resolvedeps */
ret = -1;
goto cleanup;
@@ -625,8 +622,6 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
ret = -1;
goto cleanup;
}
-
- FREELISTPTR(trail);
}
if(!(trans-flags PM_TRANS_FLAG_NOCONFLICTS)) {
@@ -897,7 +892,6 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
check_olddelay();
cleanup:
- FREELISTPTR(trail);
FREELIST(asked);
return(ret);
___
Frugalware-git mailing list
[Frugalware-git] pacman-g2: libpacman: Rework a little around depends.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4ee314b335d02aa49a39dbdae2493c8c33a99222
commit 4ee314b335d02aa49a39dbdae2493c8c33a99222
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 14:55:07 2013 +0200
libpacman: Rework a little around depends.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 841d274..1bd1c8d 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -341,78 +341,73 @@ void _pacman_sortbydeps(pmtrans_t *trans, int mode)
trans-_packages = newtargs;
}
-/* Returns a pmlist_t* of missing_t pointers.
+/* Returns a pmlist_t* of missing_t pointers in **baddeps.
*
* dependencies can include versions with depmod operators.
*/
-pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages)
-{
+static
+int _pacman_transpkg_checkdeps(pmtrans_t *trans, pmtranspkg_t *transpkg,
pmlist_t **baddeps) {
pmdepend_t depend;
- pmlist_t *i, *j, *k;
- pmlist_t *baddeps = NULL;
+ pmlist_t *j, *k;
pmdepmissing_t *miss = NULL;
pmdb_t *db = trans-handle-db_local;
+ const char *pkg_name = __pacman_transpkg_name (transpkg);
if(db == NULL) {
- return(NULL);
+ return -1;
}
- for (i = packages; i; i = i-next) {
- pmpkg_t *tp = i-data;
- const char *pkg_name = tp-name;
-
- if(op PM_TRANS_TYPE_ADD) {
+ if (transpkg-type PM_TRANS_TYPE_ADD) {
/* DEPENDENCIES -- look for unsatisfied dependencies */
- for(j = _pacman_pkg_getinfo(tp, PM_PKG_DEPENDS); j; j =
j-next) {
+ for(j = _pacman_pkg_getinfo (transpkg-pkg_new,
PM_PKG_DEPENDS); j; j = j-next) {
/* split into name/version pairs */
_pacman_splitdep((char *)j-data, depend);
if(_pacman_trans_is_depend_satisfied(trans, depend) != 0) {
_pacman_log(PM_LOG_DEBUG, _(checkdeps: found %s as a dependency for %s),
depend.name, pkg_name);
miss = _pacman_depmiss_new(pkg_name, PM_DEP_TYPE_DEPEND, depend.mod,
depend.name, depend.version);
- if(!_pacman_depmiss_isin(miss,
baddeps)) {
- baddeps =
_pacman_list_add(baddeps, miss);
+ if (!_pacman_depmiss_isin(miss,
*baddeps)) {
+ *baddeps =
_pacman_list_add(*baddeps, miss);
} else {
FREE(miss);
}
}
}
}
- if(op == PM_TRANS_TYPE_UPGRADE) {
+ if (transpkg-type == PM_TRANS_TYPE_UPGRADE) {
/* PM_TRANS_TYPE_UPGRADE handles the backwards dependencies, ie, the packages
* listed in the requiredby field.
*/
pmpkg_t *oldpkg;
if((oldpkg = _pacman_db_get_pkgfromcache(db, pkg_name)) == NULL) {
- continue;
+ return;
}
for(j = _pacman_pkg_getinfo(oldpkg, PM_PKG_REQUIREDBY); j; j = j-next) {
pmtranspkg_t *requiredtranspkg = __pacman_trans_get_trans_pkg (trans, (const
char *)j-data);
pmpkg_t *p;
- int found = 0;
if (requiredtranspkg != NULL
requiredtranspkg-type PM_TRANS_TYPE_ADD) {
/* this package is also in the upgrade list, so don't worry about it */
- continue;
+ return;
}
if((p = _pacman_db_get_pkgfromcache(db, j-data)) == NULL) {
/* hmmm... package isn't installed.. */
- continue;
+ return;
}
for(k = _pacman_pkg_getinfo(p, PM_PKG_DEPENDS); k; k = k-next) {
/* don't break any existing dependencies (possible provides) */
_pacman_splitdep(k-data, depend);
- if (_pacman_pkg_is_depend_satisfied
(oldpkg, depend) == 0 _pacman_pkg_is_depend_satisfied (tp, depend) != 0) {
+ if (_pacman_pkg_is_depend_satisfied
(oldpkg, depend) == 0 _pacman_pkg_is_depend_satisfied (transpkg-pkg_new,
depend) != 0) {
_pacman_log(PM_LOG_DEBUG, _(checkdeps: updated '%s' won't satisfy a dependency
of '%s'),
oldpkg-name, p-name);
miss = _pacman_depmiss_new(p-name, PM_DEP_TYPE_DEPEND, depend.mod,
depend.name, depend.version);
- if(!_pacman_depmiss_isin(miss,
baddeps)) {
- baddeps =
_pacman_list_add(baddeps, miss);
+ if (!_pacman_depmiss_isin(miss,
*baddeps)) {
+ *baddeps =
_pacman_list_add(*baddeps, miss);
} else {
FREE(miss);
}
@@ -420,9 +415,9 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char
op, pmlist_t *packag
}
}
}
- if(op == PM_TRANS_TYPE_REMOVE) {
+ if (transpkg-type == PM_TRANS_TYPE_REMOVE) {
/* check requiredby fields */
- for(j = _pacman_pkg_getinfo(tp, PM_PKG_REQUIREDBY); j;
j = j-next) {
+ for (j =
[Frugalware-git] pacman-g2: libpacman: Use transpkg-pkg_local instead of reasking cache for it in _pacman_transpkg_checkdeps.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=38404f714f0c0f6a5bfda59fce480ab4e3746126
commit 38404f714f0c0f6a5bfda59fce480ab4e3746126
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 15:13:06 2013 +0200
libpacman: Use transpkg-pkg_local instead of reasking cache for it in
_pacman_transpkg_checkdeps.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 1bd1c8d..6a7838f 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -378,32 +378,30 @@ int _pacman_transpkg_checkdeps(pmtrans_t *trans,
pmtranspkg_t *transpkg, pmlist_
/* PM_TRANS_TYPE_UPGRADE handles the backwards dependencies, ie, the packages
* listed in the requiredby field.
*/
- pmpkg_t *oldpkg;
-
- if((oldpkg = _pacman_db_get_pkgfromcache(db, pkg_name))
== NULL) {
- return;
- }
- for(j = _pacman_pkg_getinfo(oldpkg, PM_PKG_REQUIREDBY);
j; j = j-next) {
+ if(transpkg-pkg_local != NULL) {
+ /* Really an upgrade*/
+ for(j = _pacman_pkg_getinfo(transpkg-pkg_local,
PM_PKG_REQUIREDBY); j; j = j-next) {
pmtranspkg_t *requiredtranspkg = __pacman_trans_get_trans_pkg (trans, (const
char *)j-data);
pmpkg_t *p;
if (requiredtranspkg != NULL
requiredtranspkg-type PM_TRANS_TYPE_ADD) {
/* this package is also in the upgrade list, so don't worry about it */
- return;
+ continue;
}
if((p = _pacman_db_get_pkgfromcache(db, j-data)) == NULL) {
/* hmmm... package isn't installed.. */
- return;
+ continue;
}
for(k = _pacman_pkg_getinfo(p, PM_PKG_DEPENDS); k; k = k-next) {
/* don't break any existing dependencies (possible provides) */
_pacman_splitdep(k-data, depend);
- if (_pacman_pkg_is_depend_satisfied
(oldpkg, depend) == 0 _pacman_pkg_is_depend_satisfied (transpkg-pkg_new,
depend) != 0) {
+ if (_pacman_pkg_is_depend_satisfied
(transpkg-pkg_local, depend) == 0
+
_pacman_pkg_is_depend_satisfied (transpkg-pkg_new, depend) != 0) {
_pacman_log(PM_LOG_DEBUG, _(checkdeps: updated '%s' won't satisfy a dependency
of '%s'),
- oldpkg-name,
p-name);
+
transpkg-pkg_local-name, p-name);
miss = _pacman_depmiss_new(p-name, PM_DEP_TYPE_DEPEND, depend.mod,
depend.name, depend.version);
if (!_pacman_depmiss_isin(miss, *baddeps)) {
@@ -414,6 +412,7 @@ int _pacman_transpkg_checkdeps(pmtrans_t *trans,
pmtranspkg_t *transpkg, pmlist_
}
}
}
+ }
}
if (transpkg-type == PM_TRANS_TYPE_REMOVE) {
/* check requiredby fields */
@@ -462,7 +461,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char
op, pmlist_t *packag
transpkg.type = op;
if (op PM_TRANS_TYPE_ADD) {
transpkg.pkg_new = i-data;
- transpkg.pkg_local =
_pacman_db_get_pkgfromcache(trans-handle-db_local, i-data);
+ transpkg.pkg_local =
_pacman_db_get_pkgfromcache(trans-handle-db_local, transpkg.pkg_new-name);
} else {
transpkg.pkg_new = NULL;
transpkg.pkg_local = i-data;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gprename-4-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31666595f0e49f477d8ed7d7292113ab115d94f3
commit 31666595f0e49f477d8ed7d7292113ab115d94f3
Author: kikadf kikadf...@gmail.com
Date: Sat May 4 15:48:01 2013 +0200
gprename-4-1-x86_64
* Version bump
diff --git a/source/xapps-extra/gprename/FrugalBuild
b/source/xapps-extra/gprename/FrugalBuild
index 84acbcb..8f9cc7e 100644
--- a/source/xapps-extra/gprename/FrugalBuild
+++ b/source/xapps-extra/gprename/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Cedrick Hannier alias Cedynamix cedyna...@gmail.com
pkgname=gprename
-pkgver=3
+pkgver=4
pkgrel=1
pkgdesc=Batch renamer for files and directories
groups=('xapps-extra')
@@ -11,7 +11,7 @@ archs=('i686' 'x86_64')
rodepends=('perl-gtk2' 'perl-gettext' 'perl-libintl')
_F_sourceforge_ext=.tar.bz2
Finclude sourceforge
-sha1sums=('38fabae319aeb489e50ab6af5c77744ebc36406c')
+sha1sums=('74cff6db320e4959d78f69727fce2b03e76439ca')
build()
{
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: converseen-0.6.1-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c153f5054414689d61e849f523d998aeee9ef1de
commit c153f5054414689d61e849f523d998aeee9ef1de
Author: kikadf kikadf...@gmail.com
Date: Sat May 4 15:48:41 2013 +0200
converseen-0.6.1-1-x86_64
* Version bump
diff --git a/source/xapps-extra/converseen/FrugalBuild
b/source/xapps-extra/converseen/FrugalBuild
index e7ab4cb..ff59a37 100644
--- a/source/xapps-extra/converseen/FrugalBuild
+++ b/source/xapps-extra/converseen/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: centuri0 achevaux at gmail dot com
pkgname=converseen
-pkgver=0.6
+pkgver=0.6.1
pkgrel=1
pkgdesc=A batch image conversion tool written in C++ with Qt4 and Magick++.
depends=('imagemagick' 'libqtgui' 'xz' 'libtool' 'libuuid')
@@ -18,7 +18,7 @@ _F_cmake_confopts+=
-DImageMagick_Magick++_INCLUDE_DIR:PATH=/usr/include/ImageM
Finclude sourceforge cmake
groups=('xapps-extra')
archs=('i686' 'x86_64')
-sha1sums=('b04414adfe0c635f352031910d1022a0f301ef18')
+sha1sums=('022d5d12fb286b506b7a32c57860aa43319be4fd')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: php-pecl-memcache-3.0.8-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=26a07cbcd05f469e77a9c6254a1ae5436d041e2d
commit 26a07cbcd05f469e77a9c6254a1ae5436d041e2d
Author: CSÃCSY László boo...@frugalware.org
Date: Sat May 4 18:16:08 2013 +0200
php-pecl-memcache-3.0.8-1-x86_64
version bump
diff --git a/source/devel-extra/php-pecl-memcache/FrugalBuild
b/source/devel-extra/php-pecl-memcache/FrugalBuild
index 0aea850..73367e9 100644
--- a/source/devel-extra/php-pecl-memcache/FrugalBuild
+++ b/source/devel-extra/php-pecl-memcache/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: CSÉCSY László boo...@frugalware.org
_F_pecl_name=memcache
-pkgver=3.0.6
+pkgver=3.0.8
pkgdesc=allows you to work with memcached through handy OO and procedural
interfaces
depends=('php=5.3.0')
Finclude pecl
pkgrel=1
archs=('i686' 'x86_64')
-sha1sums=('eb0c922df3f5ca459bcce85e141f379d3b490ca7')
+sha1sums=('681ece0258958d60902d6bbf0cf1f2171a0cc47c')
up2date=lynx -dump http://pecl.php.net/package/$_F_pecl_name |grep -m1
'[0-9.]\{3,\}\.tgz$'|sed 's/.*-\(.*\)\.t.*/\1/'
build() {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: drupal7-7.22-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7358fa6430b5fc680f1e904a2ab4aa9b08c72a34
commit 7358fa6430b5fc680f1e904a2ab4aa9b08c72a34
Author: CSÃCSY László boo...@frugalware.org
Date: Sat May 4 18:20:27 2013 +0200
drupal7-7.22-1-x86_64
version bump
diff --git a/source/network-extra/drupal7/FrugalBuild
b/source/network-extra/drupal7/FrugalBuild
index 6a8acab..6e67b96 100644
--- a/source/network-extra/drupal7/FrugalBuild
+++ b/source/network-extra/drupal7/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: CSÉCSY László boo...@frugalware.org
pkgname=drupal7
-pkgver=7.21
+pkgver=7.22
pkgrel=1
pkgdesc=An open source content management platform
url=http://drupal.org;
@@ -13,7 +13,7 @@ up2date=lynx -dump http://drupal.org/project/Drupal+project
| grep -m1 'l-7[0-9
backup=(var/www/drupal6/sites/default/settings.php)
source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \
README.Frugalware)
-sha1sums=('abe77691715315c9115b5f5e2eac9bb4bbe52454' \
+sha1sums=('81c4d72b374dbcb338ec53049ca659a2d1ee9d87' \
'84a37af7ac58313679634c98185a3847d337ce3e')
options=('stick')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: drupal6-mollom-6.x_2.4-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f472aeab875a75659ee830ac14e3a2cbdec8544
commit 8f472aeab875a75659ee830ac14e3a2cbdec8544
Author: CSÃCSY László boo...@frugalware.org
Date: Sat May 4 18:21:49 2013 +0200
drupal6-mollom-6.x_2.4-1-x86_64
version bump
diff --git a/source/network-extra/drupal6-mollom/FrugalBuild
b/source/network-extra/drupal6-mollom/FrugalBuild
index 151da90..9e6c200 100644
--- a/source/network-extra/drupal6-mollom/FrugalBuild
+++ b/source/network-extra/drupal6-mollom/FrugalBuild
@@ -3,9 +3,9 @@
_F_drupal_module=mollom
_F_drupal_ver=6.x
-pkgver=6.x_2.2
+pkgver=6.x_2.4
pkgrel=1
pkgdesc=Protects against comment and contact form spam in Drupal
Finclude drupal
-sha1sums=('e98f7f2dae04c2848c11839ac9b8117b1492dc18')
+sha1sums=('6e7bfc9b84f0a6dcb566b446487fb39e50a7e64e')
replaces=('drupal-mollom')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: drupal6-filefield-6.x_3.11-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51c90d46367fa69bd23b245b05f2702f2663ba25
commit 51c90d46367fa69bd23b245b05f2702f2663ba25
Author: CSÃCSY László boo...@frugalware.org
Date: Sat May 4 18:23:25 2013 +0200
drupal6-filefield-6.x_3.11-1-x86_64
version bump
diff --git a/source/network-extra/drupal6-filefield/FrugalBuild
b/source/network-extra/drupal6-filefield/FrugalBuild
index 59a2e2b..072766c 100644
--- a/source/network-extra/drupal6-filefield/FrugalBuild
+++ b/source/network-extra/drupal6-filefield/FrugalBuild
@@ -3,10 +3,10 @@
_F_drupal_module=filefield
_F_drupal_ver=6.x
-pkgver=6.x_3.10
+pkgver=6.x_3.11
pkgrel=1
pkgdesc=Provides a generic file upload field for Drupal's content.module
(CCK).
rodepends=('drupal6-cck')
Finclude drupal
-sha1sums=('141ff0b40dd8d338324b37ab15b8a965ced8d598')
+sha1sums=('3b5396d21b90ccff409ea580f5825973196c865e')
replaces=('drupal-filefield')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: drupal6-imagefield-6.x_3.11-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0082ca7fedad0cc1c5d883952ec3ec9f6c8a24e0
commit 0082ca7fedad0cc1c5d883952ec3ec9f6c8a24e0
Author: CSÃCSY László boo...@frugalware.org
Date: Sat May 4 18:24:58 2013 +0200
drupal6-imagefield-6.x_3.11-1-x86_64
version bump
diff --git a/source/network-extra/drupal6-imagefield/FrugalBuild
b/source/network-extra/drupal6-imagefield/FrugalBuild
index 43dc5b4..4eb1567 100644
--- a/source/network-extra/drupal6-imagefield/FrugalBuild
+++ b/source/network-extra/drupal6-imagefield/FrugalBuild
@@ -3,10 +3,10 @@
_F_drupal_module=imagefield
_F_drupal_ver=6.x
-pkgver=6.x_3.10
+pkgver=6.x_3.11
pkgrel=1
pkgdesc=Provides a basic image field for CCK in Drupal
-rodepends=('drupal6-filefield=6.x_3.10')
+rodepends=('drupal6-filefield=6.x_3.11')
Finclude drupal
-sha1sums=('6272bca343bb3da859e9b35f5af26967aa3376ae')
+sha1sums=('abffb3737100dfdcd9959d95f3d899a33748e7c4')
replaces=('drupal-imagefield')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: man-pages-3.51-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a7d8fe40954e1386785b4adf87cf024ad19df34
commit 2a7d8fe40954e1386785b4adf87cf024ad19df34
Author: CSÃCSY László boo...@frugalware.org
Date: Sat May 4 18:29:37 2013 +0200
man-pages-3.51-1-x86_64
version bump
diff --git a/source/apps/man-pages/FrugalBuild
b/source/apps/man-pages/FrugalBuild
index 46f1960..1de6860 100644
--- a/source/apps/man-pages/FrugalBuild
+++ b/source/apps/man-pages/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Miklos Vajna vmik...@frugalware.org
pkgname=man-pages
-pkgver=3.50
+pkgver=3.51
pkgrel=1
pkgdesc=Man pages are online documentation for Linux
url=http://www.kernel.org/doc/man-pages/index.html;
@@ -43,4 +43,4 @@ build()
Frm /usr/share/man/man3/{ctime,queue,random,regex,string}.3
}
-sha1sums=('4fbdf0d2509b045a2e9b74b87f06468a2a1381eb')
+sha1sums=('6dc6b54e4ff8cc43a901577d6d56fd724e469b49')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: libpacman: Introduce and use _pacman_trans_checkdeps as replacement of _pacman_checkdeps.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=be003d51dfcc0ed1dc35ce52473bb393f1f0896f
commit be003d51dfcc0ed1dc35ce52473bb393f1f0896f
Author: Michel Hermier herm...@frugalware.org
Date: Sat May 4 19:17:44 2013 +0200
libpacman: Introduce and use _pacman_trans_checkdeps as replacement of
_pacman_checkdeps.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 6a7838f..0eb09c5 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -374,12 +374,11 @@ int _pacman_transpkg_checkdeps(pmtrans_t *trans,
pmtranspkg_t *transpkg, pmlist_
}
}
}
- if (transpkg-type == PM_TRANS_TYPE_UPGRADE) {
+ if (transpkg-type == PM_TRANS_TYPE_UPGRADE
+ transpkg-pkg_local != NULL) { /* Really an
upgrade */
/* PM_TRANS_TYPE_UPGRADE handles the backwards dependencies, ie, the packages
* listed in the requiredby field.
*/
- if(transpkg-pkg_local != NULL) {
- /* Really an upgrade*/
for(j = _pacman_pkg_getinfo(transpkg-pkg_local, PM_PKG_REQUIREDBY); j; j =
j-next) {
pmtranspkg_t *requiredtranspkg = __pacman_trans_get_trans_pkg (trans, (const
char *)j-data);
pmpkg_t *p;
@@ -412,7 +411,6 @@ int _pacman_transpkg_checkdeps(pmtrans_t *trans,
pmtranspkg_t *transpkg, pmlist_
}
}
}
- }
}
if (transpkg-type == PM_TRANS_TYPE_REMOVE) {
/* check requiredby fields */
@@ -449,11 +447,22 @@ int _pacman_transpkg_checkdeps(pmtrans_t *trans,
pmtranspkg_t *transpkg, pmlist_
return 0;
}
+int _pacman_trans_checkdeps (pmtrans_t *trans, pmlist_t **depmisslist) {
+ pmlist_t *i;
+
+ for (i = trans-packages; i != NULL; i = i-next) {
+ pmtranspkg_t *transpkg = i-data;
+
+ _pacman_transpkg_checkdeps (trans, transpkg, depmisslist);
+ }
+ return 0;
+}
+
/* Returns a pmlist_t* of missing_t pointers.
*
* dependencies can include versions with depmod operators.
*/
-pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages) {
+pmlist_t *_pacman_checkdeps (pmtrans_t *trans, unsigned char op, pmlist_t
*packages) {
pmlist_t *i, *ret = NULL;
for (i = packages; i; i = i-next) {
diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h
index 89a1521..a792c9a 100644
--- a/lib/libpacman/deps.h
+++ b/lib/libpacman/deps.h
@@ -53,6 +53,8 @@ void _pacman_sortbydeps(pmtrans_t *trans, int mode);
pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages);
int _pacman_splitdep(const char *depstr, pmdepend_t *depend);
void _pacman_removedeps(pmtrans_t *trans);
+
+int _pacman_trans_checkdeps (pmtrans_t *trans, pmlist_t **depmisslist);
int _pacman_trans_resolvedeps(pmtrans_t *trans, pmlist_t **data);
#endif /* _PACMAN_DEPS_H */
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index a106cb9..9ff9571 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -608,7 +608,7 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
_pacman_log(PM_LOG_FLOW1, _(looking for unresolvable dependencies));
- deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_UPGRADE,
trans-_packages);
+ _pacman_trans_checkdeps (trans, deps);
if(deps) {
if(data) {
*data = deps;
@@ -918,7 +918,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t **data)
}
} else {
- pmlist_t *lp;
+ pmlist_t *lp = NULL;
pmlist_t *rmlist = NULL;
char rm_fname[PATH_MAX];
pmpkg_t *info = NULL;
@@ -929,7 +929,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t **data)
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
/* look for unsatisfied dependencies */
_pacman_log(PM_LOG_FLOW1, _(looking for unsatisfied dependencies));
- lp = _pacman_checkdeps(trans, trans-type,
trans-_packages);
+ _pacman_trans_checkdeps (trans, lp);
if(lp != NULL) {
if(data) {
*data = lp;
@@ -1003,7 +1003,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
_pacman_log(PM_LOG_FLOW1, _(looking for unsatisfied dependencies));
- lp = _pacman_checkdeps(trans, trans-type, trans-_packages);
+ _pacman_trans_checkdeps (trans, lp);
if(lp != NULL) {
if(trans-flags PM_TRANS_FLAG_CASCADE) {
while(lp) {
@@ -1019,7 +1019,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t
**data)
}
}
FREELIST(lp);
- lp = _pacman_checkdeps(trans,
trans-type, trans-_packages);
+ _pacman_trans_checkdeps (trans, lp);
}
} else {
if(data) {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libreoffice-4.0.3.3-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9e72b12a3d6463a5532e8a58c13c57b8d94b776
commit d9e72b12a3d6463a5532e8a58c13c57b8d94b776
Author: Miklos Vajna vmik...@frugalware.org
Date: Sat May 4 19:41:10 2013 +0200
libreoffice-4.0.3.3-1-x86_64
- 4.0.2 - 4.0.3
diff --git a/source/xapps/libreoffice/FrugalBuild
b/source/xapps/libreoffice/FrugalBuild
index 9cc638f..175a161 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -5,7 +5,7 @@
options+=('asneeded')
pkgname=libreoffice
-pkgver=4.0.2.2
+pkgver=4.0.3.3
minor=${pkgver:0:5} # x.y.z
major=${pkgver:0:3} # x.y
pkgrel=1
@@ -14,7 +14,7 @@ url=http://www.documentfoundation.org/download/;
_F_gnome_desktop=y
Finclude gnome-scriptlet kde
unset install
-depends=('libxml2' 'libart_lgpl' 'libsndfile' 'openjre' 'fontconfig'
'libpng=1.4.1' \
+depends=('libxml2' 'libsndfile' 'openjre' 'fontconfig' 'libpng=1.4.1' \
'flex' 'neon=0.26.1' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils'
'perl-archive-zip' \
'unixodbc=2.3.1' 'libxaw=1.0.5' 'libxslt' 'startup-notification=0.9-3'
'libvisio=0.0.24-2' 'libcdr=0.0.10' 'libmspub' 'liborcus' \
'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat=3.4.0' 'librdf'
'graphite2' 'libcmis=0.3.0-2' 'clucene' \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: glui-2.36-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a8b292434cb4467daf6a1f51b9e4c2033d4e48cf commit a8b292434cb4467daf6a1f51b9e4c2033d4e48cf Author: Slown slownli...@gmail.com Date: Sat May 4 20:32:41 2013 +0100 glui-2.36-1-i686 * new package diff --git a/source/xlib-extra/glui/makefile.patch b/source/xlib-extra/glui/makefile.patch new file mode 100644 index 000..ed7c4a3 --- /dev/null +++ b/source/xlib-extra/glui/makefile.patch @@ -0,0 +1,21 @@ +--- makefile.old 2006-09-09 02:12:10.0 +0200 makefile 2006-09-09 02:15:46.0 +0200 +@@ -5,15 +5,15 @@ + #CC=gcc + + # Compiler options +-OPTS=-g +-OPTS=-O0 ++#OPTS=-g ++#OPTS=-O0 + #OPTS=-O2 + + UNAME = $(shell uname) + + ifeq ($(UNAME), Linux) + CXX = g++ +-CPPFLAGS += $(OPTS) -Wall -pedantic ++CPPFLAGS += $(OPTS) -Wall -pedantic $(CFLAGS) + endif + + ### ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: glui-2.36-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a875bc21b59bde33f10e30cfbb78976071173d6
commit 5a875bc21b59bde33f10e30cfbb78976071173d6
Author: Slown slownli...@gmail.com
Date: Sat May 4 20:34:26 2013 +0100
glui-2.36-1-i686
* new package
diff --git a/source/xlib-extra/glui/FrugalBuild
b/source/xlib-extra/glui/FrugalBuild
new file mode 100644
index 000..207ac99
--- /dev/null
+++ b/source/xlib-extra/glui/FrugalBuild
@@ -0,0 +1,31 @@
+# Compiling Time: 0.17 SBU
+# Maintainer: Slown sl...@frugalware.org
+
+pkgname=glui
+pkgver=2.36
+pkgrel=1
+pkgdesc=A GLUT-based C++ user interface library which provides controls such
as buttons, checkboxes, radio buttons and spinners to OpenGL applications
+depends=('freeglut' 'libglu')
+groups=('xlib-extra')
+archs=('i686' 'x86_64')
+_F_sourceforge_ext=.tgz
+Finclude sourceforge
+source=($source makefile.patch)
+_F_cd_path=$pkgname-$pkgver/src
+sha1sums=('00e6a4a8a331ccfde951966526c63b0f37c7d8f3' \
+ '10ac6edc9b6bd7612ca1a6ef4953123d93d92280')
+
+build() {
+ Fcd
+ Fpatchall
+ make setup || Fdie
+ make lib/libglui.a || Fdie
+ Fmkdir usr/lib
+ Fmkdir usr/include
+ Fmkdir usr/include/GL
+ Fcprel lib/libglui.a usr/lib
+ Fcprel include/GL/glui.h usr/include/GL
+ Fdocrel doc/glui_manual.pdf
+}
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
