Hello community,
here is the log from the commit of package libsatsolver for openSUSE:Factory
checked in at Thu May 19 12:45:50 CEST 2011.
--------
--- libsatsolver/libsatsolver.changes 2011-03-24 11:04:36.000000000 +0100
+++ libsatsolver/libsatsolver.changes 2011-05-19 10:59:18.000000000 +0200
@@ -1,0 +2,11 @@
+Thu May 19 08:51:52 UTC 2011 - coolo@novell.com
+
+- make it compile with gcc 4.6
+
+-------------------------------------------------------------------
+Fri Apr 29 14:35:59 CEST 2011 - mls@suse.de
+
+- bup version to 0.17.0 to make it different from 11.4
+- 0.17.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
5d6f117d6df9e179f06221ea9c29a7a95de1027c.patch
satsolver-0.16.4.tar.bz2
New:
----
gcc46.patch
satsolver-0.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsatsolver.spec ++++++
--- /var/tmp/diff_new_pack.IPFO1h/_old 2011-05-19 12:45:18.000000000 +0200
+++ /var/tmp/diff_new_pack.IPFO1h/_new 2011-05-19 12:45:18.000000000 +0200
@@ -18,12 +18,12 @@
Name: libsatsolver
-Version: 0.16.4
-Release: 2
-License: BSD3c
+Version: 0.17.0
+Release: 1
+License: BSD 3-Clause
Url: git://gitorious.org/opensuse/sat-solver.git
Source: satsolver-%{version}.tar.bz2
-Patch0: 5d6f117d6df9e179f06221ea9c29a7a95de1027c.patch
+Patch0: gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/C and C++
Prefix: /usr
@@ -69,7 +69,7 @@
Duncan Mac-Vicar P.
%package devel
-License: BSD3c
+
Summary: A new approach to package dependency solving
Group: Development/Libraries/C and C++
Requires: satsolver-tools = %version
@@ -95,7 +95,7 @@
Duncan Mac-Vicar P.
%package -n satsolver-tools
-License: BSD3c
+
Summary: A new approach to package dependency solving
Group: Development/Libraries/C and C++
Obsoletes: libsatsolver <= 0.0.15
@@ -106,7 +106,7 @@
A new approach to package dependency solving.
%package demo
-License: BSD3c
+
Summary: Applications demoing the satsolver library
Group: System/Management
Requires: curl
++++++ gcc46.patch ++++++
Index: satsolver-0.17.0/ext/repo_rpmdb.c
===================================================================
--- satsolver-0.17.0.orig/ext/repo_rpmdb.c
+++ satsolver-0.17.0/ext/repo_rpmdb.c
@@ -1368,7 +1368,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, co
DBC *dbc = 0;
int byteswapped;
unsigned int dbid;
- unsigned char *dp, *dbidp;
+ unsigned char *dp;
int dl, nrpmids;
struct rpmid *rpmids, *rp;
int i;
@@ -1443,7 +1443,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, co
perror("db->cursor");
exit(1);
}
- dbidp = (unsigned char *)&dbid;
+ //dbidp = (unsigned char *)&dbid;
rpmheadsize = 0;
rpmhead = 0;
i = 0;
@@ -1562,7 +1562,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, co
perror("db->cursor");
exit(1);
}
- dbidp = (unsigned char *)&dbid;
+ //dbidp = (unsigned char *)&dbid;
nrpmids = 0;
rpmids = 0;
while (dbc->c_get(dbc, &dbkey, &dbdata, DB_NEXT) == 0)
@@ -1590,7 +1590,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, co
/* sort rpmids */
sat_sort(rpmids, nrpmids, sizeof(*rpmids), rpmids_sort_cmp, 0);
- dbidp = (unsigned char *)&dbid;
+ //dbidp = (unsigned char *)&dbid;
rpmheadsize = 0;
rpmhead = 0;
@@ -2387,7 +2387,6 @@ void *
rpm_byfp(FILE *fp, const char *name, void **statep)
{
struct rpm_by_state *state = *statep;
- int headerstart, headerend;
RpmHead *rpmhead;
int sigdsize, sigcnt, l;
unsigned char lead[4096];
@@ -2423,7 +2422,6 @@ rpm_byfp(FILE *fp, const char *name, voi
}
sigdsize += sigcnt * 16;
sigdsize = (sigdsize + 7) & ~7;
- headerstart = 96 + 16 + sigdsize;
while (sigdsize)
{
l = sigdsize > 4096 ? 4096 : sigdsize;
@@ -2454,7 +2452,6 @@ rpm_byfp(FILE *fp, const char *name, voi
return 0;
}
l = sigdsize + sigcnt * 16;
- headerend = headerstart + 16 + l;
if (l > state->rpmheadsize)
{
state->rpmheadsize = l + 128;
@@ -2652,6 +2649,8 @@ parsekeydata(Solvable *s, Repodata *data
unsigned char *userid = 0;
int useridl = 0;
+ (void)pubkeyl;
+
for (; pl; p += l, pl -= l)
{
x = *p++;
@@ -2885,6 +2884,7 @@ parsekeydata(Solvable *s, Repodata *data
ex = q[1] << 24 | q[2] << 16 | q[3] << 8 | q[4];
q += sl;
ql -= sl;
+ (void)scr;
}
}
if (ex)
@@ -2958,6 +2958,7 @@ parsekeydata(Solvable *s, Repodata *data
repodata_set_num(data, s - s->repo->pool->solvables, PUBKEY_EXPIRES, maxex);
sat_free(pubkey);
sat_free(userid);
+ (void)useridl;
}
/* this is private to rpm, but rpm lacks an interface to retrieve
Index: satsolver-0.17.0/ext/repo_updateinfoxml.c
===================================================================
--- satsolver-0.17.0.orig/ext/repo_updateinfoxml.c
+++ satsolver-0.17.0/ext/repo_updateinfoxml.c
@@ -288,7 +288,7 @@ startElement(void *userData, const char
version = atts[1];
}
-
+ (void)status;
solvable = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo));
pd->datanum = pd->solvable - pool->solvables;
@@ -397,6 +397,7 @@ startElement(void *userData, const char
else if (!strcmp(*atts, "src"))
src = atts[1];
}
+ (void)src;
/* generated Id for name */
n = str2id(pool, name, 1);
rel_id = n;
Index: satsolver-0.17.0/src/repodata.c
===================================================================
--- satsolver-0.17.0.orig/src/repodata.c
+++ satsolver-0.17.0/src/repodata.c
@@ -621,6 +621,7 @@ repodata_lookup_num(Repodata *data, Id s
unsigned char *dp;
Repokey *key;
KeyValue kv;
+ kv.num = 0;
*value = 0;
dp = find_key_data(data, solvid, keyname, &key);
Index: satsolver-0.17.0/src/transaction.c
===================================================================
--- satsolver-0.17.0.orig/src/transaction.c
+++ satsolver-0.17.0/src/transaction.c
@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t
Repo *installed = pool->installed;
Id p;
Solvable *s;
- int i, j, k, max, oldcount;
+ int i, j, k, max;
Map done;
Queue obsq, *steps;
@@ -1945,7 +1945,6 @@ transaction_add_obsoleted(Transaction *t
return;
/* make room */
steps = &trans->steps;
- oldcount = steps->count;
queue_insertn(steps, 0, max);
/* now add em */
++++++ satsolver-0.16.4.tar.bz2 -> satsolver-0.17.0.tar.bz2 ++++++
libsatsolver/satsolver-0.16.4.tar.bz2 libsatsolver/satsolver-0.17.0.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org