patches/glibmm-01-build.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17907 2b92ef20abf1
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13069
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     1
--- tests/glibmm_ustring_compose/main.cc.orig	2008-08-07 17:29:05.299259187 +0800
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     2
+++ tests/glibmm_ustring_compose/main.cc	2008-08-07 17:27:57.073869820 +0800
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     3
@@ -19,7 +19,7 @@
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     4
   int i = 1;
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     5
   std::cout << Glib::ustring::compose("Compose strings: %1 and %2", 'f', &i) << std::endl;
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     6
 
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     7
-  std::cout << Glib::ustring::compose("%1 is lower than 0x%2.", 12, Glib::ustring::format(std::hex, 16)) << std::endl;
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     8
+  //std::cout << Glib::ustring::compose("%1 is lower than 0x%2.", 12, Glib::ustring::format(std::hex, 16)) << std::endl;
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
     9
 
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
    10
   //TODO: More tests.
7e8348ce79af 2008-08-07 simon.zheng <[email protected]>
xz159989
parents: 11636
diff changeset
    11
 
17707
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    12
diff -ruN gio.orig/giomm/drive.cc gio/giomm/drive.cc
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    13
--- gio.orig/giomm/drive.cc	2010-03-14 06:24:19.418208171 +0000
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    14
+++ gio/giomm/drive.cc	2010-03-14 06:24:39.550049903 +0000
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    15
@@ -401,10 +401,10 @@
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    16
   return g_drive_has_volumes(const_cast<GDrive*>(gobj()));
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    17
 }
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    18
 
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    19
-Glib::ListHandle< Glib::RefPtr<Volume> > Drive::get_volumes()
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    20
+/*Glib::ListHandle< Glib::RefPtr<Volume> > Drive::get_volumes()
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    21
 {
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    22
   return Glib::ListHandle< Glib::RefPtr<Volume> >(g_drive_get_volumes(gobj()), Glib::OWNERSHIP_SHALLOW);
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    23
-}
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    24
+}*/
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    25
 
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    26
 bool Drive::is_media_removable() const
3dcd1903e41f 010-03-12 Christian Kelly <[email protected]>
chrisk
parents: 13069
diff changeset
    27
 {
17801
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    28
diff -ruN gio.orig/giomm/appinfo.cc gio/giomm/appinfo.cc
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    29
--- gio.orig/giomm/appinfo.cc	2010-04-06 15:01:37.726524557 +0100
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    30
+++ gio/giomm/appinfo.cc	2010-04-06 15:01:57.272777485 +0100
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    31
@@ -206,6 +206,7 @@
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    32
 {
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    33
   return Glib::RefPtr<AppLaunchContext>( new AppLaunchContext() );
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    34
 }
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    35
+/*
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    36
 std::string AppLaunchContext::get_display(const Glib::RefPtr<AppInfo>& info, const Glib::ListHandle< Glib::RefPtr<Gio::File> >& files)
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    37
 {
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    38
   return Glib::convert_return_gchar_ptr_to_stdstring(g_app_launch_context_get_display(gobj(), Glib::unwrap(info), files.data()));
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    39
@@ -215,6 +216,7 @@
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    40
 {
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    41
   return Glib::convert_return_gchar_ptr_to_stdstring(g_app_launch_context_get_startup_notify_id(gobj(), Glib::unwrap(info), files.data()));
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    42
 }
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    43
+*/
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    44
 
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    45
 void AppLaunchContext::launch_failed(const std::string& startup_notify_id)
539b5f1aecbc 2010-04-06 Christian Kelly <[email protected]>
chrisk
parents: 17707
diff changeset
    46
 {