Bug#746824: [Aptitude-devel] Bug#746824: Patch aptitude: ftbfs with GCC-4.9
tis 2014-06-10 klockan 19:12 +0200 skrev Axel Beckert: > This bug has been fixed. Further discussing alternative patches seems > pointless to me unless the bug gets reopened. > > Thanks, Axel Sorry missed that it was fixed. No more from me about this bug. Thanks, David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#746824: Patch aptitude: ftbfs with GCC-4.9
Hi,
lör 2014-06-07 klockan 01:36 +0800 skrev Sphinx Jiang:
> Hi,
>
>
> I also tried to fix this bug in some other ways, it turned out I could
> not find better solution. I tested your patch on mips64el, amd64 and
> i386 ports, all works well.
>
Thank you for trying the patch.
I have updated the patch to NOT Disable the code that uses the private
member "apply". All that was needed is to add a "public:" statement to
the struct where it is defined.
This will keep the same functionality as before.
This patch replaces the previous one.
Comments welcome!
>
> Since there is a patch for the package aptitude, in my opinion quilt
> should be added to Build-Depends, it is not included now.
>
>
>
> Regards
> Sphinx
Regards
David
Description: gcc 4.9 FTBFS corrections
-Werror=unused-function
serialize_pattern_list in src/generic/apt/matching/serialize.cc
strncase_eq_with_translation in src/main.cc
transcode in tests/test_cmdline_download_status_display.cc
Unused functions removed.
Private member apply in strip_shared_ptrs_result:
Apply declared public
Author: David Westberg
Bug-Debian: http://bugs.debian.org/746824
Index: aptitude-0.6.10/src/generic/apt/matching/serialize.cc
===
--- aptitude-0.6.10.orig/src/generic/apt/matching/serialize.cc 2014-06-08 20:17:01.352308339 +0200
+++ aptitude-0.6.10/src/generic/apt/matching/serialize.cc 2014-06-08 20:17:01.348308295 +0200
@@ -94,23 +94,6 @@
out.put(')');
}
- void serialize_pattern_list(const std::vector > &patterns,
- std::ostream &out,
- std::vector &variable_name_stack)
- {
- bool first = true;
- for(std::vector >::const_iterator it =
- patterns.begin(); it != patterns.end(); ++it)
- {
- if(first)
- first = false;
- else
- out << ", ";
-
- serialize_pattern(*it, out, variable_name_stack);
- }
- }
-
void serialize_deptype(pkgCache::Dep::DepType deptype,
std::ostream &out)
{
Index: aptitude-0.6.10/src/main.cc
===
--- aptitude-0.6.10.orig/src/main.cc 2014-06-08 20:17:01.352308339 +0200
+++ aptitude-0.6.10/src/main.cc 2014-06-08 20:17:01.348308295 +0200
@@ -359,16 +359,6 @@
namespace
{
- bool strncase_eq_with_translation(const std::string &s1, const char *s2)
- {
-if(strcasecmp(s1.c_str(), s2) == 0)
- return true;
-else if(strcasecmp(s1.c_str(), _(s2)) == 0)
- return true;
-else
- return false;
- }
-
class log_level_map
{
std::map levels;
Index: aptitude-0.6.10/tests/test_cmdline_download_status_display.cc
===
--- aptitude-0.6.10.orig/tests/test_cmdline_download_status_display.cc 2014-06-08 20:17:01.352308339 +0200
+++ aptitude-0.6.10/tests/test_cmdline_download_status_display.cc 2014-06-08 20:17:01.348308295 +0200
@@ -59,11 +59,6 @@
const wchar_t two_column_char = L'-';
// Locally alias transcode to always use UTF-8.
- std::wstring transcode(const std::string &s)
- {
-return cw::util::transcode(s, "UTF-8");
- }
-
std::string transcode(const std::wstring &s)
{
return cw::util::transcode(s, "UTF-8");
Index: aptitude-0.6.10/tests/test_parsers.cc
===
--- aptitude-0.6.10.orig/tests/test_parsers.cc 2014-06-08 20:17:01.352308339 +0200
+++ aptitude-0.6.10/tests/test_parsers.cc 2014-06-08 20:37:22.363175620 +0200
@@ -62,6 +62,7 @@
// Used to make it easier to compare results that are vectors.
class strip_shared_ptrs_result
{
+public:
template
struct apply
{
Bug#746824: Patch aptitude: ftbfs with GCC-4.9
Hello,
I have put together a patch to bug http://bugs.debian.org/746824
It consists of removal of unused funtions.
There is also a reference to a private member, the Patch simply comments
out the faulty code, not a nice fix.
With patch applied the codes builds using dpkg-buildpackage in
jessie/sid.
Comments welcome.
Description: gcc 4.9 FTBFS corrections
-Werror=unused-function
serialize_pattern_list in src/generic/apt/matching/serialize.cc
strncase_eq_with_translation in src/main.cc
transcode in tests/test_cmdline_download_status_display.cc
Unused functions removed.
Private member apply in strip_shared_ptrs_result:
BOOST_STATIC_ASSERT code commented out. Needs a better solution.
Author: David Westberg
Bug-Debian: http://bugs.debian.org/746824
Index: aptitude-0.6.10/src/generic/apt/matching/serialize.cc
===
--- aptitude-0.6.10.orig/src/generic/apt/matching/serialize.cc 2014-05-31 17:37:36.0 +0200
+++ aptitude-0.6.10/src/generic/apt/matching/serialize.cc 2014-05-31 17:37:49.0 +0200
@@ -94,23 +94,6 @@
out.put(')');
}
- void serialize_pattern_list(const std::vector > &patterns,
- std::ostream &out,
- std::vector &variable_name_stack)
- {
- bool first = true;
- for(std::vector >::const_iterator it =
- patterns.begin(); it != patterns.end(); ++it)
- {
- if(first)
- first = false;
- else
- out << ", ";
-
- serialize_pattern(*it, out, variable_name_stack);
- }
- }
-
void serialize_deptype(pkgCache::Dep::DepType deptype,
std::ostream &out)
{
Index: aptitude-0.6.10/src/main.cc
===
--- aptitude-0.6.10.orig/src/main.cc 2014-05-31 17:37:36.0 +0200
+++ aptitude-0.6.10/src/main.cc 2014-05-31 17:37:49.0 +0200
@@ -359,16 +359,6 @@
namespace
{
- bool strncase_eq_with_translation(const std::string &s1, const char *s2)
- {
-if(strcasecmp(s1.c_str(), s2) == 0)
- return true;
-else if(strcasecmp(s1.c_str(), _(s2)) == 0)
- return true;
-else
- return false;
- }
-
class log_level_map
{
std::map levels;
Index: aptitude-0.6.10/tests/test_cmdline_download_status_display.cc
===
--- aptitude-0.6.10.orig/tests/test_cmdline_download_status_display.cc 2014-05-31 17:37:36.0 +0200
+++ aptitude-0.6.10/tests/test_cmdline_download_status_display.cc 2014-05-31 17:37:49.0 +0200
@@ -59,11 +59,6 @@
const wchar_t two_column_char = L'-';
// Locally alias transcode to always use UTF-8.
- std::wstring transcode(const std::string &s)
- {
-return cw::util::transcode(s, "UTF-8");
- }
-
std::string transcode(const std::wstring &s)
{
return cw::util::transcode(s, "UTF-8");
Index: aptitude-0.6.10/tests/test_parsers.cc
===
--- aptitude-0.6.10.orig/tests/test_parsers.cc 2014-05-31 17:37:36.0 +0200
+++ aptitude-0.6.10/tests/test_parsers.cc 2014-05-31 17:37:49.0 +0200
@@ -81,8 +81,9 @@
};
};
-BOOST_STATIC_ASSERT( (boost::is_same >,
- strip_shared_ptrs_result::apply > > > >::type>::value) );
+//apply is private
+//BOOST_STATIC_ASSERT( (boost::is_same >,
+// strip_shared_ptrs_result::apply > > > >::type>::value) );
template
T strip_shared_ptrs(const T &t)
Bug#624553: xserver-xorg-video-nouveau: Monitor is not detected by driver: no EDID information is retrived
On Fri, Apr 29, 2011 at 06:23:18PM +0200, Sven Joachim wrote: > On 2011-04-29 17:00 +0200, David Westberg wrote: > > > Package: xserver-xorg-video-nouveau > > Version: 1:0.0.15+git20100329+7858345-5 > > Severity: normal > > > > EDID is not retrived using the nouveau driver. Thus driver does not use the > > monitor at default resolution, 1280x1024. > > The nouveau driver gets EDID information from the kernel, so the > question is whether the kernel has it. Do you have something in > /sys/class/drm/card0-VGA-1/edid or /sys/class/drm/card0-DVI-I-1/edid ? They are empty as far as I can see. I switched to the nvidia driver to see what is displayed for the same files. They are however not to be found. Nvidia must have adifferent way of accessing the monitor information. > Strange that this succeeds if nvidia is loaded and fails otherwise. > > Regards, > Sven Depends I guess on the interaction between the driver and monitor and the get-edid command. could be some context that are not properly setup for the command to succed. Don't know the relationship between monitor information and the kernel and the driver. Is it something the driver has todo and provide to the kernel? /david -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#562233: Patch got mangled in message #15
Package: update-manager-gnome Version: 0.200.5-1 Severity: normal Tags: patch Patch as an attchment, see message 15 for details. -- System Information: Debian Release: 6.0.1 APT prefers proposed-updates APT policy: (500, 'proposed-updates'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core) Locale: LANG=sv_SE.utf8, LC_CTYPE=sv_SE.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages update-manager-gnome depends on: ii gconf22.28.1-6 GNOME configuration database syste ii gksu 2.0.2-5graphical frontend to su ii python2.6.6-3+squeeze6 interactive high-level object-orie ii python-dbus 0.83.1-1 simple interprocess messaging syst ii python-gconf 2.28.1-1 Python bindings for the GConf conf ii python-gobject2.21.4+is.2.21.3-1 Python bindings for the GObject li ii python-gtk2 2.17.0-4 Python bindings for the GTK+ widge ii python-support1.0.10 automated rebuilding support for P ii python-vte1:0.24.3-2 Python bindings for the VTE widget ii update-manager-core 0.200.5-1 APT update manager core functional update-manager-gnome recommends no packages. Versions of packages update-manager-gnome suggests: ii software-properties-gtk0.60.debian-3 manage the repositories that you i ii update-notifier0.99.3debian8 Daemon which notifies about packag diff -r -u update-manager-0.200.5/data/ui/UpdateManager.ui update-manager-0.200.5.new/data/ui/UpdateManager.ui --- update-manager-0.200.5/data/ui/UpdateManager.ui 2009-10-11 13:42:58.0 +0200 +++ update-manager-0.200.5.new/data/ui/UpdateManager.ui 2011-03-19 20:02:35.0 +0100 @@ -307,7 +307,7 @@ True True -never +automatic automatic in @@ -334,7 +334,7 @@ True True 6 -never +automatic automatic in
Bug#562233: Patch to solve the widening effect
Package: update-manager-gnome Version: 0.200.5-1 Severity: normal Problem seems to be related to the Changes and Description information tabs. The text presented makes them grow because there is no restriction in the GUI fields to limit this. GUI tries to put Description on one long row. Supplied patch will limit this behaviour by restricting growth to vertical by adding a Horisontal scrollbar if required. diff -r -u update-manager-0.200.5/data/ui/UpdateManager.ui update- manager-0.200.5.new/data/ui/UpdateManager.ui --- update-manager-0.200.5/data/ui/UpdateManager.ui 2009-10-11 13:42:58.0 +0200 +++ update-manager-0.200.5.new/data/ui/UpdateManager.ui 2011-03-19 20:02:35.0 +0100 @@ -307,7 +307,7 @@ True True -never +automatic automatic in @@ -334,7 +334,7 @@ True True 6 -never +automatic automatic in -- System Information: Debian Release: 6.0 APT prefers proposed-updates APT policy: (500, 'proposed-updates'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core) Locale: LANG=sv_SE.utf8, LC_CTYPE=sv_SE.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages update-manager-gnome depends on: ii gconf22.28.1-6 GNOME configuration database syste ii gksu 2.0.2-5graphical frontend to su ii python2.6.6-3+squeeze6 interactive high-level object-orie ii python-dbus 0.83.1-1 simple interprocess messaging syst ii python-gconf 2.28.1-1 Python bindings for the GConf conf ii python-gobject2.21.4+is.2.21.3-1 Python bindings for the GObject li ii python-gtk2 2.17.0-4 Python bindings for the GTK+ widge ii python-support1.0.10 automated rebuilding support for P ii python-vte1:0.24.3-2 Python bindings for the VTE widget ii update-manager-core 0.200.5-1 APT update manager core functional update-manager-gnome recommends no packages. Versions of packages update-manager-gnome suggests: ii software-properties-gtk0.60.debian-3 manage the repositories that you i ii update-notifier0.99.3debian8 Daemon which notifies about packag -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#559144: installation-reports: Successfull installation of lenny
Package: installation-reports Severity: wishlist -- Package-specific info: Boot method: CD Image version: netinst Date: Machine: Standard PC Partitions: Base System Installation Checklist: [O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it Initial boot: [O] Detect network card:[O] Configure network: [O] Detect CD: [O] Load installer modules: [O] Detect hard drives: [O] Partition hard drives: [O] Install base system:[O] Clock/timezone setup: [O] User/password setup:[O] Install tasks: [O] Install boot loader:[O] Overall install:[O] Comments/Problems: Installation worked well for me, Kudos to you all and this distribution is NICE. -- Please make sure that the hardware-summary log file, and any other installation logs that you think would be useful are attached to this report. Please compress large files using gzip. Once you have filled out this report, mail it to sub...@bugs.debian.org. == Installer lsb-release: == DISTRIB_ID=Debian DISTRIB_DESCRIPTION="Debian GNU/Linux installer" DISTRIB_RELEASE="5.0 (lenny) - installer build 20080522" X_INSTALLATION_MEDIUM=cdrom == Installer hardware-summary: == umame -a: Linux debian 2.6.24-1-486 #1 Thu May 8 01:29:10 UTC 2008 i686 unknown lspci -knn: 00:00.0 Host bridge [0600]: Intel Corporation 82815 815 Chipset Host Bridge and Memory Controller Hub [8086:1130] (rev 02) lspci -knn: 00:01.0 PCI bridge [0604]: Intel Corporation 82815 815 Chipset AGP Bridge [8086:1131] (rev 02) lspci -knn: 00:1e.0 PCI bridge [0604]: Intel Corporation 82801 PCI Bridge [8086:244e] (rev 01) lspci -knn: 00:1f.0 ISA bridge [0601]: Intel Corporation 82801BA ISA Bridge (LPC) [8086:2440] (rev 01) lspci -knn: 00:1f.1 IDE interface [0101]: Intel Corporation 82801BA IDE U100 Controller [8086:244b] (rev 01) lspci -knn: Kernel driver in use: PIIX_IDE lspci -knn: Kernel modules: piix lspci -knn: 00:1f.2 USB Controller [0c03]: Intel Corporation 82801BA/BAM USB Controller #1 [8086:2442] (rev 01) lspci -knn: Kernel driver in use: uhci_hcd lspci -knn: Kernel modules: uhci-hcd lspci -knn: 00:1f.3 SMBus [0c05]: Intel Corporation 82801BA/BAM SMBus Controller [8086:2443] (rev 01) lspci -knn: 00:1f.4 USB Controller [0c03]: Intel Corporation 82801BA/BAM USB Controller #1 [8086:2444] (rev 01) lspci -knn: Kernel driver in use: uhci_hcd lspci -knn: Kernel modules: uhci-hcd lspci -knn: 01:01.0 Multimedia audio controller [0401]: Creative Labs SB Live! EMU10k1 [1102:0002] (rev 07) lspci -knn: 01:01.1 Input device controller [0980]: Creative Labs SB Live! Game Port [1102:7002] (rev 07) lspci -knn: 01:04.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6102 [Rhine-II] [1106:3065] (rev 43) lspci -knn: Kernel driver in use: via-rhine lspci -knn: Kernel modules: via-rhine lspci -knn: 02:00.0 VGA compatible controller [0300]: nVidia Corporation NV15 [GeForce2 GTS/Pro] [10de:0150] (rev a3) lsmod: Module Size Used by lsmod: nls_cp437 5760 0 lsmod: ufs71428 0 lsmod: qnx4 10628 0 lsmod: ntfs 199744 0 lsmod: xfs 487540 0 lsmod: reiserfs 207488 0 lsmod: jfs 163932 0 lsmod: ext3 120328 2 lsmod: jbd39444 1 ext3 lsmod: vfat 11776 0 lsmod: fat47772 1 vfat lsmod: via_rhine 22792 0 lsmod: mii 5248 1 via_rhine lsmod: nls_iso8859_1 4096 0 lsmod: isofs 32164 0 lsmod: zlib_inflate 14336 1 isofs lsmod: rsrc_nonstatic 11776 0 lsmod: pcmcia_core36624 1 rsrc_nonstatic lsmod: ide_generic 1152 0 [permanent] lsmod: usb_storage76736 0 lsmod: scsi_mod 141068 1 usb_storage lsmod: psmouse35984 0 lsmod: fan 4740 0 lsmod: usbhid 27776 0 lsmod: hid32768 1 usbhid lsmod: ide_cd 36128 0 lsmod: cdrom 32416 1 ide_cd lsmod: ide_disk 15360 4 lsmod: generic 4356 0 [permanent] lsmod: parport_pc 33316 0 lsmod: parport33096 1 parport_pc lsmod: floppy 54148 0 lsmod: uhci_hcd 22800 0 lsmod: piix7300 0 [permanent] lsmod: usbcore 130924 4 usb_storage,usbhid,uhci_hcd lsmod: ide_core 106456 5 ide_generic,ide_cd,ide_disk,generic,piix lsmod: thermal15900 0 lsmod: processor 28336 1 thermal lsmod: evdev 10752 2 df: Filesystem 1k-blocks Used Available Use% Mounted
