[packages/synaptic] - added gcc,progressapi-hack,repomd,showprog patches from apt-rpm.org - added format patch (fixes bu
qboosh
qboosh at pld-linux.org
Sun Feb 15 20:52:45 CET 2015
commit 7a6632c10ec3e3437ffd0000226c7c92591f2cb5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 15 20:55:23 2015 +0100
- added gcc,progressapi-hack,repomd,showprog patches from apt-rpm.org
- added format patch (fixes build with -Werror=format-security)
- added includes patch (even more missing includes)
- pl, finished packaging
synaptic-format.patch | 42 +++++++++++++
synaptic-gcc.patch | 116 ++++++++++++++++++++++++++++++++++++
synaptic-includes.patch | 113 +++++++++++++++++++++++++++++++++++
synaptic-progressapi-hack.patch | 37 ++++++++++++
synaptic-repomd.patch | 128 ++++++++++++++++++++++++++++++++++++++++
synaptic-showprog.patch | 10 ++++
synaptic.spec | 75 ++++++++++++++++-------
7 files changed, 499 insertions(+), 22 deletions(-)
---
diff --git a/synaptic.spec b/synaptic.spec
index e9e65f1..b3b9323 100644
--- a/synaptic.spec
+++ b/synaptic.spec
@@ -3,35 +3,44 @@
%bcond_without doc # build documentation
#
Summary: Graphical package management program for apt
+Summary(pl.UTF-8): Graficzny program do zarządzania pakietami dla apta
Name: synaptic
Version: 0.57.2
Release: 0.3
-License: GPL
+License: GPL v2+
Group: Applications/Archiving
Source0: http://download.savannah.nongnu.org/releases/synaptic/%{name}-%{version}.tar.gz
# Source0-md5: dd753e953caa053279d342e3bc269128
+# http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch
+Patch0: %{name}-gcc.patch
+# http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch
+Patch1: %{name}-progressapi-hack.patch
+# http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch
+Patch2: %{name}-repomd.patch
+# http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch
+Patch3: %{name}-showprog.patch
+Patch4: %{name}-format.patch
+Patch5: %{name}-includes.patch
URL: http://www.nongnu.org/synaptic/
-BuildRequires: XFree86-devel
BuildRequires: apt-devel >= 0.5.5
-BuildRequires: atk-devel
-BuildRequires: glib2-devel
-BuildRequires: gtk+2-devel
-BuildRequires: libart_lgpl-devel
-BuildRequires: libglade2-devel
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: intltool >= 0.23
+BuildRequires: libglade2-devel >= 2.0.0
BuildRequires: libstdc++-devel
-BuildRequires: libxml2-devel
-BuildRequires: libzvt-devel
-BuildRequires: pango-devel
+BuildRequires: pango-devel >= 1:1.0.0
BuildRequires: pkgconfig
BuildRequires: rpm-devel >= 4.1
BuildRequires: scrollkeeper
+BuildRequires: vte0-devel >= 0.10.11
%{?with_doc:BuildRequires: xmlto}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Synaptic is a graphical package management program for apt. It
provides the same features as the apt-get command line utility with a
-GUI front-end based on Gtk+.
+GUI front-end based on GTK+.
Features:
- Install, remove, upgrade and downgrade single and multiple packages.
@@ -43,18 +52,45 @@ Features:
- Browse all available online documentation related to a package.
- Download the latest changelog of a package.
- Lock packages to the current version.
-- Force the installation of a specifc package version.
+- Force the installation of a specific package version.
- Undo/Redo of selections.
- Built-in terminal emulator for the package manager.
- Debian only: Configure packages through the debconf system.
+%description -l pl.UTF-8
+Synaptic to graficzny program do zarządzania pakietami dla programu
+apt. Udostępnia te same możliwości, co narzędzie linii poleceń
+apt-get, ale z graficznym interfejsem użytkownika opartym na GTK+.
+
+Możliwości:
+- instalacja, usuwanie, aktualizacja i cofanie pojedynczych lub wielu
+ pakietów
+- aktualizacja całego systemu
+- zarządzanie repozytoriami pakietów (sources.list)
+- wyszukiwanie pakietów po nazwie, opisie i kilku innych atrybutach
+- wybór pakietów według statusu, sekcji, nazwy lub własnego filtra
+- sortowanie pakietów po nazwie, statusie, rozmiarze lub wersji
+- przeglądanie całej dostępnej dokumentacji związanej z pakietem
+- pobieranie najnowszej listy zmian pakietu
+- blokowanie pakietów do obecnej wersji
+- wymuszanie instalacji określonej wersji pakietu
+- anulowanie/powtarzanie wyboru
+- wbudowany emulator terminala dla zarządcy pakietów
+- (tylko Debian) konfigurowanie pakietów przez system debconf
+
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%configure \
- --with-zvt \
- %{?with_doc:--enable-docdir=%{_docdir}}
+ --with-vte \
+ %{?with_doc:--enable-docdir=%{_docdir}}
%{__make}
%install
@@ -62,25 +98,20 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/etc/X11/sysconfig/synaptic.desktop
+%{__rm} $RPM_BUILD_ROOT/etc/X11/sysconfig/synaptic.desktop
-%find_lang %{name}
+%find_lang %{name} --with-gnome --with-omf
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS INSTALL NEWS README TODO
+%doc AUTHORS ChangeLog FAQ NEWS README README.supported README.tasks TODO TRANSLATORS
%attr(755,root,root) %{_sbindir}/synaptic
%{_desktopdir}/synaptic-kde.desktop
%{_desktopdir}/synaptic.desktop
-%dir %{_datadir}/gnome/help/synaptic
-%{_datadir}/gnome/help/synaptic/C
-%lang(es) %{_datadir}/gnome/help/synaptic/es
%{_mandir}/man8/synaptic.8*
-%{_datadir}/omf/synaptic/synaptic-C.omf
-%lang(es) %{_datadir}/omf/synaptic/synaptic-es.omf
%{_pixmapsdir}/synaptic.png
%dir %{_datadir}/synaptic
%{_datadir}/synaptic/glade
diff --git a/synaptic-format.patch b/synaptic-format.patch
new file mode 100644
index 0000000..0edb7b9
--- /dev/null
+++ b/synaptic-format.patch
@@ -0,0 +1,42 @@
+--- synaptic-0.57.2/common/rpackagelister.cc.orig 2015-02-15 17:09:38.655660524 +0100
++++ synaptic-0.57.2/common/rpackagelister.cc 2015-02-15 17:17:00.265641991 +0100
+@@ -1381,7 +1381,7 @@
+
+ serverError = getServerErrorMessage(errm);
+
+- _error->Warning(tmp.str().c_str());
++ _error->Warning("%s", tmp.str().c_str());
+ Failed = true;
+ }
+
+--- synaptic-0.57.2/gtk/gsynaptic.cc.orig 2005-06-21 11:44:27.000000000 +0200
++++ synaptic-0.57.2/gtk/gsynaptic.cc 2015-02-15 17:26:31.545618014 +0100
+@@ -338,7 +338,7 @@
+ if(msg != NULL) {
+ dia = gtk_message_dialog_new_with_markup(NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+- GTK_BUTTONS_CLOSE, msg);
++ GTK_BUTTONS_CLOSE, "%s", msg);
+ gtk_dialog_run(GTK_DIALOG(dia));
+ gtk_widget_destroy(dia);
+ g_free(msg);
+@@ -362,7 +362,7 @@
+ "application first."));
+ dia = gtk_message_dialog_new_with_markup(NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+- GTK_BUTTONS_CLOSE, msg);
++ GTK_BUTTONS_CLOSE, "%s", msg);
+ gtk_dialog_run(GTK_DIALOG(dia));
+ g_free(msg);
+ exit(0);
+--- synaptic-0.57.2/gtk/rgmainwindow.cc.orig 2005-06-14 19:39:10.000000000 +0200
++++ synaptic-0.57.2/gtk/rgmainwindow.cc 2015-02-15 18:02:45.732193441 +0100
+@@ -2185,7 +2185,7 @@
+ "take effect");
+ #if GTK_CHECK_VERSION(2,6,0)
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+- msgstr);
++ "%s", msgstr);
+ #else
+ gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), msgstr);
+ #endif
diff --git a/synaptic-gcc.patch b/synaptic-gcc.patch
new file mode 100644
index 0000000..ace7d7b
--- /dev/null
+++ b/synaptic-gcc.patch
@@ -0,0 +1,116 @@
+--- 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
diff --git a/synaptic-includes.patch b/synaptic-includes.patch
new file mode 100644
index 0000000..8ca111c
--- /dev/null
+++ b/synaptic-includes.patch
@@ -0,0 +1,113 @@
+--- synaptic-0.57.2/gtk/gsynaptic.cc.orig 2005-06-21 11:44:27.000000000 +0200
++++ synaptic-0.57.2/gtk/gsynaptic.cc 2015-02-15 17:27:02.298950060 +0100
+@@ -40,6 +40,8 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <cassert>
++#include <cstdlib>
++#include <cstring>
+ #include <errno.h>
+ #include <fstream>
+
+--- synaptic-0.57.2/gtk/rgaboutpanel.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rgaboutpanel.cc 2015-02-15 17:29:07.755611464 +0100
+@@ -23,6 +23,7 @@
+ */
+
+ #include <cassert>
++#include <cstring>
+ #include "config.h"
+ #include "rgaboutpanel.h"
+ #include "i18n.h"
+@@ -58,7 +59,7 @@
+ RGAboutPanel *me = (RGAboutPanel *) data;
+
+ if (me->credits == NULL) {
+- me->credits = new RGCreditsPanel::RGCreditsPanel(me);
++ me->credits = new RGCreditsPanel(me);
+ }
+ me->credits->setTitle(_("Credits"));
+
+--- synaptic-0.57.2/gtk/rgpreferenceswindow.cc.orig 2005-06-08 17:14:30.000000000 +0200
++++ synaptic-0.57.2/gtk/rgpreferenceswindow.cc 2015-02-15 17:31:17.545606012 +0100
+@@ -28,6 +28,7 @@
+ #include <apt-pkg/configuration.h>
+ #include <gtk/gtk.h>
+ #include <cassert>
++#include <cstring>
+
+ #include "rconfiguration.h"
+ #include "rgpreferenceswindow.h"
+--- synaptic-0.57.2/gtk/rgfiltermanager.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rgfiltermanager.cc 2015-02-15 17:37:27.745590476 +0100
+@@ -25,6 +25,7 @@
+
+ #include <stdio.h>
+ #include <cassert>
++#include <cstring>
+ #include "config.h"
+ #include "rpackageview.h"
+ #include "rgfiltermanager.h"
+--- synaptic-0.57.2/gtk/rgfindwindow.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rgfindwindow.cc 2015-02-15 17:37:55.615589310 +0100
+@@ -23,6 +23,7 @@
+ #include "config.h"
+
+ #include <cassert>
++#include <cstring>
+
+ #include "rgfindwindow.h"
+ #include "rgmisc.h"
+--- synaptic-0.57.2/gtk/rglogview.cc.orig 2005-06-08 22:27:16.000000000 +0200
++++ synaptic-0.57.2/gtk/rglogview.cc 2015-02-15 17:54:35.048880700 +0100
+@@ -21,6 +21,7 @@
+ */
+
+ #include <cassert>
++#include <cstring>
+ #include <map>
+ #include "config.h"
+ #include "rglogview.h"
+--- synaptic-0.57.2/gtk/rgmisc.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rgmisc.cc 2015-02-15 17:55:38.048878057 +0100
+@@ -23,6 +23,8 @@
+ #include <X11/Xlib.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+ #include "i18n.h"
+ #include "rgmisc.h"
+--- synaptic-0.57.2/gtk/rginstallprogress.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rginstallprogress.cc 2015-02-15 18:01:02.345531113 +0100
+@@ -30,6 +30,8 @@
+ #include <apt-pkg/configuration.h>
+ #include <gtk/gtk.h>
+
++#include <cstdlib>
++#include <cstring>
+ #include <unistd.h>
+ #include <stdio.h>
+
+--- synaptic-0.57.2/gtk/rgslideshow.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rgslideshow.cc 2015-02-15 18:01:33.268863148 +0100
+@@ -3,6 +3,7 @@
+
+ #include <gtk/gtk.h>
+
++#include <algorithm>
+ #include <string>
+ #include <vector>
+
+--- synaptic-0.57.2/gtk/rgterminstallprogress.cc.orig 2005-05-20 20:24:35.000000000 +0200
++++ synaptic-0.57.2/gtk/rgterminstallprogress.cc 2015-02-15 19:01:34.382045354 +0100
+@@ -37,6 +37,8 @@
+ #include <X11/Xlib.h>
+ #include <iostream>
+ #include <cerrno>
++#include <cstdlib>
++#include <cstring>
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
diff --git a/synaptic-progressapi-hack.patch b/synaptic-progressapi-hack.patch
new file mode 100644
index 0000000..abda658
--- /dev/null
+++ b/synaptic-progressapi-hack.patch
@@ -0,0 +1,37 @@
+commit 18fa763b9ebf9c5c4bc6b0a7a759190e98baaff3
+Author: Panu Matilainen <pmatilai at turre.koti.laiskiainen.org>
+Date: Mon Mar 5 22:17:51 2007 +0200
+
+ - add ugly kludge of a patch (but that's in good company considering the
+ other stuff in rpackagemanager.h) to make synaptic use what was supposed
+ to be automatic synaptic compatibility progress stuff from new apt.. sigh
+
+diff --git a/common/rpackagemanager.h b/common/rpackagemanager.h
+index a632881..33f1c2c 100644
+--- a/common/rpackagemanager.h
++++ b/common/rpackagemanager.h
+@@ -38,6 +38,8 @@
+
+ #include <string>
+ #include <apt-pkg/pkgcache.h>
++#include <apt-pkg/progress.h>
++#include <apt-pkg/configuration.h>
+
+ #define protected public
+ #include <apt-pkg/packagemanager.h>
+@@ -57,6 +59,7 @@ class RPackageManager {
+ pkgPackageManager *pm;
+
+ pkgPackageManager::OrderResult DoInstallPreFork() {
++ pm->Progress = new InstPercentProgress(*_config);
+ Res = pm->OrderInstall();
+ return Res;
+ };
+@@ -71,6 +74,7 @@ class RPackageManager {
+ #endif
+
+ RPackageManager(pkgPackageManager *pm) : pm(pm) {};
++ ~RPackageManager() { delete pm->Progress; };
+
+ };
+
diff --git a/synaptic-repomd.patch b/synaptic-repomd.patch
new file mode 100644
index 0000000..23b54e6
--- /dev/null
+++ b/synaptic-repomd.patch
@@ -0,0 +1,128 @@
+--- 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),
diff --git a/synaptic-showprog.patch b/synaptic-showprog.patch
new file mode 100644
index 0000000..22c6391
--- /dev/null
+++ b/synaptic-showprog.patch
@@ -0,0 +1,10 @@
+--- 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();
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/synaptic.git/commitdiff/7a6632c10ec3e3437ffd0000226c7c92591f2cb5
More information about the pld-cvs-commit
mailing list