From 29e62220cb68514d690d516f030da6c4f4aaec28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 5 Oct 2014 18:04:47 +0200 Subject: RPM Packaging: cleanup tdebase --- .../tdebase/kdebase-3.5.12-halmountoptions.patch | 78 ---------------------- 1 file changed, 78 deletions(-) delete mode 100644 redhat/tdebase/kdebase-3.5.12-halmountoptions.patch (limited to 'redhat/tdebase/kdebase-3.5.12-halmountoptions.patch') diff --git a/redhat/tdebase/kdebase-3.5.12-halmountoptions.patch b/redhat/tdebase/kdebase-3.5.12-halmountoptions.patch deleted file mode 100644 index 4a604f9a3..000000000 --- a/redhat/tdebase/kdebase-3.5.12-halmountoptions.patch +++ /dev/null @@ -1,78 +0,0 @@ -*** kdebase/kioslave/media/mediamanager/halbackend.cpp.orig 2010-09-30 00:24:28.000000000 +0200 ---- kdebase/kioslave/media/mediamanager/halbackend.cpp 2011-07-20 16:39:40.933056051 +0200 -*************** -*** 873,878 **** ---- 873,905 ---- - s_HALBackend->DeviceCondition(udi, condition_name); - } - -+ TQStringList HALBackend::getHALmountoptions(TQString udi) -+ { -+ const char* _ppt_string; -+ LibHalVolume* volume; -+ LibHalDrive* drive; -+ -+ TQString _ppt_QString; -+ -+ volume = libhal_volume_from_udi( m_halContext, udi.latin1() ); -+ if( volume ) -+ drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) ); -+ else -+ drive = libhal_drive_from_udi( m_halContext, udi.latin1() ); -+ -+ if( !drive ) -+ return TQString::null; -+ -+ if( volume ) -+ _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL ); -+ else -+ _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL ); -+ -+ _ppt_QString = TQString(_ppt_string ? _ppt_string : ""); -+ -+ return TQStringList::split(",",_ppt_QString); -+ } -+ - TQStringList HALBackend::mountoptions(const TQString &name) - { - const Medium* medium = m_mediaList.findById(name); -*************** -*** 1472,1481 **** ---- 1499,1524 ---- - soptions << TQString("data=ordered"); - } - -+ TQStringList hal_mount_options = getHALmountoptions(medium->id()); -+ for (TQValueListIterator it=hal_mount_options.begin();it!=hal_mount_options.end();it++) -+ { -+ soptions << *it; -+ kdDebug()<<"HALOption: "<<*it<