rpms/synaptic/FC-5 synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Thu May 25 23:05:55 UTC 2006
Author: athimm
Update of /cvs/extras/rpms/synaptic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10010/FC-5
Added Files:
synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch
synaptic-0.57.2-showprog.patch
Log Message:
Sync FC-4/FC-5 with devel
synaptic-0.57.2-gcc41.patch:
--- NEW FILE synaptic-0.57.2-gcc41.patch ---
--- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300
@@ -48,6 +48,7 @@
};
virtual void update(string text, int current) = 0;
+ virtual ~RCDScanProgress() {};
};
class RCDScanner {
--- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300
@@ -63,6 +63,7 @@
RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {};
+ virtual ~RInstallProgress() {};
};
--- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300
@@ -39,6 +39,7 @@
public:
bool CopyPackages(string CDROM, string Name, vector<string> &List);
+ virtual ~IndexCopy() {};
};
class PackageCopy:public IndexCopy {
@@ -54,6 +55,7 @@
};
public:
+ virtual ~PackageCopy() {};
};
class SourceCopy:public IndexCopy {
@@ -69,6 +71,7 @@
};
public:
+ virtual ~SourceCopy() {};
};
#endif
--- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300
@@ -64,6 +64,7 @@
virtual void notifyChange(RPackage *pkg) = 0;
virtual void notifyPreFilteredChange() = 0;
virtual void notifyPostFilteredChange() = 0;
+ virtual ~RPackageObserver() {};
};
class RCacheObserver {
@@ -71,6 +72,7 @@
virtual void notifyCacheOpen() = 0;
virtual void notifyCachePreChange() = 0;
virtual void notifyCachePostChange() = 0;
+ virtual ~RCacheObserver() {};
};
// base sort class
--- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300
@@ -130,7 +130,7 @@
bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false
inline bool filterName(Pattern pat, RPackage *pkg);
- inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg);
+ inline bool filterVersion(Pattern pat, RPackage *pkg);
inline bool filterDescription(Pattern pat, RPackage *pkg);
inline bool filterMaintainer(Pattern pat, RPackage *pkg);
inline bool filterDepends(Pattern pat, RPackage *pkg,
--- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300
@@ -848,7 +848,6 @@
void RPackage::setPinned(bool flag)
{
- FILE *out;
struct stat stat_buf;
string File =RStateDir() + "/preferences";
@@ -945,8 +944,8 @@
}
}
- return true;
#endif
+ return true;
}
// format: first version, second archives
--- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300
+++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300
@@ -607,7 +607,7 @@
bool _ascent;
RPackageStatus _status;
public:
- supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s)
+ supportedSortFunc(bool ascent, RPackageStatus &s)
: _ascent(ascent), _status(s) {};
bool operator() (RPackage *x, RPackage *y) {
if(_ascent)
--- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300
@@ -64,6 +64,7 @@
virtual bool showErrors();
+ virtual ~RUserDialog() {};
};
#endif
synaptic-0.57.2-repomd-1.patch:
--- NEW FILE synaptic-0.57.2-repomd-1.patch ---
--- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300
@@ -352,8 +352,13 @@
Type |= RpmDir;
else if (S == "rpm-src-dir")
Type |= RpmSrcDir;
+ else if (S == "repomd")
+ Type |= Repomd;
+ else if (S == "repomd-src")
+ Type |= RepomdSrc;
else
return false;
+ cout << S << " settype " << (Type | Repomd) << endl;
return true;
}
@@ -371,6 +376,11 @@
return "rpm-dir";
else if ((Type & RpmSrcDir) != 0)
return "rpm-src-dir";
+ else if ((Type & Repomd) != 0)
+ return "repomd";
+ else if ((Type & RepomdSrc) != 0)
+ return "repomd-src";
+ cout << "type " << (Type & Repomd) << endl;
return "unknown";
}
@@ -382,6 +392,7 @@
return false;
S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture"));
+ S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion"));
URI = S;
// append a / to the end if one is not already there
@@ -522,6 +533,10 @@
os << "RpmDir";
if ((rec.Type & SourcesList::RpmSrcDir) != 0)
os << "RpmSrcDir";
+ if ((rec.Type & SourcesList::Repomd) != 0)
+ os << "Repomd";
+ if ((rec.Type & SourcesList::RepomdSrc) != 0)
+ os << "RepomdSrc";
os << endl;
os << "SourceFile: " << rec.SourceFile << endl;
os << "VendorID: " << rec.VendorID << endl;
--- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300
+++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300
@@ -41,11 +41,13 @@
Disabled = 1 << 4,
Comment = 1 << 5,
RpmDir = 1 << 6,
- RpmSrcDir = 1 << 7
+ RpmSrcDir = 1 << 7,
+ Repomd = 1 << 8,
+ RepomdSrc = 1 << 9
};
struct SourceRecord {
- unsigned char Type;
+ unsigned int Type;
string VendorID;
string URI;
string Dist;
--- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300
+++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300
@@ -39,6 +39,8 @@
ITEM_TYPE_RPMSRC,
ITEM_TYPE_RPMDIR,
ITEM_TYPE_RPMSRCDIR,
+ ITEM_TYPE_REPOMD,
+ ITEM_TYPE_REPOMDSRC,
ITEM_TYPE_DEB,
ITEM_TYPE_DEBSRC
};
@@ -48,7 +50,9 @@
ITEM_TYPE_RPM,
ITEM_TYPE_RPMSRC,
ITEM_TYPE_RPMDIR,
- ITEM_TYPE_RPMSRCDIR
+ ITEM_TYPE_RPMSRCDIR,
+ ITEM_TYPE_REPOMD,
+ ITEM_TYPE_REPOMDSRC
};
#endif
@@ -235,6 +239,16 @@
gtk_menu_append(GTK_MENU(_optTypeMenu), item);
gtk_widget_show(item);
gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR);
+
+ item = gtk_menu_item_new_with_label("repomd");
+ gtk_menu_append(GTK_MENU(_optTypeMenu), item);
+ gtk_widget_show(item);
+ gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD);
+
+ item = gtk_menu_item_new_with_label("repomd-src");
+ gtk_menu_append(GTK_MENU(_optTypeMenu), item);
+ gtk_widget_show(item);
+ gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC);
#else
item = gtk_menu_item_new_with_label(_("Binary (deb)"));
gtk_menu_append(GTK_MENU(_optTypeMenu), item);
@@ -512,6 +526,12 @@
case ITEM_TYPE_RPMSRCDIR:
rec->Type |= SourcesList::RpmSrcDir;
break;
+ case ITEM_TYPE_REPOMD:
+ rec->Type |= SourcesList::Repomd;
+ break;
+ case ITEM_TYPE_REPOMDSRC:
+ rec->Type |= SourcesList::RepomdSrc;
+ break;
default:
_userDialog->error(_("Unknown source type"));
return;
@@ -642,6 +662,10 @@
id = ITEM_TYPE_RPMDIR;
else if (rec->Type & SourcesList::RpmSrcDir)
id = ITEM_TYPE_RPMSRCDIR;
+ else if (rec->Type & SourcesList::Repomd)
+ id = ITEM_TYPE_REPOMD;
+ else if (rec->Type & SourcesList::RepomdSrc)
+ id = ITEM_TYPE_REPOMDSRC;
gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id);
gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor),
synaptic-0.57.2-showprog.patch:
--- NEW FILE synaptic-0.57.2-showprog.patch ---
--- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300
+++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300
@@ -337,6 +337,7 @@
//cout << "RGFetchProgress::Start()" << endl;
pkgAcquireStatus::Start();
_cancelled = false;
+ show();
RGFlushInterface();
}
More information about the fedora-extras-commits
mailing list